From 56b18885af51bab7dec1aa8a3e8ced9882a670e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Tue, 31 Mar 2026 17:07:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E6=96=B9=E6=B3=95;=E6=9F=A5=E8=AF=A2=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E8=A1=A8=E5=8D=95=E9=85=8D=E7=BD=AE=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../facade/IMaterialInventoryService.java     |  22 +-
 .../persistence/MaterialInventoryImpl.java    | 383 ++++++++++++++++++
 .../sysTableConfig/SysTableConfigApi.java     |   2 +-
 3 files changed, 405 insertions(+), 2 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/facade/IMaterialInventoryService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/facade/IMaterialInventoryService.java
index 90e6dc13b..5b2c86408 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/facade/IMaterialInventoryService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/facade/IMaterialInventoryService.java
@@ -98,4 +98,24 @@ public interface IMaterialInventoryService extends IService<MaterialInventory>
     public BigDecimal sumInventoryQuantityByShipperAndMaterialCode(Long shipperCode, Long materialBaseInfoId);
 
     MaterialInventoryPO selectOneByWhere(MaterialInventoryDO materialInventoryDO);
-}
+
+    /*
+    * 库存调整方法
+    * netWeight  总净重
+    * grossWeight  总毛重
+    * volume  体积
+    * area  面积
+    * quantity  数量
+    * type  类型(1:上架2:分配3:取消分配4:出库交接5:移位6:库存调整7:库存冻结)
+    * materialInventoryId  物料库存ID
+    * */
+    public void xgkc(BigDecimal netWeight,
+                     BigDecimal grossWeight,
+                     BigDecimal volume,
+                     BigDecimal area,
+                     BigDecimal quantity,
+                     String type,
+                     Long materialInventoryId);
+
+    //public void kctzjl();
+}
\ No newline at end of file
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 8ef49d33a..3562899b9 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
@@ -501,4 +501,387 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
     public MaterialInventoryPO selectOneByWhere(MaterialInventoryDO materialInventoryDO) {
         return materialInventoryMapper.selectOneByWhere(materialInventoryDO);
     }
