From 1bc0ec629b23e000be7817c0b9434aacddb3ed45 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 29 十二月 2025 12:19:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 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 c9c56aa..b27eb0d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -561,8 +561,6 @@
public synchronized void generateStoreWrkFile(Integer mark) {
String methodName = Thread.currentThread().getStackTrace()[1].getMethodName();
- final Set<String> INVALID_BARCODES = new HashSet<>(Arrays.asList("NG", "NoRead", "00000000"));
-
for (DevpSlave devp : slaveProperties.getDevp()) {
for (DevpSlave.Sta inSta : devp.getInSta()) {
@@ -647,7 +645,6 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
}
- continue;
} else {
// 灏哄/閲嶉噺/鎵爜寮傚父妫�娴�
if (staProtocol == null) continue;
@@ -664,7 +661,7 @@
else if (staProtocol.isBarcodeErr()) { errMsg = "鎵爜澶辫触"; back = true; }
// 灏哄寮傚父鍥為��
- if (back && staProtocol.getWorkNo() <9999) {
+ if (back && staProtocol.getWorkNo() == 9998) {
// log.info("errmsg: " + errMsg);
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
@@ -674,7 +671,6 @@
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
log.error("杈撻�佺嚎涓嬪彂1锛�" + wrkNo + "," + inSta.getBackSta());
- continue;
}
// // 鍏ュ簱鏉′欢婊¤冻锛屽紑濮嬭姹傚叆搴撳湴鍧�
@@ -1378,7 +1374,7 @@
public synchronized void crnRebackHp(CrnProtocol crnProtocol, CrnThread crnThread,String staNo) {
if(staNo == null){
if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
- if (crnProtocol.getBay() == 121 || crnProtocol.getBay() == 1) {
+ if (crnProtocol.getBay() == 121 ) {
return;
}
int x=1;
@@ -1400,9 +1396,9 @@
}
//杈撻�佺嚎娌℃湁鍏ュ簱浠诲姟锛岃繃婊�2
- if (wrkMastMapper.selectDevWorking(crnProtocol.getCrnNo()) != null) {
- return;
- }
+// if (wrkMastMapper.selectDevWorking(crnProtocol.getCrnNo()) != null) {
+// return;
+// }
News.info("鍫嗗灈鏈哄彫鍥炲師鐐�==>>" + crnProtocol.getCrnNo() + "鍙峰爢鍨涙満鏈夊叆搴撲换鍔�,鍙洖鍘熺偣");
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
CrnCommand crnCommand = new CrnCommand();
--
Gitblit v1.9.1