毛重、净重、体积

src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java

@@ -1495,7 +1495,11 @@ public class CoDelServiceImpl implements CoDelService {
         // 装箱数据
         List<EcssCoDelPalletHeaderData> palletHeaderDataList = coDelMapper.searchEcssCoDelPalletHeaderData(notifyHeaderData);
         List<Map> palletDetailList = coDelMapper.exportCoDelPalletDetail(notifyHeaderData);
-        defaultData.setPackageQty(palletHeaderDataList.isEmpty()?0:palletHeaderDataList.get(0).getPalletQty());
+        Integer totalPlt = palletHeaderDataList.stream()
+                .map(EcssCoDelPalletHeaderData::getPalletQty)
+                .filter(Objects::nonNull) // 防止空指针
+                .reduce(0, Integer::sum);
+        defaultData.setPackageQty(totalPlt);
         List<Map> boxList = coDelMapper.exportCoDelBoxList(notifyHeaderData);
         defaultData.setBoxQty(boxList.stream().mapToInt(o->Integer.parseInt(o.get("box_qty").toString())).sum());
         map.put("row", defaultData);
@@ -2060,11 +2064,16 @@ public class CoDelServiceImpl implements CoDelService {
         template.addVar("exitPort", stringInput(ecHeader.getExitPort()));
         template.addVar("documents", stringInput(ecHeader.getDocuments()));
         template.addVar("packageType", stringInput(ecHeader.getPackageType()));
-        template.addVar("packageQty", data.getPackageUnit()!=null&&data.getPackageUnit().equals("箱")?ecHeader.getBoxQty():ecHeader.getPackageQty());
-        template.addVar("packageUnit", data.getPackageUnit());
-        // 托盘重量=根据每个pallet的重量*数量累加
         EcssCoDelNotifyHeaderData notifyHeader = coDelMapper.getEcssCoDelNotifyHeader(data.getSite(), data.getDelNo());
         List<EcssCoDelPalletHeaderData> palletHeaderDataList = coDelMapper.searchEcssCoDelPalletHeaderData(notifyHeader);
+        // 总托数
+        Integer totalPlt = palletHeaderDataList.stream()
+                .map(EcssCoDelPalletHeaderData::getPalletQty)
+                .filter(Objects::nonNull) // 防止空指针
+                .reduce(0, Integer::sum);
+        template.addVar("packageQty", data.getPackageUnit()!=null&&data.getPackageUnit().equals("箱")?ecHeader.getBoxQty():totalPlt);
+        template.addVar("packageUnit", data.getPackageUnit());
+        // 托盘重量=根据每个pallet的重量*数量累加
         BigDecimal palletWeight = BigDecimal.ZERO;
         for (EcssCoDelPalletHeaderData palletHeader : palletHeaderDataList) {
             if (palletHeader.getPallet() != null && !palletHeader.getPallet().isEmpty()) {
@@ -2473,7 +2482,7 @@ public class CoDelServiceImpl implements CoDelService {
         if (!palletHeaderDataList.isEmpty()) {
             // 计算所有栈板的体积总和
             for (EcssCoDelPalletHeaderData palletHeader : palletHeaderDataList) {
-                if (palletHeader.getLength() != null && palletHeader.getWidth() != null 
+                if (palletHeader.getLength() != null && palletHeader.getWidth() != null
                     && palletHeader.getHeight() != null && palletHeader.getPalletQty() != null) {
                     // 单个栈板体积 = 长 * 宽 * 高 * 数量
                     BigDecimal singlePalletVolume = palletHeader.getLength()
@@ -2605,7 +2614,7 @@ public class CoDelServiceImpl implements CoDelService {
         if (!palletHeaderDataList.isEmpty()) {
             // 计算所有栈板的体积总和
             for (EcssCoDelPalletHeaderData palletHeader : palletHeaderDataList) {
-                if (palletHeader.getLength() != null && palletHeader.getWidth() != null 
+                if (palletHeader.getLength() != null && palletHeader.getWidth() != null
                     && palletHeader.getHeight() != null && palletHeader.getPalletQty() != null) {
                     // 单个栈板体积 = 长 * 宽 * 高 * 数量
                     BigDecimal singlePalletVolume = palletHeader.getLength()