From 4c7ab64e5a6bf855ece40e760ba7ad16cf6c367b Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 31 七月 2025 23:19:24 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/OutController.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index f4fafd2..a03e8db 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -73,6 +73,10 @@
             return R.parse("璁㈠崟鏄庣粏涓虹┖");
         }
 
+        List<String> disableCstateidList = new ArrayList<>();
+        disableCstateidList.add("1001A1100000000H0KJP");//涓嶅悎鏍�
+        disableCstateidList.add("1001A1100000000LFERA");//寰呭鐞�
+
         List<LocDto> locDtos = new ArrayList<>();
 
         Set<String> exist = new HashSet<>();
@@ -150,6 +154,10 @@
                 List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist, orderDetl.getMatnr(), orderDetl.getBatch(),
                         orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3(), cstateid);
                 for (LocDetl locDetl : locDetls) {
+                    if (disableCstateidList.contains(locDetl.getCstateid())) {
+                        continue;
+                    }
+
                     if (issued > 0) {
                         LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
                                 issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
@@ -168,6 +176,8 @@
                         locDto.setBoxType2(orderDetl.getBoxType2());
                         locDto.setBoxType3(orderDetl.getBoxType3());
                         locDto.setUnit(orderDetl.getUnit());
+                        locDto.setInitialAnfme(locDetl.getAnfme());//鍘熸墭鐩樻暟閲�
+                        locDto.setInitialWeight(locDetl.getWeight());//鍘熸墭鐩樿緟鏁伴噺
 
                         //璁$畻杈呭崟浣�
                         Double weight = MatUtils.calcWeight(locDto.getMatnr(), locDto.getAnfme());

--
Gitblit v1.9.1