From cd280ead41b98ee60154038e36d9b83cc25e7d16 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 20 十二月 2023 12:55:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/FireOutHandler.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java b/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java
index 1290b9d..a629340 100644
--- a/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java
@@ -43,17 +43,26 @@
try {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("fire_status", 1)
- .eq("loc_sts", "F"));
- Integer ioType = 101; //绉诲簱
+ .andNew()
+ .eq("loc_sts", "F")
+ .or()
+ .eq("loc_sts", "R"));
+ Integer ioType = 101; //鍑哄簱
Date now = new Date();
//浼樺厛绾�99锛岀Щ搴撳埌0102501
for(LocMast locMast : locMasts){
if (Cools.isEmpty(locMast)){
continue;
}
+ WrkMast wrkMast2=wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("sta_no",1000)
+ .eq("source_loc_no",locMast.getLocNo()));
+ if(!Cools.isEmpty(wrkMast2)){
+ continue;
+ }
WrkMast wrkMast1=wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no",locMast.getLocNo()));
if(!Cools.isEmpty(wrkMast1)){
wrkMastService.delete(new EntityWrapper<WrkMast>().eq("source_loc_no",locMast.getLocNo()));
+ wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("zpallet",locMast.getBarcode()));
}
// 鑾峰彇璺緞
StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), 1000);
@@ -107,6 +116,8 @@
if (!locMastService.updateById(locMast)) {
throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+locMast.getLocNo());
}
+ }else if(locMast.getLocSts().equals("R")){
+
} else {
throw new CoolException(locMast.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
}
--
Gitblit v1.9.1