From d7ebb21f3b8f4d8da7f092d96c7edef1ea8be8b4 Mon Sep 17 00:00:00 2001
From: zhou-hongcheng <1064771933@qq.com>
Date: Mon, 9 Mar 2026 14:30:59 +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=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../po/InventoryAdjustmentRecordPO.java       | 32 +++++++++
 .../persistence/ShiftMaterialDetailImpl.java  | 70 +++++++++++++++++++
 .../InventoryAdjustmentRecordMapper.xml       | 10 ++-
 3 files changed, 111 insertions(+), 1 deletion(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/repository/po/InventoryAdjustmentRecordPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/repository/po/InventoryAdjustmentRecordPO.java
index 855944d0f..7d2ee9697 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/repository/po/InventoryAdjustmentRecordPO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/repository/po/InventoryAdjustmentRecordPO.java
@@ -212,4 +212,36 @@ public class InventoryAdjustmentRecordPO extends BaseVOEntity {
     @ApiModelProperty("关联单号")
     @Excel(name = "关联单号")
     private String relateNo;
+
+    @ApiModelProperty("调整前净重(KG)")
+    @Excel(name = "调整前净重(KG)")
+    private BigDecimal netWeight;
+
+    @ApiModelProperty("调整前毛重(KG)")
+    @Excel(name = "调整前毛重(KG)")
+    private BigDecimal grossWeight;
+
+    @ApiModelProperty("调整前体积")
+    @Excel(name = "调整前体积")
+    private BigDecimal volume;
+
+    @ApiModelProperty("调整前面积")
+    @Excel(name = "调整前面积")
+    private BigDecimal area;
+
+    @ApiModelProperty("调整后净重(KG)")
+    @Excel(name = "调整后净重(KG)")
+    private BigDecimal adjustedNetWeight;
+
+    @ApiModelProperty("调整后毛重(KG)")
+    @Excel(name = "调整后毛重(KG)")
+    private BigDecimal adjustedGrossWeight;
+
+    @ApiModelProperty("调整后体积")
+    @Excel(name = "调整后体积")
+    private BigDecimal adjustedVolume;
+
+    @ApiModelProperty("调整后面积")
+    @Excel(name = "调整后面积")
+    private BigDecimal adjustedArea;
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/persistence/ShiftMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/persistence/ShiftMaterialDetailImpl.java
index 53ec7af7b..fcb229436 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/persistence/ShiftMaterialDetailImpl.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/persistence/ShiftMaterialDetailImpl.java
@@ -3,11 +3,15 @@ package com.mhd.wms.domain.shiftMaterialDetail.repository.persistence;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mhd.common.core.domain.po.UserPo;
 import com.mhd.common.core.exception.ServiceException;
 import com.mhd.common.core.utils.IgnoreNullUtil;
 import com.mhd.common.security.utils.SecurityUtils;
 import com.mhd.system.api.domain.cache.SystemServiceCacheUtil;
 import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.inventoryAdjustmentRecord.entity.InventoryAdjustmentRecord;
+import com.mhd.wms.domain.inventoryAdjustmentRecord.repository.mapper.InventoryAdjustmentRecordMapper;
+import com.mhd.wms.domain.investigetionManageDetail.repository.todo.InvestigetionManageDetailDO;
 import com.mhd.wms.domain.materialInventory.entity.MaterialInventory;
 import com.mhd.wms.domain.materialInventory.repository.facade.IMaterialInventoryService;
 import com.mhd.wms.domain.materialInventory.repository.mapper.MaterialInventoryMapper;
@@ -56,6 +60,9 @@ public class ShiftMaterialDetailImpl extends ServiceImpl<ShiftMaterialDetailMapp
     @Autowired
     private IOutMaterialDetailSerialNumberService outMaterialDetailSerialNumberService;
 
+    @Autowired
+    private InventoryAdjustmentRecordMapper inventoryAdjustmentRecordMapper;
+
 
     /**
      * 查询移位物料明细列表
@@ -367,6 +374,7 @@ public class ShiftMaterialDetailImpl extends ServiceImpl<ShiftMaterialDetailMapp
             if (!CollectionUtils.isEmpty(shiftMaterialDetailListChild)){
                 shiftMaterialDetailList.addAll(shiftMaterialDetailListChild);
             }
+            InventoryAdjustmentRecord(shiftMaterialDetailDO);
         }
         //保存物料明细信息
         saveOrUpdateBatch(shiftMaterialDetailList);
@@ -376,6 +384,68 @@ public class ShiftMaterialDetailImpl extends ServiceImpl<ShiftMaterialDetailMapp
         }
     }
 
+
+    private void InventoryAdjustmentRecord(ShiftMaterialDetailDO shiftMaterialDetailDO){
+        //库存调整记录
+        Long materialBaseInfoId = shiftMaterialDetailDO.getMaterialInventoryId();//物料库存id
+        MaterialInventory materialInventory1 = materialInventoryMapper.selectById(materialBaseInfoId);
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        InventoryAdjustmentRecord inventoryAdjustmentRecord = new InventoryAdjustmentRecord();
+        inventoryAdjustmentRecord.setNetWeight(materialInventory1.getNetWeight() == null ? BigDecimal.ZERO : materialInventory1.getNetWeight());
+        inventoryAdjustmentRecord.setGrossWeight(materialInventory1.getGrossWeight() == null ? BigDecimal.ZERO : materialInventory1.getGrossWeight());
+        inventoryAdjustmentRecord.setVolume(materialInventory1.getVolume() == null ? BigDecimal.ZERO : materialInventory1.getVolume());
+        inventoryAdjustmentRecord.setArea(materialInventory1.getArea() == null ? BigDecimal.ZERO : materialInventory1.getArea());
+
+        inventoryAdjustmentRecord.setAdjustedNetWeight(shiftMaterialDetailDO.getNetWeight() == null ? BigDecimal.ZERO : shiftMaterialDetailDO.getNetWeight());
+        inventoryAdjustmentRecord.setAdjustedGrossWeight(shiftMaterialDetailDO.getGrossWeight() == null ? BigDecimal.ZERO : shiftMaterialDetailDO.getGrossWeight());
+        inventoryAdjustmentRecord.setAdjustedVolume(shiftMaterialDetailDO.getVolume() == null ? BigDecimal.ZERO : shiftMaterialDetailDO.getVolume());
+        inventoryAdjustmentRecord.setAdjustedArea(shiftMaterialDetailDO.getArea() == null ? BigDecimal.ZERO : shiftMaterialDetailDO.getArea());
+
+        inventoryAdjustmentRecord.setAdjustAction("移位管理");
+        inventoryAdjustmentRecord.setRelateNo(shiftMaterialDetailDO.getShiftNumber());
+        inventoryAdjustmentRecord.setAdjustAfterStatusCode("he_ge");
+        inventoryAdjustmentRecord.setAdjustBeforeStatusCode("he_ge");
+        inventoryAdjustmentRecord.setAdjustAfterStatusName("合格");
+        inventoryAdjustmentRecord.setAdjustBeforeStatusName("合格");
+        inventoryAdjustmentRecord.setMaterialBaseInfoId(shiftMaterialDetailDO.getMaterialBaseInfoId());
+        inventoryAdjustmentRecord.setMaterialCode(shiftMaterialDetailDO.getBarCode());
+        inventoryAdjustmentRecord.setMaterialName(shiftMaterialDetailDO.getMaterialName());
+        inventoryAdjustmentRecord.setBarCode(shiftMaterialDetailDO.getBarCode());
+        inventoryAdjustmentRecord.setMaterialBaseInfoId(shiftMaterialDetailDO.getMaterialBaseInfoId());
+        inventoryAdjustmentRecord.setAdjustType(1L);
+        inventoryAdjustmentRecord.setOrganizationId(shiftMaterialDetailDO.getOrganizationId());
+        inventoryAdjustmentRecord.setOrganizationName(shiftMaterialDetailDO.getOrganizationName());
+        inventoryAdjustmentRecord.setTopOrganizationId(shiftMaterialDetailDO.getTopOrganizationId());
+        inventoryAdjustmentRecord.setWarehouseCode(shiftMaterialDetailDO.getOldWarehouseCode());
+        inventoryAdjustmentRecord.setWarehouseName(shiftMaterialDetailDO.getOldWarehouseName());
+        inventoryAdjustmentRecord.setWarehouseId(shiftMaterialDetailDO.getOldWarehouseId());
+        inventoryAdjustmentRecord.setStorageCode(shiftMaterialDetailDO.getOldStorageCode());
+        inventoryAdjustmentRecord.setStorageName(shiftMaterialDetailDO.getOldStorageName());
+        inventoryAdjustmentRecord.setStorageLocationId(shiftMaterialDetailDO.getOldStorageLocationId());
+        inventoryAdjustmentRecord.setStorageLocationCode(shiftMaterialDetailDO.getOldStorageLocationCode());
+        inventoryAdjustmentRecord.setStorageLocationName(shiftMaterialDetailDO.getOldStorageLocationName());
+        inventoryAdjustmentRecord.setMaterialInventoryId(shiftMaterialDetailDO.getMaterialInventoryId());
+        inventoryAdjustmentRecord.setMaterialBaseInfoId(shiftMaterialDetailDO.getMaterialBaseInfoId());
+        MaterialInventory materialInventory = materialInventoryService.getById(shiftMaterialDetailDO.getMaterialInventoryId());
+        inventoryAdjustmentRecord.setShipperId(materialInventory.getShipperId());
+        inventoryAdjustmentRecord.setShipperName(materialInventory.getShipperName());
+        inventoryAdjustmentRecord.setStorageSectionId(shiftMaterialDetailDO.getOldStorageSectionId());
+        inventoryAdjustmentRecord.setStorageLocationId(shiftMaterialDetailDO.getOldStorageLocationId());
+        inventoryAdjustmentRecord.setCreateBy(loginUser.getUserid());
+        UserPo userPo = loginUser.getUserPo();
+        if (userPo != null) inventoryAdjustmentRecord.setCreateByName(userPo.getUserName());
+        inventoryAdjustmentRecord.setCreateTime(new Date());
+        inventoryAdjustmentRecord.setInventoryBeforeQuantity(BigDecimal.ZERO);
+        inventoryAdjustmentRecord.setInventoryAfterQuantity(shiftMaterialDetailDO.getShiftQuantity());
+//        inventoryAdjustmentRecord.setAllocationAfterQuantity();
+//        inventoryAdjustmentRecord.setAllocationBeforeQuantity();
+//        inventoryAdjustmentRecord.setFreezeBeforeQuantity();
+//        inventoryAdjustmentRecord.setFreezeAfterQuantity();
+        inventoryAdjustmentRecord.setInventoryBeforeQuantity(shiftMaterialDetailDO.getInventoryQuantity());
+        inventoryAdjustmentRecord.setInventoryAfterQuantity(shiftMaterialDetailDO.getInventoryQuantity().subtract(shiftMaterialDetailDO.getShiftQuantity()));
+        inventoryAdjustmentRecordMapper.insert(inventoryAdjustmentRecord);
+    }
+
     /**
      * @description 生成流水号
      * @author ZhouGY
diff --git a/mhd_wms/src/main/resources/mapper/inventoryAdjustmentRecord/InventoryAdjustmentRecordMapper.xml b/mhd_wms/src/main/resources/mapper/inventoryAdjustmentRecord/InventoryAdjustmentRecordMapper.xml
index ae082b673..a1c7454d0 100644
--- a/mhd_wms/src/main/resources/mapper/inventoryAdjustmentRecord/InventoryAdjustmentRecordMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/inventoryAdjustmentRecord/InventoryAdjustmentRecordMapper.xml
@@ -67,7 +67,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                a.adjust_before_status_name, a.adjust_after_status_code, a.adjust_after_status_name, a.inventory_before_quantity,
                a.allocation_before_quantity, a.freeze_before_quantity, a.inventory_after_quantity, a.allocation_after_quantity,
                a.freeze_after_quantity, a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name,
-               a.del_flag,b.ext_attr_1, b.ext_attr_2, b.ext_attr_3, b.ext_attr_4,
+               a.del_flag,a.net_weight,
+               a.gross_weight,
+               a.volume,
+               a.area,
+               a.adjusted_net_weight,
+               a.adjusted_gross_weight,
+               a.adjusted_volume,
+               a.adjusted_area,
+               b.ext_attr_1, b.ext_attr_2, b.ext_attr_3, b.ext_attr_4,
                b.production_date, b.expiry_date, b.inventory_date,
                b.batch_ref_no, b.sheet_ref_no, b.box_pallet_no,a.ADJUST_ACTION,a.RELATE_NO
         from inventory_adjustment_record a left join material_inventory b on a.material_inventory_id = b.material_inventory_id