From 759cd0e706e252e907955073eed8e4935b21d9c8 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 31 十二月 2025 08:13:48 +0800
Subject: [PATCH] 1.修复拣料回库时拣料出库转历史档 2.生成移动任务修复 3.完善agv搬运入库出库申请

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

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 325ed47..1546d1f 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -42,15 +42,17 @@
                     }
 
                     // 婕旂ず
-                    mainService.crnDemoOfLocMove1();
+//                    mainService.crnDemoOfLocMove1();
                     // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
 //                    mainService.ioConvert();
                     // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
                     mainService.generateStoreWrkFile(1); // 缁勬墭
-                    mainService.generateStoreWrkFile0(2); // WMS鍏ュ簱
+//                    mainService.generateStoreWrkFile0(2); // WMS鍏ュ簱
                     Thread.sleep(500);
                     // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
-                    mainService.stnToCrnStnPick(3);
+//                    mainService.stnToCrnStnPick(3);
+                    // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱-鏉$爜
+                    mainService.stnToCrnStnPickBarcode(33);
                     // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
                     mainService.crnStnToOutStn(4);
                     // 鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
@@ -61,22 +63,29 @@
                     mainService.storeFinished(6);
                     // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
                     mainService.recCrnErr(7);
-                    // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
-                    mainService.storeEmptyPlt(8);
+
+
+                    // 绌烘墭鐩樺叆搴�-绔嬪簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
+//                    mainService.storeEmptyPlt(8);
+                    // 绌烘墭鐩樺叆搴�-浜х嚎
+//                    mainService.storeEmptyPltLine(13);
+
                     // 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣�
                     mainService.ledExecute(9);
                     // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
                     mainService.ledReset(10);
 
                     // RGV  ===>> 鎵ц瀵筊GV鎿嶄綔
-                    mainService.rgvExecute(11);
+//                    mainService.rgvExecute(11);
                     // RGV  ===>> 鎵ц瀵筊GV宸ヤ綔妗g殑瀹屾垚鎿嶄綔
-                    mainService.rgvFinished(12);
+//                    mainService.rgvFinished(12);
+                    // RGV  ===>> 鎵ц瀵筊GV宸ヤ綔妗g殑瀹屾垚鎿嶄綔 绔欏埌绔�
+//                    mainService.rgvFinished2(14);
 
                     //鍫嗗灈鏈烘棤浠诲姟涓ゅ垎閽燂紝鍥炲叆搴撳彛寰呮満
-                    mainService.crnMove();
+//                    mainService.crnMove();
                     //鍫嗗灈鏈烘湁鍏ュ簱浠诲姟鏃讹紝鍥炲叆搴撳彛寰呮満
-                    mainService.crnMoveByInTask();
+//                    mainService.crnMoveByInTask();
 
                 } catch (Exception e) {
                     e.printStackTrace();

--
Gitblit v1.9.1