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 | 35 +++++++++++------------------------
1 files changed, 11 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 3e01e03..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()) {
@@ -587,7 +585,7 @@
String barcode = barcodeThread.getBarcode();
// 濡傛灉鍓嶅伐浣嶆湁璐� + 鎵爜鍣ㄦ湁鏉＄爜
- if (staProtocolIn.getStamp() == 1 && barcode != null && !barcode.isEmpty()) {
+ if (staProtocolIn.getStamp() == 1 && !barcode.equals("00000000") && !barcode.isEmpty()) {
log.info("鐢熸垚淇″彿鏃堕棿: {}", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS").format(new Date()));
if (wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("barcode", barcode)
@@ -631,7 +629,7 @@
}
} else {
String msg = json.getString("msg");
- if (!"宸ヤ綔妗ｅ凡瀛樺湪".equals(msg)) {
+ if (!"宸ヤ綔妗ｅ凡瀛樺湪".equals(msg) && staProtocol.getWorkNo()<9999) {
staProtocol.setWorkNo(wrkNo++);
staProtocol.setStaNo(inSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
@@ -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();
@@ -1510,9 +1506,10 @@
log.info("璇诲彇鍒板伐浣滃彿鏃堕棿: {}", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS").format(new Date()));
}
- if (staProtocol.isAutoing() && staProtocol.getWorkNo() > 0 && staProtocol.getWorkNo() <9998
+// && staProtocol.getWorkNo() > 0 && staProtocol.getWorkNo() <9998
+ if (staProtocol.isAutoing() && staProtocol.getWorkNo() > 0 && staProtocol.getWorkNo() <9998
&& staDetl.getCanining() != null && staDetl.getCanining().equals("Y")) {
- log.info("鍙叆鏃堕棿: {}", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS").format(new Date()));
+ log.info("浠诲姟婊¤冻涓嬪彂鏃堕棿: {}", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS").format(new Date()));
flag = true;
}
@@ -1525,6 +1522,7 @@
}
// 鑾峰彇宸ヤ綔鐘舵�佷负2锛堣澶囦笂璧帮級鐨勫叆搴撳伐浣滄。
WrkMast wrkMast = wrkMastMapper.selectPakInStep2(slave.getId(), staProtocol.getWorkNo(), crnStn.getStaNo());
+// wrkMast = wrkMast1;
if (null == wrkMast) {
log.info("" + mark + " - 1" + " - 4" + " - 鏌ヨ鏃犲緟鍏ュ簱鏁版嵁--wrk_sts=2, 宸ヤ綔鍙�={}", staProtocol.getWorkNo());
News.infoNoLog("" + mark + " - 1" + " - 4" + " - 鏌ヨ鏃犲緟鍏ュ簱鏁版嵁--wrk_sts=2, 宸ヤ綔鍙�={}", staProtocol.getWorkNo());
@@ -1576,17 +1574,6 @@
News.error("" + mark + " - 1" + " - 16" + " - 鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
} else {
-// long startTime = System.currentTimeMillis();
-// while ((System.currentTimeMillis() - startTime) < COMMAND_TIMEOUT) {
-//
-// if (true) {
-// break;
-// }
-//
-// try{
-// Thread.sleep(500);
-// }catch(Exception ignore){}
-// }
// 淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓�
Date now = new Date();
--
Gitblit v1.9.1