+
+    @Override
+    public void xgkc(BigDecimal netWeight, BigDecimal grossWeight, BigDecimal volume, BigDecimal area, BigDecimal quantity, String type, Long materialInventoryId) {
+        netWeight = netWeight != null ? netWeight : BigDecimal.ZERO;
+        grossWeight = grossWeight != null ? grossWeight : BigDecimal.ZERO;
+        volume = volume != null ? volume : BigDecimal.ZERO;
+        area = area != null ? area : BigDecimal.ZERO;
+        quantity = quantity != null ? quantity : BigDecimal.ZERO;
+
+        MaterialInventory materialInventoryPO = materialInventoryMapper.selectById(materialInventoryId);
+        if (materialInventoryPO != null) {
+            //类型(1:上架2:分配3:取消分配4:出库交接5:移位6:库存调整7:库存冻结)
+            switch (type) {
+                case "1":
+                    // 上架
+                    sj(netWeight, grossWeight, volume, area, quantity, materialInventoryId);
+                    break;
+                case "2":
+                    // 分配
+                    ff(netWeight, grossWeight, volume, area, quantity, materialInventoryId);
+                    break;
+                case "3":
+                    // 取消分配
+                    qxff(netWeight, grossWeight, volume, area, quantity, materialInventoryId);
+                    break;
+                case "4":
+                    // 出库交接
+                    ckjj(netWeight, grossWeight, volume, area, quantity, materialInventoryId);
+                    break;
+                case "5":
+                    // 移位
+                    yw(netWeight, grossWeight, volume, area, quantity, materialInventoryId);
+                    break;
+                case "6":
+                    // 库存调整
+                    kctz(netWeight, grossWeight, volume, area, quantity, materialInventoryId);
+                    break;
+                case "7":
+                    // 库存冻结
+                    kcdj(netWeight, grossWeight, volume, area, quantity, materialInventoryId);
+                    break;
+                default:
+                    throw new ServiceException("错误的类型");
+            }
+        }
+    }
+
+    private void sj(BigDecimal netWeight, BigDecimal grossWeight, BigDecimal volume, BigDecimal area, BigDecimal quantity, Long materialInventoryId) {
+        MaterialInventory materialInventoryPO = materialInventoryMapper.selectById(materialInventoryId);
+        if (materialInventoryPO != null) {
+            //库存数量
+            BigDecimal oldInventoryQuantity = materialInventoryPO.getInventoryQuantity();
+            oldInventoryQuantity = oldInventoryQuantity != null ? oldInventoryQuantity : BigDecimal.ZERO;
+            //可用数量
+            BigDecimal oldAllocationQuantity = materialInventoryPO.getAllocationQuantity();
+            oldAllocationQuantity = oldAllocationQuantity != null ? oldAllocationQuantity : BigDecimal.ZERO;
+            //冻结数量（出库交接不变动冻结数量）
+            BigDecimal oldFreezeQuantity = materialInventoryPO.getFreezeQuantity();
+            oldFreezeQuantity = oldFreezeQuantity != null ? oldFreezeQuantity : BigDecimal.ZERO;
+            //扣减后库存数量
+            BigDecimal newInventoryQuantity = oldInventoryQuantity.subtract(quantity);
+            //扣减后可用数量
+            BigDecimal newAllocationQuantity = oldAllocationQuantity.subtract(quantity);
+            BigDecimal newFreezeQuantity = oldFreezeQuantity.subtract(quantity);
+
+
+
+            BigDecimal oldArea = materialInventoryPO.getArea();
+            BigDecimal oldVolume = materialInventoryPO.getVolume();
+            BigDecimal oldGrossWeight = materialInventoryPO.getGrossWeight();
+            BigDecimal oldNetWeight = materialInventoryPO.getNetWeight();
+
+            // 初始化旧数据，避免空指针
+            oldArea = oldArea != null ? oldArea : BigDecimal.ZERO;
+            oldVolume = oldVolume != null ? oldVolume : BigDecimal.ZERO;
+            oldGrossWeight = oldGrossWeight != null ? oldGrossWeight : BigDecimal.ZERO;
+            oldNetWeight = oldNetWeight != null ? oldNetWeight : BigDecimal.ZERO;
+
+            BigDecimal newArea = oldArea.add(area);
+            BigDecimal newVolume = oldVolume.add(volume);
+            BigDecimal newGrossWeight = oldGrossWeight.add(grossWeight);
+            BigDecimal newNetWeight = oldNetWeight.add(netWeight);
+
+            materialInventoryPO.setInventoryQuantity(newInventoryQuantity);
+            //materialInventoryPO.setAllocationQuantity(materialInventoryPO.getAllocationQuantity());
+            materialInventoryPO.setFreezeQuantity(newFreezeQuantity);
+            materialInventoryPO.setArea(newArea);
+            materialInventoryPO.setVolume(newVolume);
+            materialInventoryPO.setGrossWeight(newGrossWeight);
+            materialInventoryPO.setNetWeight(newNetWeight);
+            MaterialInventory materialInventory = new MaterialInventory();
+            com.mhd.common.core.utils.bean.BeanUtils.copyProperties(materialInventoryPO, materialInventory);
+            materialInventoryMapper.updateById(materialInventory);
+        }
+    }
+    private void ff(BigDecimal netWeight, BigDecimal grossWeight, BigDecimal volume, BigDecimal area, BigDecimal quantity, Long materialInventoryId) {
+        MaterialInventory materialInventoryPO = materialInventoryMapper.selectById(materialInventoryId);
+        if (materialInventoryPO != null) {
+            //库存数量
+            BigDecimal oldInventoryQuantity = materialInventoryPO.getInventoryQuantity();
+            oldInventoryQuantity = oldInventoryQuantity != null ? oldInventoryQuantity : BigDecimal.ZERO;
+            //可用数量
+            BigDecimal oldAllocationQuantity = materialInventoryPO.getAllocationQuantity();
+            oldAllocationQuantity = oldAllocationQuantity != null ? oldAllocationQuantity : BigDecimal.ZERO;
+            //冻结数量（出库交接不变动冻结数量）
+            BigDecimal oldFreezeQuantity = materialInventoryPO.getFreezeQuantity();
+            oldFreezeQuantity = oldFreezeQuantity != null ? oldFreezeQuantity : BigDecimal.ZERO;
+            //扣减后库存数量
+            BigDecimal newInventoryQuantity = oldInventoryQuantity.subtract(quantity);
+            //扣减后可用数量
+            BigDecimal newAllocationQuantity = oldAllocationQuantity.subtract(quantity);
+            BigDecimal newFreezeQuantity = oldFreezeQuantity.add(quantity);
+
+
+
+            BigDecimal oldArea = materialInventoryPO.getArea();
+            BigDecimal oldVolume = materialInventoryPO.getVolume();
+            BigDecimal oldGrossWeight = materialInventoryPO.getGrossWeight();
+            BigDecimal oldNetWeight = materialInventoryPO.getNetWeight();
+
+            // 初始化旧数据，避免空指针
+            oldArea = oldArea != null ? oldArea : BigDecimal.ZERO;
+            oldVolume = oldVolume != null ? oldVolume : BigDecimal.ZERO;
+            oldGrossWeight = oldGrossWeight != null ? oldGrossWeight : BigDecimal.ZERO;
+            oldNetWeight = oldNetWeight != null ? oldNetWeight : BigDecimal.ZERO;
+
+            BigDecimal newArea = oldArea.subtract(area);
+            BigDecimal newVolume = oldVolume.subtract(volume);
+            BigDecimal newGrossWeight = oldGrossWeight.subtract(grossWeight);
+            BigDecimal newNetWeight = oldNetWeight.subtract(netWeight);
+
+            //materialInventoryPO.setInventoryQuantity(newInventoryQuantity);
+            materialInventoryPO.setAllocationQuantity(newAllocationQuantity);
+            materialInventoryPO.setFreezeQuantity(newFreezeQuantity);
+            materialInventoryPO.setArea(newArea);
+            materialInventoryPO.setVolume(newVolume);
+            materialInventoryPO.setGrossWeight(newGrossWeight);
+            materialInventoryPO.setNetWeight(newNetWeight);
+            MaterialInventory materialInventory = new MaterialInventory();
+            com.mhd.common.core.utils.bean.BeanUtils.copyProperties(materialInventoryPO, materialInventory);
+            materialInventoryMapper.updateById(materialInventory);
+        }
+    }
+    private void qxff(BigDecimal netWeight, BigDecimal grossWeight, BigDecimal volume, BigDecimal area, BigDecimal quantity, Long materialInventoryId) {
+        MaterialInventory materialInventoryPO = materialInventoryMapper.selectById(materialInventoryId);
+        if (materialInventoryPO != null) {
+            //库存数量
+            BigDecimal oldInventoryQuantity = materialInventoryPO.getInventoryQuantity();
+            oldInventoryQuantity = oldInventoryQuantity != null ? oldInventoryQuantity : BigDecimal.ZERO;
+            //可用数量
+            BigDecimal oldAllocationQuantity = materialInventoryPO.getAllocationQuantity();
+            oldAllocationQuantity = oldAllocationQuantity != null ? oldAllocationQuantity : BigDecimal.ZERO;
+            //冻结数量（出库交接不变动冻结数量）
+            BigDecimal oldFreezeQuantity = materialInventoryPO.getFreezeQuantity();
+            oldFreezeQuantity = oldFreezeQuantity != null ? oldFreezeQuantity : BigDecimal.ZERO;
+            //扣减后库存数量
+            BigDecimal newInventoryQuantity = oldInventoryQuantity.subtract(quantity);
+            //扣减后可用数量
+            BigDecimal newAllocationQuantity = oldAllocationQuantity.add(quantity);
+            BigDecimal newFreezeQuantity = oldFreezeQuantity.subtract(quantity);
+
+
+
+            BigDecimal oldArea = materialInventoryPO.getArea();
+            BigDecimal oldVolume = materialInventoryPO.getVolume();
+            BigDecimal oldGrossWeight = materialInventoryPO.getGrossWeight();
+            BigDecimal oldNetWeight = materialInventoryPO.getNetWeight();
+
+            // 初始化旧数据，避免空指针
+            oldArea = oldArea != null ? oldArea : BigDecimal.ZERO;
+            oldVolume = oldVolume != null ? oldVolume : BigDecimal.ZERO;
+            oldGrossWeight = oldGrossWeight != null ? oldGrossWeight : BigDecimal.ZERO;
+            oldNetWeight = oldNetWeight != null ? oldNetWeight : BigDecimal.ZERO;
+
+            BigDecimal newArea = oldArea.subtract(area);
+            BigDecimal newVolume = oldVolume.subtract(volume);
+            BigDecimal newGrossWeight = oldGrossWeight.subtract(grossWeight);
+            BigDecimal newNetWeight = oldNetWeight.subtract(netWeight);
+
+            //materialInventoryPO.setInventoryQuantity(newInventoryQuantity);
+            materialInventoryPO.setAllocationQuantity(newAllocationQuantity);
+            materialInventoryPO.setFreezeQuantity(newFreezeQuantity);
+            materialInventoryPO.setArea(newArea);
+            materialInventoryPO.setVolume(newVolume);
+            materialInventoryPO.setGrossWeight(newGrossWeight);
+            materialInventoryPO.setNetWeight(newNetWeight);
+            MaterialInventory materialInventory = new MaterialInventory();
+            com.mhd.common.core.utils.bean.BeanUtils.copyProperties(materialInventoryPO, materialInventory);
+            materialInventoryMapper.updateById(materialInventory);
+        }
+    }
+    private void ckjj(BigDecimal netWeight, BigDecimal grossWeight, BigDecimal volume, BigDecimal area, BigDecimal quantity, Long materialInventoryId) {
+        MaterialInventory materialInventoryPO = materialInventoryMapper.selectById(materialInventoryId);
+        if (materialInventoryPO != null) {
+            //库存数量
+            BigDecimal oldInventoryQuantity = materialInventoryPO.getInventoryQuantity();
+            oldInventoryQuantity = oldInventoryQuantity != null ? oldInventoryQuantity : BigDecimal.ZERO;
+            //可用数量
+            BigDecimal oldAllocationQuantity = materialInventoryPO.getAllocationQuantity();
+            oldAllocationQuantity = oldAllocationQuantity != null ? oldAllocationQuantity : BigDecimal.ZERO;
+            //冻结数量（出库交接不变动冻结数量）
+            BigDecimal oldFreezeQuantity = materialInventoryPO.getFreezeQuantity();
+            oldFreezeQuantity = oldFreezeQuantity != null ? oldFreezeQuantity : BigDecimal.ZERO;
+            //扣减后库存数量
+            BigDecimal newInventoryQuantity = oldInventoryQuantity.subtract(quantity);
+            //扣减后可用数量
+            BigDecimal newAllocationQuantity = oldAllocationQuantity.subtract(quantity);
+            BigDecimal newFreezeQuantity = oldFreezeQuantity.subtract(quantity);
+
+
+
+            BigDecimal oldArea = materialInventoryPO.getArea();
+            BigDecimal oldVolume = materialInventoryPO.getVolume();
+            BigDecimal oldGrossWeight = materialInventoryPO.getGrossWeight();
+            BigDecimal oldNetWeight = materialInventoryPO.getNetWeight();
+
+            // 初始化旧数据，避免空指针
+            oldArea = oldArea != null ? oldArea : BigDecimal.ZERO;
+            oldVolume = oldVolume != null ? oldVolume : BigDecimal.ZERO;
+            oldGrossWeight = oldGrossWeight != null ? oldGrossWeight : BigDecimal.ZERO;
+            oldNetWeight = oldNetWeight != null ? oldNetWeight : BigDecimal.ZERO;
+
+            BigDecimal newArea = oldArea.subtract(area);
+            BigDecimal newVolume = oldVolume.subtract(volume);
+            BigDecimal newGrossWeight = oldGrossWeight.subtract(grossWeight);
+            BigDecimal newNetWeight = oldNetWeight.subtract(netWeight);
+
+            materialInventoryPO.setInventoryQuantity(newInventoryQuantity);
+            //materialInventoryPO.setAllocationQuantity(materialInventoryPO.getAllocationQuantity());
+            materialInventoryPO.setFreezeQuantity(newFreezeQuantity);
+            materialInventoryPO.setArea(newArea);
+            materialInventoryPO.setVolume(newVolume);
+            materialInventoryPO.setGrossWeight(newGrossWeight);
+            materialInventoryPO.setNetWeight(newNetWeight);
+            MaterialInventory materialInventory = new MaterialInventory();
+            com.mhd.common.core.utils.bean.BeanUtils.copyProperties(materialInventoryPO, materialInventory);
+            materialInventoryMapper.updateById(materialInventory);
+        }
+    }
+    private void yw(BigDecimal netWeight, BigDecimal grossWeight, BigDecimal volume, BigDecimal area, BigDecimal quantity, Long materialInventoryId) {
+        MaterialInventory materialInventoryPO = materialInventoryMapper.selectById(materialInventoryId);
+        if (materialInventoryPO != null) {
+            //库存数量
+            BigDecimal oldInventoryQuantity = materialInventoryPO.getInventoryQuantity();
+            oldInventoryQuantity = oldInventoryQuantity != null ? oldInventoryQuantity : BigDecimal.ZERO;
+            //可用数量
+            BigDecimal oldAllocationQuantity = materialInventoryPO.getAllocationQuantity();
+            oldAllocationQuantity = oldAllocationQuantity != null ? oldAllocationQuantity : BigDecimal.ZERO;
+            //冻结数量（出库交接不变动冻结数量）
+            BigDecimal oldFreezeQuantity = materialInventoryPO.getFreezeQuantity();
+            oldFreezeQuantity = oldFreezeQuantity != null ? oldFreezeQuantity : BigDecimal.ZERO;
+            //扣减后库存数量
+            BigDecimal newInventoryQuantity = oldInventoryQuantity.subtract(quantity);
+            //扣减后可用数量
+            BigDecimal newAllocationQuantity = oldAllocationQuantity.subtract(quantity);
+            BigDecimal newFreezeQuantity = oldFreezeQuantity.subtract(quantity);
+
+
+
+            BigDecimal oldArea = materialInventoryPO.getArea();
+            BigDecimal oldVolume = materialInventoryPO.getVolume();
+            BigDecimal oldGrossWeight = materialInventoryPO.getGrossWeight();
+            BigDecimal oldNetWeight = materialInventoryPO.getNetWeight();
+
+            // 初始化旧数据，避免空指针
+            oldArea = oldArea != null ? oldArea : BigDecimal.ZERO;
+            oldVolume = oldVolume != null ? oldVolume : BigDecimal.ZERO;
+            oldGrossWeight = oldGrossWeight != null ? oldGrossWeight : BigDecimal.ZERO;
+            oldNetWeight = oldNetWeight != null ? oldNetWeight : BigDecimal.ZERO;
+
+            BigDecimal newArea = oldArea.subtract(area);
+            BigDecimal newVolume = oldVolume.subtract(volume);
+            BigDecimal newGrossWeight = oldGrossWeight.subtract(grossWeight);
+            BigDecimal newNetWeight = oldNetWeight.subtract(netWeight);
+
+            materialInventoryPO.setInventoryQuantity(newInventoryQuantity);
+            //materialInventoryPO.setAllocationQuantity(materialInventoryPO.getAllocationQuantity());
+            materialInventoryPO.setFreezeQuantity(newFreezeQuantity);
+            materialInventoryPO.setArea(newArea);
+            materialInventoryPO.setVolume(newVolume);
+            materialInventoryPO.setGrossWeight(newGrossWeight);
+            materialInventoryPO.setNetWeight(newNetWeight);
+            MaterialInventory materialInventory = new MaterialInventory();
+            com.mhd.common.core.utils.bean.BeanUtils.copyProperties(materialInventoryPO, materialInventory);
+            materialInventoryMapper.updateById(materialInventory);
+        }
+    }
+    private void kctz(BigDecimal netWeight, BigDecimal grossWeight, BigDecimal volume, BigDecimal area, BigDecimal quantity, Long materialInventoryId) {
+        MaterialInventory materialInventoryPO = materialInventoryMapper.selectById(materialInventoryId);
+        if (materialInventoryPO != null) {
+            //库存数量
+            BigDecimal oldInventoryQuantity = materialInventoryPO.getInventoryQuantity();
+            oldInventoryQuantity = oldInventoryQuantity != null ? oldInventoryQuantity : BigDecimal.ZERO;
+            //可用数量
+            BigDecimal oldAllocationQuantity = materialInventoryPO.getAllocationQuantity();
+            oldAllocationQuantity = oldAllocationQuantity != null ? oldAllocationQuantity : BigDecimal.ZERO;
+            //冻结数量（出库交接不变动冻结数量）
+            BigDecimal oldFreezeQuantity = materialInventoryPO.getFreezeQuantity();
+            oldFreezeQuantity = oldFreezeQuantity != null ? oldFreezeQuantity : BigDecimal.ZERO;
+            //扣减后库存数量
+            BigDecimal newInventoryQuantity = oldInventoryQuantity.subtract(quantity);
+            //扣减后可用数量
+            BigDecimal newAllocationQuantity = oldAllocationQuantity.subtract(quantity);
+            BigDecimal newFreezeQuantity = oldFreezeQuantity.subtract(quantity);
+
+
+
+            BigDecimal oldArea = materialInventoryPO.getArea();
+            BigDecimal oldVolume = materialInventoryPO.getVolume();
+            BigDecimal oldGrossWeight = materialInventoryPO.getGrossWeight();
+            BigDecimal oldNetWeight = materialInventoryPO.getNetWeight();
+
+            // 初始化旧数据，避免空指针
+            oldArea = oldArea != null ? oldArea : BigDecimal.ZERO;
+            oldVolume = oldVolume != null ? oldVolume : BigDecimal.ZERO;
+            oldGrossWeight = oldGrossWeight != null ? oldGrossWeight : BigDecimal.ZERO;
+            oldNetWeight = oldNetWeight != null ? oldNetWeight : BigDecimal.ZERO;
+
+            BigDecimal newArea = oldArea.subtract(area);
+            BigDecimal newVolume = oldVolume.subtract(volume);
+            BigDecimal newGrossWeight = oldGrossWeight.subtract(grossWeight);
+            BigDecimal newNetWeight = oldNetWeight.subtract(netWeight);
+
+            materialInventoryPO.setInventoryQuantity(newInventoryQuantity);
+            //materialInventoryPO.setAllocationQuantity(materialInventoryPO.getAllocationQuantity());
+            materialInventoryPO.setFreezeQuantity(newFreezeQuantity);
+            materialInventoryPO.setArea(newArea);
+            materialInventoryPO.setVolume(newVolume);
+            materialInventoryPO.setGrossWeight(newGrossWeight);
+            materialInventoryPO.setNetWeight(newNetWeight);
+            MaterialInventory materialInventory = new MaterialInventory();
+            com.mhd.common.core.utils.bean.BeanUtils.copyProperties(materialInventoryPO, materialInventory);
+            materialInventoryMapper.updateById(materialInventory);
+        }
+    }
+    private void kcdj(BigDecimal netWeight, BigDecimal grossWeight, BigDecimal volume, BigDecimal area, BigDecimal quantity, Long materialInventoryId) {
+        MaterialInventory materialInventoryPO = materialInventoryMapper.selectById(materialInventoryId);
+        if (materialInventoryPO != null) {
+            //库存数量
+            BigDecimal oldInventoryQuantity = materialInventoryPO.getInventoryQuantity();
+            oldInventoryQuantity = oldInventoryQuantity != null ? oldInventoryQuantity : BigDecimal.ZERO;
+            //可用数量
+            BigDecimal oldAllocationQuantity = materialInventoryPO.getAllocationQuantity();
+            oldAllocationQuantity = oldAllocationQuantity != null ? oldAllocationQuantity : BigDecimal.ZERO;
+            //冻结数量（出库交接不变动冻结数量）
+            BigDecimal oldFreezeQuantity = materialInventoryPO.getFreezeQuantity();
+            oldFreezeQuantity = oldFreezeQuantity != null ? oldFreezeQuantity : BigDecimal.ZERO;
+            //扣减后库存数量
+            BigDecimal newInventoryQuantity = oldInventoryQuantity.subtract(quantity);
+            //扣减后可用数量
+            BigDecimal newAllocationQuantity = oldAllocationQuantity.subtract(quantity);
+            BigDecimal newFreezeQuantity = oldFreezeQuantity.subtract(quantity);
+
+
+
+            BigDecimal oldArea = materialInventoryPO.getArea();
+            BigDecimal oldVolume = materialInventoryPO.getVolume();
+            BigDecimal oldGrossWeight = materialInventoryPO.getGrossWeight();
+            BigDecimal oldNetWeight = materialInventoryPO.getNetWeight();
+
+            // 初始化旧数据，避免空指针
+            oldArea = oldArea != null ? oldArea : BigDecimal.ZERO;
+            oldVolume = oldVolume != null ? oldVolume : BigDecimal.ZERO;
+            oldGrossWeight = oldGrossWeight != null ? oldGrossWeight : BigDecimal.ZERO;
+            oldNetWeight = oldNetWeight != null ? oldNetWeight : BigDecimal.ZERO;
+
+            BigDecimal newArea = oldArea.subtract(area);
+            BigDecimal newVolume = oldVolume.subtract(volume);
+            BigDecimal newGrossWeight = oldGrossWeight.subtract(grossWeight);
+            BigDecimal newNetWeight = oldNetWeight.subtract(netWeight);
+
+            materialInventoryPO.setInventoryQuantity(newInventoryQuantity);
+            //materialInventoryPO.setAllocationQuantity(materialInventoryPO.getAllocationQuantity());
+            materialInventoryPO.setFreezeQuantity(newFreezeQuantity);
+            materialInventoryPO.setArea(newArea);
+            materialInventoryPO.setVolume(newVolume);
+            materialInventoryPO.setGrossWeight(newGrossWeight);
+            materialInventoryPO.setNetWeight(newNetWeight);
+            MaterialInventory materialInventory = new MaterialInventory();
+            com.mhd.common.core.utils.bean.BeanUtils.copyProperties(materialInventoryPO, materialInventory);
+            materialInventoryMapper.updateById(materialInventory);
+        }
+    }
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/sysTableConfig/SysTableConfigApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/sysTableConfig/SysTableConfigApi.java
index 984ad4be0..c7826d35b 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/sysTableConfig/SysTableConfigApi.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/sysTableConfig/SysTableConfigApi.java
@@ -75,7 +75,7 @@ public class SysTableConfigApi extends BaseController {
         try {
             SysTableConfig config = sysTableConfigService.getByOrgIdAndKey(organizationId, key, warehouseId);
             if (config == null) {
-                return Result.error("未找到对应配置");
+                return Result.ok("未找到对应配置");
             }
             return Result.ok(config);
         } catch (Exception e) {