From b143fe586d7be6c12ec162bf5aebb3a99bff7e32 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 06 九月 2023 08:48:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs
---
src/main/java/com/zy/core/MainProcess.java | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 956e97f..6aa5829 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -30,27 +30,50 @@
thread = new Thread(() -> {
while (!Thread.currentThread().isInterrupted()) {
try {
+
+ // 闂撮殧
+ Thread.sleep(1000);
+
// 绯荤粺杩愯鐘舵�佸垽鏂�
- if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
+
+ // 婕旂ず
+ mainService.crnDemoOfLocMove1();
+ // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
+// mainService.ioConvert();
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
- mainService.generateStoreWrkFile();
+ mainService.generateStoreWrkFile(); // 缁勬墭
+// mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
// 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
- mainService.stnToCrnStnPick();
+// mainService.stnToCrnStnPick();
// 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
mainService.crnStnToOutStn();
// 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
mainService.crnIoExecute();
-
- // 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫叆搴撳畬鎴�
+ // 鍏ュ嚭搴撳寮� ===>> 鍫嗗灈鏈哄懡浠や笅鍙戝悗锛屽紓姝ヤ慨鏀瑰伐浣滄。鐘舵��
+// mainService.crnIoWrkMast();
+ // 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
mainService.storeFinished();
- // 鏇存柊鍫嗗灈鏈虹Щ鍔ㄦ椂宸ヤ綔妗ｇ姸鎬�
- mainService.updateCrnMove();
+ // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
+ mainService.recCrnErr();
+ // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
+ mainService.storeEmptyPlt();
+ // 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
+// mainService.ledExecute();
+ // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
+// mainService.ledReset();
+// mainService.outOfDevp();
- // 闂撮殧
- Thread.sleep(1500);
- log.info("WCS 宸ヤ綔涓� .....................");
+ //鍚姩銆佸畬鎴愩�佹殏鍋滄祴璇曠郴缁熸祴璇�
+ mainService.packTest1();
+// //鐏锛岀粰鍫嗗灈鏈哄彂閫佺伀璀﹁鎶�
+ mainService.fierCrn();
+
+ //103绔欑偣鏈夌墿涓嬪彂pack鐮�
+ mainService.packDevp();
+
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.9.1