From e3a8ad51dd9f42c81557571a09dff3c108e844f1 Mon Sep 17 00:00:00 2001
From: dubin <dubin>
Date: 星期一, 25 八月 2025 17:41:51 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 34 ++++++++++------------------------
1 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 84a094a..a8f51aa 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -468,7 +468,7 @@
// 閫�鍥�
// if (back) {
// log.info("errmsg: " + errMsg);
-//// News.warn("鎵爜鍏ュ簱澶辫触锛寋}鍏ュ簱绔欏洜{}寮傚父锛屾墭鐩樺凡琚��鍥�", inSta.getStaNo(), errMsg);
+// News.warn("鎵爜鍏ュ簱澶辫触锛寋}鍏ュ簱绔欏洜{}寮傚父锛屾墭鐩樺凡琚��鍥�", inSta.getStaNo(), errMsg);
// MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(5, errMsg));
// if (!staProtocol.isLoading()) {
// continue;
@@ -503,7 +503,7 @@
//
//
// if (!Cools.isEmpty(barcode)) {
-//// News.info(""+mark+" - 1"+" - {}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", pickSta.getBarcode(), barcode);
+// News.info(""+mark+" - 1"+" - {}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", pickSta.getBarcode(), barcode);
// if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
// continue;
// }
@@ -520,7 +520,7 @@
staProtocol = staProtocol.clone();
}
-// // 鍏ュ嚭搴撴ā寮忓垽鏂�
+ // 鍏ュ嚭搴撴ā寮忓垽鏂�
// if (devpThread.ioMode != IoModeType.PAKIN_MODE) { continue; }
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk()) {
@@ -1544,7 +1544,10 @@
// 鐘舵�侊細绛夊緟纭 骞朵笖 浠诲姟瀹屾垚浣� = 1
if (crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.getTaskNo() != 0) {
News.warnNoLog("" + mark + " - 0" + " - 寮�濮嬫墽琛屽宸ヤ綔妗ｇ殑瀹屾垚鎿嶄綔锛屼换鍔″彿:" + crnProtocol.getTaskNo());
-
+ if (crnProtocol.getTaskNo() == 9999){
+ crnThread.setResetFlag(true);
+ continue;
+ }
// 鑾峰彇鍏ュ簱寰呯‘璁ゅ伐浣滄。
WrkMast wrkMast = wrkMastMapper.selectPakInStep3(crnProtocol.getTaskNo().intValue());
if (wrkMast == null) {
@@ -1554,9 +1557,7 @@
// 鍏ュ簱 + 搴撲綅杞Щ ==> 4.鍏ュ簱瀹屾垚
if (wrkMast.getWrkSts() == 3 || (wrkMast.getWrkSts() == 12 && wrkMast.getIoType() == 11)) {
wrkMast.setWrkSts(4L);
- } else if (wrkMast.getIoType()==120 && wrkMast.getWrkSts()==2){
- wrkMast.setWrkSts(5L);
- }else {
+ } else {
continue;
}
Date now = new Date();
@@ -1810,7 +1811,7 @@
}
}
}
-// News.infoNoLog(""+mark+" - 0"+" - 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐ф墽琛屽畬鎴�");
+ News.infoNoLog(""+mark+" - 0"+" - 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐ф墽琛屽畬鎴�");
}
/**
@@ -3244,21 +3245,6 @@
CrnSlave.CrnStn crnStn = crn.getCrnInStn().get(0);
News.info("鍫嗗灈鏈烘棤浠诲姟鑷姩鍥炲叆搴撳彛寰呮満==>>" + crnProtocol.getCrnNo() + "鍙峰爢鍨涙満");
- //鐢熸垚鍥炲師鐐瑰伐浣滄。 浣欏閿愰簰
- WrkMast wrkMast=new WrkMast();
- wrkMast.setWrkNo(9999);//宸ヤ綔鍙�
- wrkMast.setIoTime(new Date());
- wrkMast.setWrkSts(2L);//宸ヤ綔鐘舵��
- wrkMast.setIoType(120);//浠诲姟绫诲瀷 120.鍫嗗灈鏈哄洖鍘熺偣
- wrkMast.setIoPri(13.0);//浼樺厛绾�
- wrkMast.setCrnNo(1);//鍫嗗灈鏈哄彿
- wrkMast.setSourceStaNo(0);//婧愮珯
- wrkMast.setStaNo(0);//鐩爣绔�
- wrkMast.setSourceLocNo("");//婧愬簱浣�
- wrkMast.setLocNo("");//鐩爣搴撲綅
- if (wrkMastMapper.insert(wrkMast)==0){
- throw new CoolException("淇濆瓨宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
- }
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
CrnCommand crnCommand = new CrnCommand();
// if (crnProtocol.getCrnNo()==3 || crnProtocol.getCrnNo()==4){
@@ -3278,7 +3264,7 @@
crnCommand.setTaskNo((short) 9999); // 宸ヤ綔鍙�
crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
// crnCommand.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡: 鍫嗗灈鏈虹Щ鍔�
- crnCommand.setTaskMode(CrnTaskModeType.X_MOVE);//浣欏閿愰簰鍥炲師鐐逛换鍔＄被鍨�
+ crnCommand.setTaskMode(CrnTaskModeType.X_MOVE);//浣欏閿愰簰鍥炲師鐐逛换鍔℃ā寮�: 绔欎綅杞Щ
crnCommand.setSourcePosX(crnStn.getRow().shortValue()); // 婧愬簱浣嶆帓
crnCommand.setSourcePosY((short) 1); // 婧愬簱浣嶅垪
crnCommand.setSourcePosZ((short) 1); // 婧愬簱浣嶅眰
--
Gitblit v1.9.1