From 6f01b51fc0770fda7787076caf0314be7a7f6656 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 27 六月 2025 10:58:21 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 60b2dec..7ea79d4 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -7,6 +7,7 @@
 import com.core.common.R;
 import com.zy.asrs.entity.*;
 import com.zy.asrs.service.*;
+import com.zy.asrs.utils.MatUtils;
 import com.zy.common.model.LocDto;
 import com.zy.common.model.TaskDto;
 import com.zy.common.web.BaseController;
@@ -17,6 +18,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -76,7 +78,8 @@
         // 鐩樼偣鍗曞嚭搴�
         if (orderPakOut.getDocType() == 8) {
             for (OrderDetlPakout orderDetl : orderDetlPakouts) {
-                double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
+                BigDecimal issuedBigDecimal = Optional.of(BigDecimal.valueOf(orderDetl.getAnfme()).subtract(BigDecimal.valueOf(orderDetl.getWorkQty()))).orElse(new BigDecimal(0));
+                double issued = issuedBigDecimal.doubleValue();
                 if (issued <= 0.0D) {
                     continue;
                 }
@@ -98,10 +101,17 @@
                         locDto.setBoxType2(orderDetl.getBoxType2());
                         locDto.setBoxType3(orderDetl.getBoxType3());
 
+                        //璁＄畻杈呭崟浣�
+                        Double weight = MatUtils.calcWeight(locDto.getMatnr(), locDto.getAnfme());
+                        locDto.setWeight(weight);
+
+                        locDto.setUnit(orderDetl.getUnit());
+
                         locDto.setStaNos(staNos);
                         locDtos.add(locDto);
                         // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
-                        issued = issued - locDetl.getAnfme();
+                        issuedBigDecimal = issuedBigDecimal.subtract(BigDecimal.valueOf(locDetl.getAnfme()));
+                        issued = issuedBigDecimal.doubleValue();
                     } else {
                         break;
                     }
@@ -116,13 +126,20 @@
                     locDto.setBoxType1(orderDetl.getBoxType1());
                     locDto.setBoxType2(orderDetl.getBoxType2());
                     locDto.setBoxType3(orderDetl.getBoxType3());
+
+                    //璁＄畻杈呭崟浣�
+                    Double weight = MatUtils.calcWeight(locDto.getMatnr(), locDto.getAnfme());
+                    locDto.setWeight(weight);
+
+                    locDto.setUnit(orderDetl.getUnit());
                     locDto.setLack(Boolean.TRUE);
                     locDtos.add(locDto);
                 }
             }
         } else {
             for (OrderDetlPakout orderDetl : orderDetlPakouts) {
-                double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
+                BigDecimal issuedBigDecimal = Optional.of(BigDecimal.valueOf(orderDetl.getAnfme()).subtract(BigDecimal.valueOf(orderDetl.getWorkQty()))).orElse(new BigDecimal(0));
+                double issued = issuedBigDecimal.doubleValue();
                 if (issued <= 0.0D) {
                     continue;
                 }
@@ -135,7 +152,8 @@
                         LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
                         locDto.setFrozen(locDetl.getFrozen());
                         locDto.setFrozenLoc(locMast.getFrozen());
-                        List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
+                        int ioType = (issued >= locDetl.getAnfme() && locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("loc_no", locDto.getLocNo())) == 1) ? 101 : 103;
+                        List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ioType);
                         locDto.setStaNos(staNos);
                         locDto.setBrand(orderDetl.getBrand());
 
@@ -145,10 +163,17 @@
                         locDto.setBoxType1(orderDetl.getBoxType1());
                         locDto.setBoxType2(orderDetl.getBoxType2());
                         locDto.setBoxType3(orderDetl.getBoxType3());
+                        locDto.setUnit(orderDetl.getUnit());
+
+                        //璁＄畻杈呭崟浣�
+                        Double weight = MatUtils.calcWeight(locDto.getMatnr(), locDto.getAnfme());
+                        locDto.setWeight(weight);
+
                         locDtos.add(locDto);
                         exist.add(locDetl.getLocNo());
                         // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
-                        issued = issued - locDetl.getAnfme();
+                        issuedBigDecimal = issuedBigDecimal.subtract(BigDecimal.valueOf(locDetl.getAnfme()));
+                        issued = issuedBigDecimal.doubleValue();
                     } else {
                         break;
                     }
@@ -162,6 +187,12 @@
                     locDto.setBoxType1(orderDetl.getBoxType1());
                     locDto.setBoxType2(orderDetl.getBoxType2());
                     locDto.setBoxType3(orderDetl.getBoxType3());
+
+                    //璁＄畻杈呭崟浣�
+                    Double weight = MatUtils.calcWeight(locDto.getMatnr(), locDto.getAnfme());
+                    locDto.setWeight(weight);
+
+                    locDto.setUnit(orderDetl.getUnit());
                     locDto.setLack(Boolean.TRUE);
                     locDtos.add(locDto);
                 }

--
Gitblit v1.9.1