From babced4b43fef3901fc619357947a0917318d27b Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期二, 07 五月 2024 13:53:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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 64a91c4..caa1916 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -219,6 +219,8 @@
.in("io_type", 107,103,57,53));
if (!Cools.isEmpty(checkPick)) {
continue;
+ } else {
+ News.info("鏂版澘鍏ュ簱鏉＄爜===>>" + barcode);
}
// WrkMast checkPick2 = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
// .eq("barcode", barcode)
@@ -630,6 +632,7 @@
wrkMast.setCrnEndTime(new Date());
if (wrkMastMapper.updateById(wrkMast) != 0) {
// 澶嶄綅鍫嗗灈鏈�
+ News.info("crnStnToOutStn鍫嗗灈鏈哄浣嶆椂宸ヤ綔鍙�===>>" + crnProtocol.getTaskNo());
crnThread.setResetFlag(true);
} else {
News.error(methodName + ":鏇存柊宸ヤ綔妗ｇ殑宸ヤ綔鐘舵�佷负14澶辫触锛侊紒锛� [宸ヤ綔鍙�:{}]", wrkMast.getWrkNo());
@@ -806,6 +809,12 @@
// 鍫嗗灈鏈烘帶鍒惰繃婊�
if (!crnProtocolNow.getStatusType().equals(CrnStatusType.IDLE) || crnProtocolNow.getTaskNo() != 0) {
continue;
+ }
+
+ // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
+ if (wrkMastMapper.selectWorking(slave.getId()) != null) {
+ break;
+// return;
}
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
@@ -1519,6 +1528,7 @@
}
// 鍏ュ簱 + 搴撲綅杞Щ ==> 4.鍏ュ簱瀹屾垚
if (wrkMast.getWrkSts() == 3 || (wrkMast.getWrkSts() == 12 && wrkMast.getIoType() == 11)) {
+ log.error("鍏ュ簱瀹屾垚鍫嗗灈鏈轰换鍔�=========銆�"+JSON.toJSONString(wrkMast));
wrkMast.setWrkSts(4L);
} else {
continue;
@@ -1529,6 +1539,7 @@
// 淇敼鎴愬姛鍚庡浣嶅爢鍨涙満
if (wrkMastMapper.updateById(wrkMast) > 0) {
// 鍫嗗灈鏈哄浣�
+ News.info("storeFinished鍫嗗灈鏈哄浣嶆椂宸ヤ綔鍙�===>>" + crnProtocol.getTaskNo());
crnThread.setResetFlag(true);
}
}
@@ -1904,8 +1915,13 @@
for (Integer staNo : led.getStaArr()) {
// 鑾峰彇鍙夎溅绔欑偣
StaProtocol staProtocol = devpThread.getStation().get(staNo);
+ StaProtocol staProtocol1 = devpThread.getStation().get(staNo+1);
if (staProtocol == null) { continue; }
- if (staProtocol.getWorkNo() != 0) {
+ if (staProtocol.getWorkNo() != 0 || staProtocol.isLoading()) {
+ reset = false;
+ break;
+ }
+ if (staProtocol1.isLoading() || staProtocol1.getWorkNo() != 0) {
reset = false;
break;
}
--
Gitblit v1.9.1