From a2c10587b4621e1bf9ef928dc043cf71ad84bbcf Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 18 四月 2023 09:30:18 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/MainProcess.java |   45 +++++++++++++++++++++++++++++++--------------
 1 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 1ef107e..c7b25f7 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -24,9 +24,8 @@
     private MainServiceImpl mainService;
     // 鎵�灞炵嚎绋�
     private Thread thread;
-    @Value("${crnBackHp.enable}")
-    private boolean crnBackHp;
-    private boolean look = true;
+    // 棰戠巼
+    private int i = 0;
 
     /**
      * =====>>  寮�濮嬪伐浣�
@@ -45,42 +44,60 @@
                     }
 
                     // 婕旂ず
-                    mainService.crnDemoOfLocMove1();
+                    //mainService.crnDemoOfLocMove1();
+
+                    // 婕旂ず 鎵�鏈夊簱浣嶈疆璇�
+                    mainService.crnDemoOfLocMove2();
+
                     // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
 //                    mainService.ioConvert();
+
                     // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
                     mainService.generateStoreWrkFile(); // 缁勬墭
+
                     mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
+
                     // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
                     mainService.stnToCrnStnPick();
+
                     // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
                     mainService.crnStnToOutStn();
+
                     // 鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
                     mainService.crnIoExecute();
+
                     // 鍏ュ嚭搴撳寮� ===>> 鍫嗗灈鏈哄懡浠や笅鍙戝悗锛屽紓姝ヤ慨鏀瑰伐浣滄。鐘舵��
 //                    mainService.crnIoWrkMast();
+
                     // 鍏ュ簱  ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
                     mainService.storeFinished();
+
                     // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
                     mainService.recCrnErr();
+
                     // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
-//                    mainService.storeEmptyPlt();
+                    mainService.storeEmptyPlt();  // 绌烘澘鍏ュ簱
+
                     // 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣�
                     mainService.ledExecute();
+
                     // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
                     mainService.ledReset();
 
-//                    if (crnBackHp) {
-//                        if (look) {
-//                            //鍫嗗灈鏈烘病鏈夋墽琛屼腑浠诲姟锛岃澶囧瓨鍦ㄥ叆搴撲换鍔℃椂鍙洖鍘熺偣
-//                            mainService.crnRebackHp();
-//                        }
-//                    }
-//                    look  = !look;
-
-
                     mainService.outOfDevp();
 
+                    //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
+                    mainService.autoEmptyOut();
+//                    //绌烘墭鐩樿嚜鍔ㄥ叆搴�
+//                    mainService.autoEmptyIn();
+
+                    // 鍏朵粬  ===>> 鍏ュ嚭搴撴ā寮忓垏鎹�
+                    i++;
+                    if (i > 1) {
+                        mainService.ioConvert();
+                        i = 0;
+                    }
+
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

--
Gitblit v1.9.1