From 2dac04081e727ba6ce760119400f6321c98dc483 Mon Sep 17 00:00:00 2001 From: Junjie <xjj@123> Date: 星期三, 18 六月 2025 13:51:14 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/OutController.java | 13 +++++++++---- 1 files changed, 9 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 92608a4..7ea79d4 100644 --- a/src/main/java/com/zy/asrs/controller/OutController.java +++ b/src/main/java/com/zy/asrs/controller/OutController.java @@ -18,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; @@ -77,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; } @@ -108,7 +110,8 @@ locDto.setStaNos(staNos); locDtos.add(locDto); // 鍓╀綑寰呭嚭鏁伴噺閫掑噺 - issued = issued - locDetl.getAnfme(); + issuedBigDecimal = issuedBigDecimal.subtract(BigDecimal.valueOf(locDetl.getAnfme())); + issued = issuedBigDecimal.doubleValue(); } else { break; } @@ -135,7 +138,8 @@ } } 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; } @@ -168,7 +172,8 @@ locDtos.add(locDto); exist.add(locDetl.getLocNo()); // 鍓╀綑寰呭嚭鏁伴噺閫掑噺 - issued = issued - locDetl.getAnfme(); + issuedBigDecimal = issuedBigDecimal.subtract(BigDecimal.valueOf(locDetl.getAnfme())); + issued = issuedBigDecimal.doubleValue(); } else { break; } -- Gitblit v1.9.1