From 3e5358a4aba7a024509dcd601070001a6f3bcb55 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 02 八月 2025 14:44:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sxjzwcs-3' into sxjzwcs-3
---
src/main/java/com/zy/core/MainProcess.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 6315b0b..7be33fd 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -5,11 +5,9 @@
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import javax.annotation.PreDestroy;
-import java.util.ArrayList;
/**
* WCS涓绘祦绋�
@@ -44,12 +42,12 @@
}
// 婕旂ず
- mainService.crnDemoOfLocMove1();
+// mainService.crnDemoOfLocMove1();
// 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
// mainService.ioConvert();
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
mainService.generateStoreWrkFile(1); // 缁勬墭
- mainService.generateStoreWrkFile0(2); // WMS鍏ュ簱
+// mainService.generateStoreWrkFile0(2); // WMS鍏ュ簱
Thread.sleep(500);
// 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
mainService.stnToCrnStnPick(3);
@@ -72,6 +70,11 @@
mainService.outOfDevp(11);
+ mainService.crnMove();
+
+ // 澶嶄綅涓�鏈焞ed鍏ュ簱鍚庢樉绀洪粯璁や俊鎭�
+// mainService.resetOneLed();
+
//mainService.DevpCallThePolice(12);
--
Gitblit v1.9.1