From b4d9cf3a9974d9abac40ecd228820e5e854b080a Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 07 一月 2026 17:43:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java b/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java
index 79b9d7c..aacc34f 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java
@@ -37,7 +37,7 @@
private OpenService openService;
- public ReturnT<String> start(BasAgvMast basAgvMast) {
+ public ReturnT<String> start(BasAgvMast basAgvMast) {
try {
Date now = new Date();
switch (basAgvMast.getIoType()){
@@ -60,16 +60,14 @@
basAgvLocDetlService.delete(new EntityWrapper<BasAgvLocDetl>().eq("loc_no", basAgvMast.getSourceLocNo()));
basAgvWrkDetlService.delete(new EntityWrapper<BasAgvWrkDetl>().eq("wrk_no", basAgvMast.getTaskNo()));
basAgvMast.setStatus(3);
- basAgvMastService.updateById(basAgvMast);
- openService.agvBindAndBin(String.valueOf(basAgvMast.getTaskNo()));
+ if(basAgvMastService.updateById(basAgvMast)){
+ openService.agvBindAndBin(String.valueOf(basAgvMast.getTaskNo()));
+ }
break;
case 1:
LocMast sourceLoc1 = locMastService.selectById(basAgvMast.getSourceLocNo());
LocMast locMast1 = locMastService.selectById(basAgvMast.getLocNo());
List<BasAgvLocDetl> locDetls1 = basAgvLocDetlService.selectList(new EntityWrapper<BasAgvLocDetl>().eq("loc_no", basAgvMast.getLocNo()));
- if (!locDetls1.isEmpty()) {
- basAgvLocDetlService.delete(new EntityWrapper<BasAgvLocDetl>().eq("loc_no", basAgvMast.getLocNo()));
- }
// 淇敼鐩爣搴撲綅鐘舵�� ==> .locSts
locMast1.setLocSts("F");
locMast1.setBarcode(sourceLoc1.getBarcode());
@@ -98,7 +96,6 @@
}
}
- basAgvLocDetlService.delete(new EntityWrapper<BasAgvLocDetl>().eq("loc_no", basAgvMast.getSourceLocNo()));
basAgvWrkDetlService.delete(new EntityWrapper<BasAgvWrkDetl>().eq("wrk_no", basAgvMast.getTaskNo()));
// basAgvLocDetlService.delete(new EntityWrapper<BasAgvLocDetl>().eq("loc_no", basAgvMast.getLocNo()));
basAgvMast.setStatus(4);
@@ -161,7 +158,7 @@
}
}
-// basAgvLocDetlService.delete(new EntityWrapper<BasAgvLocDetl>().eq("loc_no", basAgvMast.getLocNo()));
+ basAgvLocDetlService.delete(new EntityWrapper<BasAgvLocDetl>().eq("loc_no", basAgvMast.getSourceLocNo()));
basAgvWrkDetlService.delete(new EntityWrapper<BasAgvWrkDetl>().eq("wrk_no", basAgvMast.getTaskNo()));
basAgvMast.setStatus(3);
if(basAgvMast.getFloorNo() == 2 || basAgvMast.getFloorNo() == 3){
--
Gitblit v1.9.1