From 035331e18802456a070b61a01b1466f59d43a29d Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期二, 07 三月 2023 14:16:50 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 9a9660d..c5895a9 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -22,6 +22,8 @@
     private MainServiceImpl mainService;
     // 鎵�灞炵嚎绋�
     private Thread thread;
+    // 棰戠巼
+    private int i = 0;
 
     /**
      * =====>>  寮�濮嬪伐浣�
@@ -40,18 +42,17 @@
                     }
 
                     // 婕旂ず
-//                    mainService.demo();
+                    mainService.demo();
 
                     // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
                     mainService.generateStoreWrkFile(); // 缁勬墭
-                    mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
+//                    mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
 
                     // 闂撮殧
                     Thread.sleep(500);
 
                     // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
-                    mainService.stnToCrnStnPick0();
-                    mainService.stnToCrnStnPick1();
+                    mainService.stnToCrnStnPick();
                     // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
                     mainService.crnStnToOutStn();
                     // 鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
@@ -71,11 +72,18 @@
                     // 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢�
                     mainService.loopSteCharge();
                     mainService.executeSteCharge();
+                    //鍑哄叆搴撴ā寮�
+                    i++;
+                    if (i > 1) {
+                        mainService.outAndIn();
+                        i = 0;
+                    }
+
                     // 闂撮殧
                     Thread.sleep(200);
                     // 绌挎杞� ===>> 灏忚溅澶嶄綅鑷冲緟鏈哄簱浣�
-                    mainService.queryChargeLocOfComplete();
-                    mainService.steFromChargeToIdleLoc();
+//                    mainService.queryChargeLocOfComplete();
+//                    mainService.steFromChargeToIdleLoc();
 
                 } catch (Exception e) {
                     e.printStackTrace();

--
Gitblit v1.9.1