From 7de9184294226012e3dba6873b409e226f8acc8f Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 28 八月 2023 11:20:33 +0800
Subject: [PATCH] #补丁
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 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 a52f5cb..776e253 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -167,6 +167,7 @@
for(StockOutParam.LocDetl one : param.getLocDetls()){
locs.add(one.getLocNo());
}
+ boolean sign = false;
for (StockOutParam.LocDetl locDetl : param.getLocDetls()) {
//鑾峰彇鍚屼竴搴撲綅缁勭殑澶栦晶搴撲綅鍙�
List<String> groupOuterSingleLoc = Utils.getGroupOuterSingleLoc(locDetl.getLocNo());
@@ -174,20 +175,22 @@
groupOuterSingleLoc = Utils.getGroupOuterSingleLocLowFrequency(locDetl.getLocNo());
}
- 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){
- locDetls.add(new StockOutParam.LocDetl(detl.getLocNo(), detl.getMatnr(), detl.getBatch(), detl.getAnfme()));
+ if (!sign){
+ 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){
+ locDetls.add(new StockOutParam.LocDetl(detl.getLocNo(), detl.getMatnr(), detl.getBatch(), detl.getAnfme()));
+ }
+ continue;
}
- continue;
+ locDetls.add(new StockOutParam.LocDetl(detl.getLocNo(), detl.getMatnr(), detl.getBatch(), detl.getAnfme()));
}
- locDetls.add(new StockOutParam.LocDetl(detl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), detl.getAnfme()));
}
-
+ sign = true;
}
locDetls.add(locDetl);
}
@@ -1417,7 +1420,7 @@
} else if (wrkMast.getIoType() == 110) {
locSts = "D";
// 搴撲綅杞Щ ===>> D.绌烘《/绌烘爤鏉�
- } else if (wrkMast.getIoType() == 11) {
+ } else if (wrkMast.getIoType() == 11 || wrkMast.getIoType() == 111) {
if (wrkMast.getWrkSts() > 11){
throw new CoolException("绉诲簱浠诲姟宸插湪鎵ц涓紝涓嶈兘鍙栨秷");
}
--
Gitblit v1.9.1