From adcfd92279f68d2353e2caa5522f71282f6e0943 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 16 十月 2024 08:18:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java | 57 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 39 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java b/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java
index 9eb6b97..03174ca 100644
--- a/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java
@@ -45,9 +45,9 @@
@Transactional
public synchronized ReturnT<String> start() {
try {
- for (int crnNo = 1; crnNo < 3; crnNo++){
+ for (int crnNo = 1; crnNo < 5; crnNo++) {
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .eq("crn_no",crnNo)
+ .eq("crn_no", crnNo)
.last(" and wrk_sts in (2,3,4,11,12)")
);
if (wrkMasts.size() > 0) continue;
@@ -57,31 +57,52 @@
if(!Cools.isEmpty(crnp) && !Cools.isEmpty(crnp.getTankQty()) && crnp.getTankQty()==0){
continue;
}
+ LocMast locMast = locMastService.queryNeedMoveShallLoc(crnNo);
+ if (crnNo==2 || crnNo == 4){
+ locMast=locMastService.queryNeedMoveShallLocD(crnNo);
+ }
- List<LocMast> locMasts = locMastService.queryShallowLocFMast(crnNo);
- if (null == locMasts) continue;
- for (LocMast sourceLoc : locMasts){
- String deep = Utils.getDeepLoc(slaveProperties, sourceLoc.getLocNo());
- LocMast destLoc = locMastService.selectById(deep);
-
- if(!Cools.isEmpty(sourceLoc) && !Cools.isEmpty(destLoc)) {
- //鏌ユ壘婧愬簱浣嶆槸鍚︽湁杞Щ浠诲姟,濡傛灉鏈�,涓嶇敓鎴愬簱浣嶇Щ杞�
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
- .eq("source_loc_no", sourceLoc.getLocNo()));
- if (Cools.isEmpty(wrkMast) && destLoc.getLocSts().equals("O") &&
- (sourceLoc.getLocSts().equals("F") || sourceLoc.getLocSts().equals("D"))) {
- workService.locMove(sourceLoc.getLocNo(), deep, 1L);
- }
- }
+// LocMast targetLoc = locMastService.queryEmptyDeepLoc(crnNo);
+ if (!Cools.isEmpty(locMast)) {
+ workService.locMove(locMast.getLocNo(), 1L);
}
}
+
+ return SUCCESS;
+
+// //鏆傚仠绉诲簱
+// BasCrnp crnp = basCrnpService.selectById(crnNo);
+// if(!Cools.isEmpty(crnp) && !Cools.isEmpty(crnp.getTankQty()) && crnp.getTankQty()==0){
+// continue;
+// }
+//
+// List<LocMast> locMasts = locMastService.queryShallowLocFMast(crnNo);
+// if (null == locMasts) continue;
+//
+// for (LocMast sourceLoc : locMasts){
+// String deep = Utils.getDeepLoc(slaveProperties, sourceLoc.getLocNo());
+// LocMast destLoc = locMastService.selectById(deep);
+//
+// if(!Cools.isEmpty(sourceLoc) && !Cools.isEmpty(destLoc)) {
+// //鏌ユ壘婧愬簱浣嶆槸鍚︽湁杞Щ浠诲姟,濡傛灉鏈�,涓嶇敓鎴愬簱浣嶇Щ杞�
+// WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+// .eq("source_loc_no", sourceLoc.getLocNo()));
+// if (Cools.isEmpty(wrkMast) && destLoc.getLocSts().equals("O") &&
+// (sourceLoc.getLocSts().equals("F") || sourceLoc.getLocSts().equals("D"))) {
+// workService.locMove(sourceLoc.getLocNo(), deep, 1L);
+//
+// }
+// }
+// }
+// }
} catch (Exception e) {
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg(e.getMessage());
+
}
- return SUCCESS;
+
}
/**
--
Gitblit v1.9.1