From 82de5a307466894bbb0258f8a63a26a7bb96d80d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 16 十月 2025 09:55:35 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java | 30 +++++++++++++-----------------
1 files changed, 13 insertions(+), 17 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 70b93c3..44ac08e 100644
--- a/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.BasCrnp;
-import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.*;
@@ -29,10 +28,6 @@
@Value("${wcs-slave.doubleDeep}")
private boolean confirmDeep;
- @Value("${wcs-slave.doubleLocs}")
- private String deepLocs;
- @Value("${wcs-slave.shallowLocs}")
- private String shallowLocs;
@Autowired
private LocDetlService locDetlService;
@Autowired
@@ -49,27 +44,27 @@
@Transactional
public synchronized ReturnT<String> start() {
try {
- for (int crnNo = 1; crnNo < 3; crnNo++){
+ for (int crnNo = 1; crnNo < 3; 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;
//鏆傚仠绉诲簱
BasCrnp crnp = basCrnpService.selectById(crnNo);
- if(!Cools.isEmpty(crnp) && crnp.getTankQty()==0){
+ 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){
+ for (LocMast sourceLoc : locMasts) {
String deep = Utils.getDeepLoc(slaveProperties, sourceLoc.getLocNo());
LocMast destLoc = locMastService.selectById(deep);
- if(!Cools.isEmpty(sourceLoc) && !Cools.isEmpty(destLoc)) {
+ if (!Cools.isEmpty(sourceLoc) && !Cools.isEmpty(destLoc)) {
//鏌ユ壘婧愬簱浣嶆槸鍚︽湁杞Щ浠诲姟,濡傛灉鏈�,涓嶇敓鎴愬簱浣嶇Щ杞�
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("source_loc_no", sourceLoc.getLocNo()));
@@ -237,21 +232,22 @@
/**
* 灏嗘繁搴撲綅杞负瀵瑰簲娴呭簱浣�
+ *
* @param deep
* @return
*/
- private String convertShallow(String deep){
+ private String convertShallow(String deep) {
String shallLoc = "";
Integer mastInt = Integer.parseInt(deep.substring(0, 2));
- if (mastInt % 2 == 0){
+ if (mastInt % 2 == 0) {
mastInt -= 1;
- }else if (mastInt % 2 == 1){
+ } else if (mastInt % 2 == 1) {
mastInt += 1;
}
- if (mastInt <10){
- shallLoc = "0" + mastInt+ deep.substring(2,7);
- }else {
- shallLoc = mastInt+ deep.substring(2,7);
+ if (mastInt < 10) {
+ shallLoc = "0" + mastInt + deep.substring(2, 7);
+ } else {
+ shallLoc = mastInt + deep.substring(2, 7);
}
return shallLoc;
}
--
Gitblit v1.9.1