From 757f103f37d83dfb55bb49b3df0b805cb520d4f7 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 11 十月 2025 15:28:26 +0800
Subject: [PATCH] 第三版
---
src/main/java/com/zy/asrs/task/handler/FireOutHandler.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 05efc88..0bbe140 100644
--- a/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java
@@ -43,7 +43,10 @@
try {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("fire_status", 1)
- .eq("loc_sts", "F"));
+ .andNew()
+ .eq("loc_sts", "F")
+ .or()
+ .eq("loc_sts", "R"));
Integer ioType = 101; //鍑哄簱
Date now = new Date();
//浼樺厛绾�99锛岀Щ搴撳埌0102501
@@ -51,9 +54,15 @@
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);
@@ -81,6 +90,7 @@
wrkMast.setAppeTime(now);
wrkMast.setModiUser(9999L);
wrkMast.setModiTime(now);
+ log.info("鐢熸垚鐏鎶ヨ浠诲姟锛�"+wrkMast);
if (!wrkMastService.insert(wrkMast)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細"+locMast.getLocNo());
}
@@ -107,6 +117,9 @@
if (!locMastService.updateById(locMast)) {
throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+locMast.getLocNo());
}
+ log.info("鐢熸垚鐏鎶ヨ浠诲姟鎴愬姛锛岀瓑寰呮搷浣滀汉鍛樼‘瀹氭嫈绾垮悗锛屽爢鍨涙満浣滀笟"+wrkMast);
+ }else if(locMast.getLocSts().equals("R")){
+
} else {
throw new CoolException(locMast.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
}
--
Gitblit v1.9.1