From 026c1a5f0318a61e126c7062074eb4e7f9a712d5 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 27 四月 2026 16:42:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index 94eb0d1..f76e9e9 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -106,16 +106,16 @@
}
Integer crnNo = wrkMast.getCrnNo();
//濡傛灉浠诲姟鏄Щ搴撲换鍔℃椂锛氳鍫嗗灈鏈哄凡缁忎笅鍙戜换鍔＄粰wcs鍚庝笉鍐嶄笅鍙戞柊鐨勬惉杩愪换鍔�
- if(wrkMast.getIoType()==101&&!Cools.isEmpty(wrkMast.getLocNo())){
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("crn_no", crnNo).eq("loc_no", wrkMast.getLocNo()));
- if (!Cools.isEmpty(locMast)) {
- List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).in("wrk_sts", 12L,13L,14L));
- if (!wrkMasts1.isEmpty()) {
- continue;
- }
- }
-
- }
+// if(wrkMast.getIoType()==101&&!Cools.isEmpty(wrkMast.getLocNo())){
+// LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("crn_no", crnNo).eq("loc_no", wrkMast.getLocNo()));
+// if (!Cools.isEmpty(locMast)) {
+// List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).in("wrk_sts", 12L,13L,14L));
+// if (!wrkMasts1.isEmpty()) {
+// continue;
+// }
+// }
+//
+// }
//婧愬簱浣嶄负鍐荤粨搴撲綅鏃剁姝笅鍙戞惉杩愪换鍔＄粰鍫嗗灈鏈�
if (!Cools.isEmpty(wrkMast.getSourceLocNo())) {
@@ -137,12 +137,23 @@
}
}
+ //姣忎釜鍫嗗灈鏈哄彧鍏佽涓嬪彂涓�涓┖鎵樼洏浠诲姟
+ if(wrkMast.getIoType()==110){
+ List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).eq("io_type", 110).in("wrk_sts", 12));
+ if (!wrkMasts1.isEmpty()) {
+ continue;
+ }
+ }
+
String wcsSourceLocNo = Cools.isEmpty(wrkMast.getSourceLocNo()) ? "" : Utils.WMSLocToWCSLoc(wrkMast.getSourceLocNo());
String wcsLocNo = Cools.isEmpty(wrkMast.getLocNo()) ? "" : Utils.WMSLocToWCSLoc(wrkMast.getLocNo());
Integer taskPri = wrkMast.getIoPri() == null ? null : wrkMast.getIoPri().intValue();
WorkTaskParams params = new WorkTaskParams();
//鍑哄簱鍜岀Щ搴�
if ((wrkMast.getIoType() == 101 || wrkMast.getIoType() == 110) && !Cools.isEmpty(wrkMast.getStaNo()) && !wrkMast.getStaNo().equals("0")) {
+// if(wrkMast.getIsSuplus() != null){
+// wcsLocNo = wcsSourceLocNo;
+// }
params.setType("out")
.setTaskNo(wrkMast.getWrkNo() + "")
.setSourceLocNo(wcsSourceLocNo)
--
Gitblit v1.9.1