From ab18ecb1c25613535c2047467cf8c14d3b41b047 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 07 五月 2024 15:46:58 +0800
Subject: [PATCH] #空桶入库完成

---
 src/main/java/com/zy/core/MainProcess.java |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 74c178e..497dc9c 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -37,16 +37,10 @@
 
                     // 闂撮殧
                     Thread.sleep(1000);
-
                     // 绯荤粺杩愯鐘舵�佸垽鏂�
                     if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
                         continue;
                     }
-
-                    // 婕旂ず
-                    //mainService.crnDemoOfLocMove1();
-//                    // 婕旂ず 鎵�鏈夊簱浣嶈疆璇�
-//                    mainService.crnDemoOfLocMove2();
                     // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
                     mainService.generateStoreWrkFile(); // 缁勬墭
 //                    mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
@@ -58,12 +52,6 @@
                     mainService.crnIoExecute();
                     // 鍏ュ簱  ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
                     mainService.storeFinished();
-
-                    //RGV鎼繍
-                    mainService.rgvIoExecute();
-                    //RGV宸ヤ綔瀹屾垚
-                    mainService.rgvFinished();
-
                     // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
                     mainService.recCrnErr();
                     // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
@@ -73,6 +61,24 @@
                     // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
                     mainService.ledReset();
 
+                    //鎵弿纰熺洏鏈鸿嚜鍔ㄥ叆搴撶┖鎵樼洏
+                    mainService.autoEmptyIn();
+                    //鎵弿鎷嗙洏鏈鸿嚜鍔ㄥ嚭搴撶┖鎵樼洏
+                    mainService.autoEmptyOut();
+
+                    //浜屾湡
+                    //绌烘《搴撲换鍔$敓鎴�
+                    mainService.crn5TaskCreate();
+                    //绌烘《搴撳叆搴�
+                    mainService.crn5InTask();
+                    //绌烘《鍑哄簱瀹屾垚
+                    mainService.crn5StnToOutStn();
+                    //rgv浠诲姟
+                    mainService.RGVTaskPut();
+                    //rgv浠诲姟瀹屾垚
+                    mainService.RGVTaskOver();
+
+
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

--
Gitblit v1.9.1