From aa37b20015b70e5668cf890ee13fc831b068bc5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com>
Date: Wed, 11 Jun 2025 11:25:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E6=95=B0=E9=87=8F=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliverydemand/entity/DeliveryDemand.java      |  2 +-
 .../deliverydemand/entity/DeliveryDemandExcel.java |  3 ++-
 .../service/impl/DeliveryDemandServiceImpl.java    | 14 +++++++++-----
 .../controller/VehicleDemandController.java        | 12 ++++++------
 .../vehicledemand/entity/VehicleDemand.java        |  2 +-
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/entity/DeliveryDemand.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/entity/DeliveryDemand.java
index e98c373..7266bb8 100644
--- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/entity/DeliveryDemand.java
+++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/entity/DeliveryDemand.java
@@ -71,7 +71,7 @@ public class DeliveryDemand implements Serializable {
 	/**发货数量*/
 	@Excel(name = "发货数量", width = 15)
     @ApiModelProperty(value = "发货数量")
-    private java.lang.Integer shipNumber;
+    private BigDecimal shipNumber;
 	/**单位*/
 //	@Excel(name = "单位", width = 15, dicCode = "unit")
     @Dict(dicCode = "unit")
diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/entity/DeliveryDemandExcel.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/entity/DeliveryDemandExcel.java
index 772c4de..2cdaba0 100644
--- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/entity/DeliveryDemandExcel.java
+++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/entity/DeliveryDemandExcel.java
@@ -15,6 +15,7 @@ import org.jeecgframework.poi.excel.annotation.ExcelCollection;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -66,7 +67,7 @@ public class DeliveryDemandExcel implements Serializable {
     /**发货数量*/
     @Excel(name = "发货数量", width = 15, needMerge = true)
     @ApiModelProperty(value = "发货数量")
-    private java.lang.Integer shipNumber;
+    private BigDecimal shipNumber;
     /**单位*/
     @Dict(dicCode = "unit")
     @ApiModelProperty(value = "单位")
diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/impl/DeliveryDemandServiceImpl.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/impl/DeliveryDemandServiceImpl.java
index 7456837..9b87288 100644
--- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/impl/DeliveryDemandServiceImpl.java
+++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/impl/DeliveryDemandServiceImpl.java
@@ -79,8 +79,10 @@ public class DeliveryDemandServiceImpl extends ServiceImpl<DeliveryDemandMapper,
                         (merged2.getTotalPallets() == null ? 0 : merged2.getTotalPallets())
                     );
                     merged1.setTotalShips(
-                        (merged1.getTotalShips() == null ? 0 : merged1.getTotalShips()) +
-                        (merged2.getTotalShips() == null ? 0 : merged2.getTotalShips())
+                        /*(merged1.getTotalShips() == null ? 0 : merged1.getTotalShips()) +
+                        (merged2.getTotalShips() == null ? 0 : merged2.getTotalShips())*/
+                        Optional.ofNullable(merged1.getTotalShips()).orElse(BigDecimal.ZERO)
+                                .add(Optional.ofNullable(merged2.getTotalShips()).orElse(BigDecimal.ZERO))
                     );
                     return merged1;
                 }
@@ -140,8 +142,10 @@ public class DeliveryDemandServiceImpl extends ServiceImpl<DeliveryDemandMapper,
                                             (merged2.getTotalPallets() == null ? 0 : merged2.getTotalPallets())
                             );
                             merged1.setTotalShips(
-                                    (merged1.getTotalShips() == null ? 0 : merged1.getTotalShips()) +
-                                            (merged2.getTotalShips() == null ? 0 : merged2.getTotalShips())
+                                    /*(merged1.getTotalShips() == null ? 0 : merged1.getTotalShips()) +
+                                            (merged2.getTotalShips() == null ? 0 : merged2.getTotalShips())*/
+                                    Optional.ofNullable(merged1.getTotalShips()).orElse(BigDecimal.ZERO)
+                                            .add(Optional.ofNullable(merged2.getTotalShips()).orElse(BigDecimal.ZERO))
                             );
                             return merged1;
                         }
@@ -177,7 +181,7 @@ public class DeliveryDemandServiceImpl extends ServiceImpl<DeliveryDemandMapper,
 //                return Result.error("数据为空");
                 continue;
             }
-            BigDecimal dividend = new BigDecimal(deliveryDemand.getShipNumber());
+            BigDecimal dividend = deliveryDemand.getShipNumber();
             BigDecimal divisor = new BigDecimal(qty);
 
             // 向上取整
diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/controller/VehicleDemandController.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/controller/VehicleDemandController.java
index 7aeea85..c55923a 100644
--- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/controller/VehicleDemandController.java
+++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/controller/VehicleDemandController.java
@@ -1,9 +1,7 @@
 package org.jeecg.modules.tms.outbound.vehicledemand.controller;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.math.BigDecimal;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -278,8 +276,10 @@ public class VehicleDemandController extends JeecgController<VehicleDemand, IVeh
 						 (merged2.getPreTotalPallets() == null ? 0 : merged2.getPreTotalPallets())
 					 );
 					 merged1.setTotalShips(
-						 (merged1.getTotalShips() == null ? 0 : merged1.getTotalShips()) +
-						 (merged2.getTotalShips() == null ? 0 : merged2.getTotalShips())
+						 /*(merged1.getTotalShips() == null ? 0 : merged1.getTotalShips()) +
+						 (merged2.getTotalShips() == null ? 0 : merged2.getTotalShips())*/
+						 Optional.ofNullable(merged1.getTotalShips()).orElse(BigDecimal.ZERO)
+								 .add(Optional.ofNullable(merged2.getTotalShips()).orElse(BigDecimal.ZERO))
 					 );
 					 return merged1;
 				 }
diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/entity/VehicleDemand.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/entity/VehicleDemand.java
index c3c66f4..bcade78 100644
--- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/entity/VehicleDemand.java
+++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/entity/VehicleDemand.java
@@ -84,7 +84,7 @@ public class VehicleDemand implements Serializable {
     /**总发货数量*/
     @Excel(name = "总发货数量", width = 15)
     @ApiModelProperty(value = "总发货数量")
-    private Integer totalShips;
+    private BigDecimal totalShips;
 	/**送货区域*/
 //	@Excel(name = "送货区域", width = 15)
     @ApiModelProperty(value = "送货区域")