From c72e895c78b1c351281851ae7421b74ffc63c35e Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 12 十一月 2025 08:24:29 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 7 ++-----
1 files changed, 2 insertions(+), 5 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 877f51e..5242294 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -218,7 +218,7 @@
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, barcode + "鏉＄爜宸插瓨鍦ㄧ姸鎬佷负锛� 2.璁惧涓婅蛋 锛夌殑浠诲姟,宸ヤ綔鍙�=" + wrkMast.getWrkNo()));
staProtocol.setWorkNo(wrkMast.getWrkNo());
staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
+// devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
if (!result) {
throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
@@ -418,9 +418,6 @@
if (!back && staProtocol.isBarcodeErr()) {
errMsg = "鎵爜澶辫触";
back = true;
- }
- if(staProtocol.getSiteId() > 400){
- back = false;
}
// 閫�鍥�
@@ -2195,7 +2192,7 @@
}
LocMast sourceLoc = locMastService.queryDemoSourceLoc(crn.getId());
- LocMast loc = locMastService.queryDemoLoc(crn.getId(),sourceLoc.getBarcode().substring(0,1));
+ LocMast loc = locMastService.queryDemoLoc(crn.getId(),sourceLoc.getLocType2().toString());
if (null == sourceLoc || null == loc) {
continue;
}
--
Gitblit v1.9.1