From ffdccd8f0cf0ebe9777a0b78097ea7d8c6af8f9d Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 06 五月 2026 08:49:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 49 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 38 insertions(+), 11 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..f2c1f79 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;
@@ -1222,7 +1228,7 @@
//mark - 3 - ....
this.locToLoc(crn, crnProtocol,mark);
//棰勮皟搴�
- this.crnRebackHp(crn, crnProtocol, crnThread);
+// this.crnRebackHp(crn, crnProtocol, crnThread);
}
// News.infoNoLog(""+mark+" - 0"+" - 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂鎵ц瀹屾垚");
@@ -5114,7 +5120,9 @@
}
if(barcode.length()!=6){
- armTaskAssignmentCallApiLogSave(staProtocol, "鏉＄爜闀垮害涓嶆槸6浣�", staProtocol.getSiteId()+"鐮佸灈浣嶇疆锛屾潯鐮侀暱搴︿笉鏄�6浣�===>>" + barcode, true);
+ log.error( "{}鏉＄爜闀垮害涓嶆槸6浣�", basArm.getStaNoSou());
+
+// armTaskAssignmentCallApiLogSave(staProtocol, "鏉＄爜闀垮害涓嶆槸6浣�", staProtocol.getSiteId()+"鐮佸灈浣嶇疆锛屾潯鐮侀暱搴︿笉鏄�6浣�===>>" + barcode, true);
continue;
}
@@ -5122,7 +5130,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;
}
@@ -5285,6 +5296,17 @@
}
try{
LocMast locMastEnd = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", basArm.getStaNoSou()));
+ BasArmMast basArmMast0 = basArmMastService.selectOne(new EntityWrapper<BasArmMast>().eq("arm_no",basArm.getArmNo()).eq("status",0));
+ if(basArmMast0 != null ){
+ List<BasArmMast> basArmMast3 = basArmMastService.selectList(new EntityWrapper<BasArmMast>().eq("arm_no",basArm.getArmNo()).eq("status",3));
+
+ LocMast locMastStaNo = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", basArmMast0.getStaNo()));
+ if(!locMastStaNo.getLocSts().equals("D")){
+ basArmMastService.deleteById(basArmMast0);
+ }else if(basArmMast3.size() > 0){
+ basArmMastService.deleteById(basArmMast0);
+ }
+ }
if(!locMastEnd.getLocSts().equals("D")){
continue;
}
@@ -5292,16 +5314,18 @@
String barcode = locMastEnd.getBarcode();
if(!Cools.isEmpty(barcode)) {
if("NG".endsWith(barcode) || "NoRead".equals(barcode) || "0".equals(barcode)) {
- log.error( "鍙栬揣鏉＄爜涓虹┖", basArm.getStaNoSou());
+ log.error( "{}鍙栬揣鏉＄爜涓虹┖", basArm.getStaNoSou());
continue;
}
} else {
- log.error( "鍙栬揣鏉＄爜涓虹┖", basArm.getStaNoSou());
+ log.error( "{}鍙栬揣鏉＄爜涓虹┖", basArm.getStaNoSou());
continue;
}
if(barcode.length()!=6){
- armTaskAssignmentCallApiLogSave(locMastEnd, "鏉＄爜闀垮害涓嶆槸6浣�", basArm.getStaNoSou()+"鐮佸灈浣嶇疆锛屾潯鐮侀暱搴︿笉鏄�6浣�===>>" + barcode, true);
+ log.error( "{}鏉＄爜闀垮害涓嶆槸6浣�", basArm.getStaNoSou());
+
+// armTaskAssignmentCallApiLogSave(locMastEnd, "鏉＄爜闀垮害涓嶆槸6浣�", basArm.getStaNoSou()+"鐮佸灈浣嶇疆锛屾潯鐮侀暱搴︿笉鏄�6浣�===>>" + barcode, true);
continue;
}
@@ -5601,7 +5625,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);
@@ -5657,7 +5681,10 @@
agvBindCtnrAndBinParam.setCtnrTyp("1");
ReturnT<String> resultBind = new PostMesDataUtils().postMesDataAgv("AGV瀹瑰櫒缁戝畾", AgvConstant.AGV_URL, AgvConstant.AGV_CTNRANDBING, agvBindCtnrAndBinParam);
}
- wrkMast.setTakeNone("2");
+ BasAgvMast agvMast = basAgvMastService.selectOne(new EntityWrapper<BasAgvMast>().eq("task_no",wrkMast.getWrkNo()));
+ if(agvMast!=null){
+ wrkMast.setTakeNone("2");
+ }
wrkMastMapper.updateById(wrkMast);
} else {
News.error(JSON.toJSONString(staProtocol));
@@ -5729,7 +5756,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