From 3e91bc283088a25b878f942c62847771f23e4f6f Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 05 七月 2024 17:47:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 29 ++++++-----------------------
1 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index af52410..3f5821b 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -148,7 +148,7 @@
if (row == 1) {
shallowLocNo = locNo;
} else {
- shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
+ shallowLocNo = zerofill(String.valueOf(2), 2) + locNo.substring(2);
}
// 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
LocMast shallowLoc = locMastService.selectById(shallowLocNo);
@@ -169,32 +169,15 @@
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
if (locMasts.size() > 0) {
for (LocMast loc : locMasts) {
- //if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
- // continue;
- //}
int row = Integer.parseInt(loc.getLocNo().substring(0, 2));
- //濡傛灉涓烘祬搴撲綅鍒欏垽鏂繁搴撲綅鏄惁浣跨敤
-
-
String shallowLocNo = "";
- if (row == 1) {
- shallowLocNo = loc.getLocNo();
- } else if (row == 2){
- LocMast deepLoc = locMastService.selectById(zerofill(String.valueOf(3), 2) + locMast.getLocNo().substring(2));
- if (!deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) {
- continue;
- }
- shallowLocNo = loc.getLocNo();
- } else {
- LocMast deepLoc = locMastService.selectById(zerofill(String.valueOf(2), 2) + locMast.getLocNo().substring(2));
- if (!deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) {
- continue;
- }
- shallowLocNo = loc.getLocNo();
+ if (row == 1 || row == 2) continue;
+ LocMast trgerLoc = locMastService.selectById(zerofill(String.valueOf(2), 2) + loc.getLocNo().substring(2));
+ if (!trgerLoc.getLocSts().equals("O")) {
+ continue;
}
-
-
+ shallowLocNo = trgerLoc.getLocNo();
// 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
LocMast shallowLoc = locMastService.selectById(shallowLocNo);
--
Gitblit v1.9.1