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 | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 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 8242f56..f2c1f79 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1228,7 +1228,7 @@
//mark - 3 - ....
this.locToLoc(crn, crnProtocol,mark);
//棰勮皟搴�
- this.crnRebackHp(crn, crnProtocol, crnThread);
+// this.crnRebackHp(crn, crnProtocol, crnThread);
}
// News.infoNoLog(""+mark+" - 0"+" - 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂鎵ц瀹屾垚");
@@ -5120,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;
}
@@ -5294,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;
}
@@ -5301,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;
}
@@ -5666,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));
--
Gitblit v1.9.1