From 52985bb39bdeb8e0d6ac04327c703c148bda3b6e Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 11 十月 2025 15:53:41 +0800
Subject: [PATCH] 修复自动移库BUG
---
src/main/java/com/zy/asrs/task/EmptyOutWing.java | 47 ++++++++++++++++++++---------------------------
1 files changed, 20 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/EmptyOutWing.java b/src/main/java/com/zy/asrs/task/EmptyOutWing.java
index 6b0ec86..a08e778 100644
--- a/src/main/java/com/zy/asrs/task/EmptyOutWing.java
+++ b/src/main/java/com/zy/asrs/task/EmptyOutWing.java
@@ -4,9 +4,11 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.StaDesc;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.StaDescService;
import com.zy.asrs.service.WrkMastService;
@@ -34,30 +36,21 @@
private CommonService commonService;
@Autowired
ConfigService configService;
+ @Autowired
+ private BasDevpService basDevpService;
-
+ /**
+ * 鑷姩鍑虹┖鏉�
+ */
@Scheduled(cron = "0/3 * * * * ? ")
private void execute() {
Config config = configService.selectConfigByCode("AutoEmpty");
- if(config.getStatus()==0){
+ if (config.getStatus() == 0) {
return;
}
- int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110));
- if (count > 0) {
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("wrk_sts", 7));
- if (Cools.isEmpty(wrkMast)) {
- return;
- }
- WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 1).eq("wrk_sts", 2).eq("full_plt", "N"));
- if (Cools.isEmpty(wrkMast1)) {
- return;
- }
- wrkMast1.setFullPlt("Y");
- wrkMastService.updateById(wrkMast1);
- wrkMast.setWrkSts(14L);
- wrkMastService.updateById(wrkMast);
- } else {
- List<LocMast> locMastss =locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").orderBy("bay1"));
+ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 100));
+ if (Cools.isEmpty(basDevp.getLoading())||basDevp.getLoading().equals("N")) {
+ List<LocMast> locMastss = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").orderBy("bay1"));
if (Cools.isEmpty(locMastss)) {
return;
}
@@ -67,22 +60,24 @@
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(locMasta.getLocNo());
if (Cools.isEmpty(locMast)) {
- throw new CoolException(locMasta.getLocNo()+"搴撲綅涓嶅瓨鍦�");
+ throw new CoolException(locMasta.getLocNo() + "搴撲綅涓嶅瓨鍦�");
}
- if (!locMast.getLocSts().equals("D")){
- throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篋鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMast.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMast.getLocSts()+"-"+locMast.getLocSts$());
+ if (!locMast.getLocSts().equals("D")) {
+ throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篋鐨勫簱浣嶏紝搴撲綅鍙凤細" + locMast.getLocNo() + " 銆佸綋鍓嶇姸鎬侊細" + locMast.getLocSts() + "-" + locMast.getLocSts$());
}
boolean res1 = true;
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("lev1", locMast.getLev1())
- .orderBy("bay1",res1));
+ .orderBy("bay1", res1));
for (LocMast locMast1 : locMasts) {
if (locMast1.getLocNo().equals(locMast.getLocNo())) {
break;
}
if (locMast1.getLocSts().equals("D") || locMast1.getLocSts().equals("F")) {
- throw new CoolException(locMasta.getLocNo()+"搴撲綅鍫靛锛岀姝㈠嚭搴�");
+ throw new CoolException(locMasta.getLocNo() + "搴撲綅鍫靛锛岀姝㈠嚭搴�");
+ }else if(!locMast1.getLocSts().equals("O")){
+ return;
}
}
// 鑾峰彇婧愮珯
@@ -102,7 +97,7 @@
wrkMast.setIoTime(now);
wrkMast.setWrkSts(0L); // 宸ヤ綔鐘舵�侊細0.寰呭彂閫�
wrkMast.setIoType(110); // 鍏ュ嚭搴撶姸鎬侊細 110.绌烘澘鍑哄簱
- wrkMast.setIoPri(10D);
+ wrkMast.setIoPri(13D); //浼樺厛绾ф帓搴� 15.鍑哄簱>14.鍏ュ簱>13.绌烘澘鍑哄簱>12.绌烘澘鍏ュ簱>11.绉诲簱
wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯
wrkMast.setStaNo(100); // 鐩爣绔�
wrkMast.setCrnNo(locMast.getCrnNo());
@@ -121,7 +116,7 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
// 鏇存柊搴撲綅鐘舵�� D.绌烘澘 -> R.鍑哄簱棰勭害
- if (locMast.getLocSts().equals("D")){
+ if (locMast.getLocSts().equals("D")) {
locMast.setLocSts("R");
locMast.setModiUser(9998L);
locMast.setModiTime(now);
@@ -130,9 +125,7 @@
}
break;
}
-
}
}
-
}
}
--
Gitblit v1.9.1