From 79f209a5ec9236adfd4576285d50a7b860da7230 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 26 十二月 2023 13:22:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 813d3db..e2676b5 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -142,7 +142,11 @@
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
if (staDescId == 10) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("type_no", staDescId).eq("stn_no", sourceStaNo));
+ if (Cools.isEmpty(staDesc)){
+ throw new CoolException("绌烘墭鍏ュ簱绔欑偣璺緞涓嶅瓨鍦�");
+ }
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow).eq("crn_no",staDesc.getCrnNo()));
if (locMasts.size() > 0) {
for (LocMast loc : locMasts) {
if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
@@ -176,10 +180,10 @@
throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
Integer crnNo1 = shelves.get(curRow);
- crnNo1 = crnNo1 + divides*1;
+// crnNo1 = crnNo1 + divides*1;
if (basCrnpService.checkSiteError(crnNo1, true)) {
crnNo = crnNo1;
- curRow = curRow + divides*4;
+// curRow = curRow + divides*4;
break;
}
}
--
Gitblit v1.9.1