From 02c8e162422065108c83c641289e36c604feb949 Mon Sep 17 00:00:00 2001
From: zhou-hongcheng <1064771933@qq.com>
Date: Tue, 3 Mar 2026 16:30:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=80=E9=87=8D=E3=80=81=E6=AF=9B=E9=87=8D?=
 =?UTF-8?q?=E3=80=81=E4=BD=93=E7=A7=AF=E3=80=81=E9=9D=A2=E7=A7=AF=EF=BC=8C?=
 =?UTF-8?q?=E5=8E=9F=E5=BA=93=E4=BD=8D=E6=9C=AA=E5=87=8F=E7=A7=BB=E5=87=BA?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=EF=BC=8C=E7=9B=AE=E6=A0=87=E5=BA=93=E4=BD=8D?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7=E7=A7=BB=E5=85=A5=E6=95=B0=E9=87=8F=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../persistence/MaterialInventoryImpl.java    | 28 ++++++++++++
 .../service/ShiftManageDomainService.java     | 14 +++---
 .../MaterialInventoryMapper.xml               | 44 +++++++++++++++++++
 3 files changed, 81 insertions(+), 5 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java
index 4c164eeb1..89b82b5cc 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java
@@ -300,6 +300,34 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
                                 ? exist.getAllocationQuantity()
                                 : BigDecimal.ZERO;
                         exist.setAllocationQuantity(existAlloc.add(delta));
