From 79c04b38fdcd261a3d8ca046b27107d3005c1335 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 28 八月 2023 12:09:31 +0800
Subject: [PATCH] #补丁
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 776e253..208791b 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -167,22 +167,26 @@
for(StockOutParam.LocDetl one : param.getLocDetls()){
locs.add(one.getLocNo());
}
- boolean sign = false;
+ boolean sign = true;
for (StockOutParam.LocDetl locDetl : param.getLocDetls()) {
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
//鑾峰彇鍚屼竴搴撲綅缁勭殑澶栦晶搴撲綅鍙�
List<String> groupOuterSingleLoc = Utils.getGroupOuterSingleLoc(locDetl.getLocNo());
- if (Utils.getBay(locDetl.getLocNo())>=21){
+ if (locMast.getLocType2().equals((short)3)){
groupOuterSingleLoc = Utils.getGroupOuterSingleLocLowFrequency(locDetl.getLocNo());
}
- if (!sign){
+ if (sign){
+ if (locMast.getLocType2().equals((short)3)) {
+ sign = false;
+ }
for (String locNo : groupOuterSingleLoc) {
//姣忎釜搴撲綅鐨勫簱浣嶆槑缁�
if(locs.contains(locNo)) continue;
for (LocDetl detl : locDetlService.selectByLocNo(locNo)) {
if (!detl.getMatnr().equals(locDetl.getMatnr())) {
//涓嶆槸鐩稿悓鐗╂枡
- if (Utils.getBay(locDetl.getLocNo())>=21){
+ if (!sign){
locDetls.add(new StockOutParam.LocDetl(detl.getLocNo(), detl.getMatnr(), detl.getBatch(), detl.getAnfme()));
}
continue;
@@ -190,7 +194,6 @@
locDetls.add(new StockOutParam.LocDetl(detl.getLocNo(), detl.getMatnr(), detl.getBatch(), detl.getAnfme()));
}
}
- sign = true;
}
locDetls.add(locDetl);
}
--
Gitblit v1.9.1