From 7c264be282c33feedbd4478f7e674ebac8fd55db Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期六, 21 三月 2026 15:39:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 19 ++++++++++++++-----
1 files changed, 14 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 f016435..8242f56 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -285,6 +285,9 @@
staProtocolNew.setSiteId(staProtocol.getSiteId());
devpThread.setPakMk(staProtocol.getSiteId(), false);
staProtocolNew.setBarcode(barcode);
+ if(!staProtocolNew.isLoading()){
+ continue;
+ }
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocolNew));
if (ledThread != null) {
News.error(methodName + ":鎵爜澶辫触锛岃閲嶈瘯");
@@ -1098,14 +1101,17 @@
}
}
}
- if(staProtocolIn.getWorkNo() != null && staProtocolIn.getStaNo() != 4001){
+ WrkMast wrkMastIn= wrkMastMapper.selectByWrkNo(staProtocolIn.getWorkNo());
+ if(wrkMastIn == null){
+ continue;
+ }
+ if(staProtocolIn.getWorkNo() != null && wrkMastIn.getStaNo() != 4001){
WrkMast wrkMastCrn = wrkMastMapper.selectByWrkNo(staProtocolIn.getWorkNo());
if(wrkMastCrn!=null){
if(wrkMastCrn.getCrnNo() == 3 ){
continue;
}
}
- WrkMast wrkMastIn = wrkMastMapper.selectByWrkNo(staProtocolIn.getWorkNo());
WrkMast wrkMast = wrkMastMapper.selectByWrkNo(9996);
if(wrkMastIn == null){
continue;
@@ -5122,7 +5128,10 @@
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",barcode));
int countwait = waitPakinMapper.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",barcode));
if (countLoc > 0 || countWrk > 0 || countwait > 0) {
- armTaskAssignmentCallApiLogSave(staProtocol, "鏉＄爜鏁版嵁宸插瓨鍦�", staProtocol.getSiteId()+"鐮佸灈浣嶇疆锛岀粍鎵樻。/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + barcode, true);
+ log.info("鏉＄爜鏁版嵁宸插瓨鍦�, staProtocol={}, siteInfo={}, barcode={}",
+ staProtocol,
+ staProtocol.getSiteId() + "鐮佸灈浣嶇疆锛岀粍鎵樻。/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>",
+ barcode);
continue;
}
@@ -5601,7 +5610,7 @@
}
// 鍒ゆ柇閲嶅宸ヤ綔妗�
- List<BasAgvMast> basAgvMastList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("task_no", staProtocol.getWorkNo()));
+ List<BasAgvMast> basAgvMastList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("task_no", wrkMast.getWrkNo()));
if (!basAgvMastList.isEmpty()) {
wrkMast.setTakeNone("2");
wrkMastMapper.updateById(wrkMast);
@@ -5729,7 +5738,7 @@
}
List<LocMast> locMastList = locMastService.selectList(new EntityWrapper<LocMast>().eq("barcode", barcode));
if (!locMastList.isEmpty()) {
-// News.info("{}鍙风珯鐐规潯鐮佷俊鎭噸澶嶏細{}", outStaAgv.getStaNo(), barcode);
+ News.info("{}鍙风珯鐐规潯鐮佷俊鎭噸澶嶏細{}", outStaAgv.getStaNo(), barcode);
continue;
}
// 浠诲姟鐢熸垚鍖� --------------------------------------------------------------------------
--
Gitblit v1.9.1