From 0bb1ee03b4faa39d83b2ba1911fff3ac1b126ae6 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 29 十一月 2024 00:55:52 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/MainProcess.java |   35 ++++++++++++++++++++++++++++-------
 1 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index ed1dee1..bc52a25 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -28,6 +28,7 @@
     private int i = 0;
     private int j = 0;
     private int k = 0;
+    private int l = 0;
 
     /**
      * =====>>  寮�濮嬪伐浣�
@@ -36,9 +37,15 @@
         thread = new Thread(() -> {
             while (!Thread.currentThread().isInterrupted()) {
                 try {
-                    k++; if (k>10) k=0;
                     i++; if (i>5) i=0;
                     j++; if (j>5) j=0;
+                    k++;
+                    if (k>6) {
+                        k=0;
+                        l++;
+                        if (l>=3) l=0;
+                    }
+
 
                     // 闂撮殧
                     Thread.sleep(1000);
@@ -57,10 +64,13 @@
                     // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
 //                    mainService.ioConvert();
                     // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
+
                     mainService.generateStoreWrkFile(); // 缁勬墭
+                    mainService.generateStoreWrkFile464(); // 缁勬墭464
                     mainService.generateStoreWrkFileSingle(); // 缁勬墭  鍙屽伐浣嶅崟浼�   灏忔枡绠�
                     mainService.generateStoreWrkFileLarge(); // 缁勬墭  鍙屽伐浣嶅崟浼�   澶ф枡绠�
-                    mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
+//                    mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
+
                     // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
                     mainService.crnStnToOutStn();
                     // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯  宸ヤ綅2
@@ -90,20 +100,31 @@
                     mainService.storeEmptyPltLarge();
                     // 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣�
                     mainService.ledExecute();
-                    // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
+                    // 鍏朵粬   ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
                     mainService.ledReset();
 
                     /************************************JAR璋冨害************************************/
+                    mainService.stackingCompletionDriveTray();//鍒嗛厤纭寲缃�
+
+                    //Jar鍏呯數浠诲姟瀹屾垚
+                    mainService.jarChargeComplete();
+                    //JarWrkMastExecute浠诲姟瀹屾垚
+                    mainService.jarWrkMastExecuteGenerateComplete(k);
                     //JarWrkMastExecute浠诲姟鍒涘缓   //纭寲缃�
                     mainService.jarWrkMastExecuteGenerate(k);
-                    //Jar浠诲姟鍒涘缓  //瀹屾垚
+                    //JarWrkMastExecute浠诲姟鎵ц
+                    mainService.jarWrkMastExecuteAction(k,l);
+                    //Jar浠诲姟鍒涘缓
                     mainService.jarMastGenerate();
-
-
-
+                    //Jar浠诲姟瀹屾垚
+                    mainService.jarMastGenerateComplete();
+                    //Jar鍏呯數浠诲姟鍒涘缓
+                    mainService.jarChargeGenerate();
 
                     /************************************JAR璋冨害************************************/
 
+                    mainService.signTrunBig();
+
 
                 } catch (Exception e) {
                     e.printStackTrace();

--
Gitblit v1.9.1