+                        // 净重累加
+                        if (materialInventoryDO.getNetWeight() != null) {
+                            BigDecimal existNetWeight = exist.getNetWeight() != null
+                                    ? exist.getNetWeight()
+                                    : BigDecimal.ZERO;
+                            exist.setNetWeight(existNetWeight.add(materialInventoryDO.getNetWeight()));
+                        }
+                        // 毛重累加
+                        if (materialInventoryDO.getGrossWeight() != null) {
+                            BigDecimal existGrossWeight = exist.getGrossWeight() != null
+                                    ? exist.getGrossWeight()
+                                    : BigDecimal.ZERO;
+                            exist.setGrossWeight(existGrossWeight.add(materialInventoryDO.getGrossWeight()));
+                        }
+                        // 体积累加
+                        if (materialInventoryDO.getVolume() != null) {
+                            BigDecimal existVolume = exist.getVolume() != null
+                                    ? exist.getVolume()
+                                    : BigDecimal.ZERO;
+                            exist.setVolume(existVolume.add(materialInventoryDO.getVolume()));
+                        }
+                        // 面积累加
+                        if (materialInventoryDO.getArea() != null) {
+                            BigDecimal existArea = exist.getArea() != null
+                                    ? exist.getArea()
+                                    : BigDecimal.ZERO;
+                            exist.setArea(existArea.add(materialInventoryDO.getArea()));
+                        }
                     }
                 }
             }
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/service/ShiftManageDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/service/ShiftManageDomainService.java
index 62c96a6fa..0a52cca03 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/service/ShiftManageDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/service/ShiftManageDomainService.java
@@ -422,11 +422,11 @@ public class ShiftManageDomainService {
             MaterialInventory materialInventoryOldDb = materialInventoryService.getById(shiftMaterialDetailPO.getMaterialInventoryId());
             BigDecimal shiftQuantity = shiftMaterialDetailPO.getShiftQuantity();
             //构建新物料库存信息
-            shiftMaterialDetailPO.setNetWeight(materialInventoryOldDb.getNetWeight());
-            shiftMaterialDetailPO.setGrossWeight(materialInventoryOldDb.getGrossWeight());
-            shiftMaterialDetailPO.setVolume(materialInventoryOldDb.getVolume());
-            shiftMaterialDetailPO.setArea(materialInventoryOldDb.getArea());
-            shiftMaterialDetailPO.setMaterialInventoryId(materialInventoryOldDb.getMaterialInventoryId());
+//            shiftMaterialDetailPO.setNetWeight(materialInventoryOldDb.getNetWeight());
+//            shiftMaterialDetailPO.setGrossWeight(materialInventoryOldDb.getGrossWeight());
+//            shiftMaterialDetailPO.setVolume(materialInventoryOldDb.getVolume());
+//            shiftMaterialDetailPO.setArea(materialInventoryOldDb.getArea());
+//            shiftMaterialDetailPO.setMaterialInventoryId(materialInventoryOldDb.getMaterialInventoryId());
             materialInventoryNowList.add(genMaterialInventory(shiftMaterialDetailPO));
             List<ShiftMaterialDetailPO> shiftMaterialDetailPOChildrenList = shiftMaterialDetailPO.getChildren();
             for (ShiftMaterialDetailPO shiftMaterialDetailPOChildren : shiftMaterialDetailPOChildrenList){
@@ -442,6 +442,10 @@ public class ShiftManageDomainService {
             materialInventoryDOOld.setMaterialInventoryId(shiftMaterialDetailPO.getMaterialInventoryId());
             materialInventoryDOOld.setInventoryQuantity(shiftQuantity);
             materialInventoryDOOld.setAllocationQuantity(shiftQuantity);
+            materialInventoryDOOld.setNetWeight(shiftMaterialDetailPO.getNetWeight());
+            materialInventoryDOOld.setGrossWeight(shiftMaterialDetailPO.getGrossWeight());
+            materialInventoryDOOld.setVolume(shiftMaterialDetailPO.getVolume());
+            materialInventoryDOOld.setArea(shiftMaterialDetailPO.getArea());
             materialInventoryOldList.add(materialInventoryDOOld);
         }
 
diff --git a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
index 6a4dfc771..a135cf33d 100644
--- a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
@@ -342,6 +342,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     WHEN #{item.materialInventoryId} THEN  allocation_quantity + #{item.inventoryQuantity}
                 </foreach>
             </trim>
+            <trim prefix="net_weight = CASE material_inventory_id" suffix="END,">
+                <foreach collection="materialInventoryDOList" item="item" index="index">
+                    WHEN #{item.materialInventoryId} THEN GREATEST(net_weight + #{item.netWeight}, 0)
+                </foreach>
+            </trim>
+            <trim prefix="gross_weight = CASE material_inventory_id" suffix="END,">
+                <foreach collection="materialInventoryDOList" item="item" index="index">
+                    WHEN #{item.materialInventoryId} THEN GREATEST(gross_weight + #{item.grossWeight}, 0)
+                </foreach>
+            </trim>
+            <trim prefix="volume = CASE material_inventory_id" suffix="END,">
+                <foreach collection="materialInventoryDOList" item="item" index="index">
+                    WHEN #{item.materialInventoryId} THEN GREATEST(volume + #{item.volume}, 0)
+                </foreach>
+            </trim>
+            <trim prefix="area = CASE material_inventory_id" suffix="END,">
+                <foreach collection="materialInventoryDOList" item="item" index="index">
+                    WHEN #{item.materialInventoryId} THEN GREATEST(area + #{item.area}, 0)
+                </foreach>
+            </trim>
             update_by = #{updateBy},
             update_by_name = #{updateByName},
             update_time = #{updateTime}
@@ -365,6 +385,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     WHEN #{item.materialInventoryId} THEN  GREATEST( allocation_quantity - #{item.inventoryQuantity}, 0)
                 </foreach>
             </trim>
+            <!-- 净重直接减 -->
+            <trim prefix="net_weight = CASE material_inventory_id" suffix="END,">
+                <foreach collection="materialInventoryDOList" item="item" index="index">
+                    WHEN #{item.materialInventoryId} THEN GREATEST(net_weight - #{item.netWeight}, 0)
+                </foreach>
+            </trim>
+            <!-- 毛重直接减 -->
+            <trim prefix="gross_weight = CASE material_inventory_id" suffix="END,">
+                <foreach collection="materialInventoryDOList" item="item" index="index">
+                    WHEN #{item.materialInventoryId} THEN GREATEST(gross_weight - #{item.grossWeight}, 0)
+                </foreach>
+            </trim>
+            <!-- 体积直接减 -->
+            <trim prefix="volume = CASE material_inventory_id" suffix="END,">
+                <foreach collection="materialInventoryDOList" item="item" index="index">
+                    WHEN #{item.materialInventoryId} THEN GREATEST(volume - #{item.volume}, 0)
+                </foreach>
+            </trim>
+            <!-- 面积直接减 -->
+            <trim prefix="area = CASE material_inventory_id" suffix="END,">
+                <foreach collection="materialInventoryDOList" item="item" index="index">
+                    WHEN #{item.materialInventoryId} THEN GREATEST(area - #{item.area}, 0)
+                </foreach>
+            </trim>
             update_by = #{updateBy},
             update_by_name = #{updateByName},
             update_time = #{updateTime}