From f0c28c1962d5635db98c79fa9f05a55d43894d11 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期三, 30 十一月 2022 10:08:09 +0800
Subject: [PATCH] #回退11-14部分代码
---
src/main/java/com/zy/asrs/controller/OutController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index fcec45d..a58988f 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -67,7 +67,6 @@
List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
- System.out.println(locDetls);
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
@@ -147,11 +146,16 @@
Set<String> exist = new HashSet<>();
+ boolean boo=false;
+
for (OrderDetl orderDetl : orderDetls) {
- double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
+ double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
if (issued <= 0.0D) { continue; }
List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
+
+ if(!Cools.isEmpty(locDetls)){
+ boo=true;
//鍒ゆ柇鍑哄簱鏁伴噺鏄惁澶т簬瑕佸嚭鐨勭墿鍝�
LocDto locDtoo = new LocDto(locDetls.get(0).getLocNo(), locDetls.get(0).getMatnr(), locDetls.get(0).getMaktx(), locDetls.get(0).getBatch(), orderDetl.getOrderNo(),
issued >= locDetls.get(0).getAnfme() ? locDetls.get(0).getAnfme() : issued);
@@ -173,8 +177,13 @@
exist.add(locDetls.get(0).getLocNo());
issued=issued-locDetls.get(0).getAnfme();
}
-
- List<LocDetl> locDetlList=locDetlService.queryStockOther(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,locDetls.get(0).getLocNo());
+ }
+ List<LocDetl> locDetlList =new ArrayList<>();
+ if(boo){
+ locDetlList=locDetlService.queryStockOther(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,locDetls.get(0).getLocNo());
+ }else{
+ locDetlList=locDetlService.queryStockOther(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,null);
+ }
for (LocDetl locDetl : locDetlList) {
if (issued > 0) {
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
--
Gitblit v1.9.1