From 04ed2148a78b53663fd7f84bf3bdfcff7ad9f9a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Wed, 28 Jan 2026 15:15:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=B0=83=E6=95=B4=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E4=BF=AE=E6=94=B9=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HandoverTaskOrderDomainService.java       |  2 +-
 .../persistence/OutMaterialDetailImpl.java    | 52 +++++++++++++++++--
 2 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java
index 50fa90ea8..6a708d5a4 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java
@@ -193,7 +193,7 @@ public class HandoverTaskOrderDomainService {
                     inventoryAdjustmentRecord.setMaterialName(outMaterialDetail.getCommodityName());
                     inventoryAdjustmentRecord.setBarCode(outMaterialDetail.getBarCode());
                     inventoryAdjustmentRecord.setMaterialBaseInfoId(outMaterialDetail.getMaterialBaseInfoId());
-
+                    inventoryAdjustmentRecord.setAdjustType(0L);
                     inventoryAdjustmentRecord.setOrganizationId(stockOutOrder.getOrganizationId());
                     inventoryAdjustmentRecord.setOrganizationName(stockOutOrder.getOrganizationName());
                     inventoryAdjustmentRecord.setTopOrganizationId(stockOutOrder.getTopOrganizationId());
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java
index 644779ff4..78918febe 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java
@@ -330,6 +330,7 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
 
                 //库存调整记录
                 InventoryAdjustmentRecord inventoryAdjustmentRecord = new InventoryAdjustmentRecord();
+                inventoryAdjustmentRecord.setAdjustType(0L);
                 inventoryAdjustmentRecord.setMaterialBaseInfoId(materialInventoryPO.getMaterialBaseInfoId());
                 inventoryAdjustmentRecord.setMaterialCode(outMaterialDetail.getMaterialNo());
                 inventoryAdjustmentRecord.setMaterialName(outMaterialDetail.getCommodityName());
@@ -458,6 +459,12 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
         updateBatchById(outMaterialDetailList);
 
         //取消分配
+        qxfp(outMaterialDetailList,outOrderNumber,loginUser);
+        return stockOutOrderPO;
+    }
+
+    private synchronized void qxfp(List<OutMaterialDetail> outMaterialDetailList,String outOrderNumber,LoginUser loginUser) {
+        StockOutOrder stockOutOrder = stockOutOrderMapper.selectOne(new QueryWrapper<StockOutOrder>().lambda().eq(StockOutOrder::getOutOrderNumber, outOrderNumber));
         for (OutMaterialDetail outMaterialDetail : outMaterialDetailList) {
             Long materialInventoryId = outMaterialDetail.getMaterialInventoryId();
             BigDecimal allocationQuantity = outMaterialDetail.getAllocationQuantity();
@@ -474,12 +481,49 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
                 BigDecimal newFreezeQuantity = oldFreezeQuantity.subtract(allocationQuantity);
                 materialInventoryPO.setAllocationQuantity(newAllocationQuantity);
                 materialInventoryPO.setFreezeQuantity(newFreezeQuantity);
-                MaterialInventory materialInventory = new MaterialInventory();
-                BeanUtils.copyProperties(materialInventoryPO, materialInventory);
-                materialInventoryMapper.updateById(materialInventory);
+                //MaterialInventory materialInventory = new MaterialInventory();
+                //BeanUtils.copyProperties(materialInventoryPO, materialInventory);
+                materialInventoryMapper.updateById(materialInventoryPO);
+
+
+
+                //库存调整记录
+                InventoryAdjustmentRecord inventoryAdjustmentRecord = new InventoryAdjustmentRecord();
+                inventoryAdjustmentRecord.setAdjustType(0L);
+                inventoryAdjustmentRecord.setMaterialBaseInfoId(materialInventoryPO.getMaterialBaseInfoId());
+                inventoryAdjustmentRecord.setMaterialCode(outMaterialDetail.getMaterialNo());
+                inventoryAdjustmentRecord.setMaterialName(outMaterialDetail.getCommodityName());
+                inventoryAdjustmentRecord.setBarCode(outMaterialDetail.getBarCode());
+                inventoryAdjustmentRecord.setMaterialBaseInfoId(outMaterialDetail.getMaterialBaseInfoId());
+                inventoryAdjustmentRecord.setOrganizationId(stockOutOrder.getOrganizationId());
+                inventoryAdjustmentRecord.setOrganizationName(stockOutOrder.getOrganizationName());
+                inventoryAdjustmentRecord.setTopOrganizationId(stockOutOrder.getTopOrganizationId());
+                inventoryAdjustmentRecord.setWarehouseCode(stockOutOrder.getWarehouseCode());
+                inventoryAdjustmentRecord.setWarehouseName(stockOutOrder.getWarehouseName());
+                inventoryAdjustmentRecord.setWarehouseId(stockOutOrder.getWarehouseId());
+                inventoryAdjustmentRecord.setStorageCode(materialInventoryPO.getStorageCode());
+                inventoryAdjustmentRecord.setStorageName(materialInventoryPO.getStorageName());
+                inventoryAdjustmentRecord.setStorageLocationId(materialInventoryPO.getStorageLocationId());
+                inventoryAdjustmentRecord.setStorageLocationCode(materialInventoryPO.getStorageLocationCode());
+                inventoryAdjustmentRecord.setStorageLocationName(materialInventoryPO.getStorageLocationName());
+                inventoryAdjustmentRecord.setMaterialInventoryId(materialInventoryPO.getMaterialInventoryId());
+                inventoryAdjustmentRecord.setMaterialBaseInfoId(materialInventoryPO.getMaterialBaseInfoId());
+                inventoryAdjustmentRecord.setShipperId(stockOutOrder.getShipperId());
+                inventoryAdjustmentRecord.setShipperName(stockOutOrder.getShipperName());
+                inventoryAdjustmentRecord.setStorageSectionId(materialInventoryPO.getStorageSectionId());
+                inventoryAdjustmentRecord.setStorageLocationId(materialInventoryPO.getStorageLocationId());
+                inventoryAdjustmentRecord.setCreateBy(loginUser.getUserid());
+                inventoryAdjustmentRecord.setCreateByName(loginUser.getUsername());
+                inventoryAdjustmentRecord.setCreateTime(new Date());
+                inventoryAdjustmentRecord.setAllocationAfterQuantity(newAllocationQuantity);
+                inventoryAdjustmentRecord.setAllocationBeforeQuantity(oldAllocationQuantity);
+                inventoryAdjustmentRecord.setFreezeBeforeQuantity(oldFreezeQuantity);
+                inventoryAdjustmentRecord.setFreezeAfterQuantity(newFreezeQuantity);
+                inventoryAdjustmentRecord.setInventoryBeforeQuantity(materialInventoryPO.getInventoryQuantity());
+                inventoryAdjustmentRecord.setInventoryAfterQuantity(materialInventoryPO.getInventoryQuantity());
+                inventoryAdjustmentRecordMapper.insert(inventoryAdjustmentRecord);
             }
         }
-        return stockOutOrderPO;
     }
 
     /**