From 48ba79ee2e5aa3993be1c97ed617dc40ba0a7ccd Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 28 十月 2024 13:35:16 +0800
Subject: [PATCH] 双深移库bug

---
 src/main/java/com/zy/core/MainProcess.java |   41 ++++++++++++++++++++++++-----------------
 1 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 3341f0a..4a11259 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -1,15 +1,13 @@
 package com.zy.core;
 
-import com.zy.asrs.service.impl.MainServiceImpl;
+import com.zy.service.impl.MainServiceImpl;
 import com.zy.core.properties.SystemProperties;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PreDestroy;
-import java.util.ArrayList;
 
 /**
  * WCS涓绘祦绋�
@@ -45,16 +43,16 @@
                     }
 
                     // 婕旂ず
-                    mainService.crnDemoOfLocMove1();
+//                    mainService.crnDemoOfLocMove1();
                     //鍒锋柊RGV鍦板浘
-                    mainService.refreshRgvMap();
+//                    mainService.refreshRgvMap();
 
                     // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
 //                    mainService.ioConvert();
 
                     // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
 //                    mainService.stnToCrnStnPick(3);
-                    mainService.stnToCrnStnPick2();
+//                    mainService.stnToCrnStnPick2();
 
                     // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
                     mainService.generateStoreWrkFile(1); // 缁勬墭
@@ -72,7 +70,7 @@
                     // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
                     mainService.recCrnErr(7);
                     // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
-                    mainService.storeEmptyPlt(8);
+//                    mainService.storeEmptyPlt(8);
                     // 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣�
                     mainService.ledExecute(9);
                     // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
@@ -80,14 +78,23 @@
 
                     mainService.outOfDevp(11);
 
-                    if (i>10){
-                        //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
-                        mainService.autoEmptyOut();
-                        //绌烘墭鐩樿嚜鍔ㄥ叆搴�
-                        mainService.autoEmptyIn();
-                        i=0;
-                    }
-                    i++;
+                    // 106鐢熸垚杞Щ浠诲姟
+                    mainService.autoMoveLoc();
+
+                    // 缁檖lc鍐欏紑闂ㄤ俊鍙�
+                    mainService.writePlc305();
+
+                    // 305鍏ュ簱璋冪敤搴曞骇鍒�305
+                    mainService.invokingBase();
+
+//                    if (i>10){
+//                        //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
+//                        mainService.autoEmptyOut();
+//                        //绌烘墭鐩樿嚜鍔ㄥ叆搴�
+//                        mainService.autoEmptyIn();
+//                        i=0;
+//                    }
+//                    i++;
 
                     // 鍏朵粬  ===>> 鍏ュ嚭搴撴ā寮忓垏鎹�
 //                    i++;
@@ -99,14 +106,14 @@
                     /////////////////////////////////////RGV璋冨害/////////////////////////////////////
 //
                     //瀹屾垚灏忚溅浠诲姟
-                    mainService.rgvCompleteWrkMastSta();
+//                    mainService.rgvCompleteWrkMastSta();
 
 //                    //鎵ц灏忚溅绌烘澘鎼繍浠诲姟
 //                    mainService.rgvRunWrkMastEmptyStaPut();//鏀�
 //                    mainService.rgvRunWrkMastEmptyStaTake();//鍙�
 //                    if (rgcWrk){
 //                        //鎵ц灏忚溅璐х墿鎼繍浠诲姟
-                        mainService.rgvRunWrkMastFullSta();
+//                        mainService.rgvRunWrkMastFullSta();
 //                        rgcWrk = false;
 //                    }else {
 //                        mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯

--
Gitblit v1.9.1