From 036cd27794f919acc3e389a8dfd9006db637cd39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Sat, 28 Feb 2026 11:16:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=85=8D=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stockOutOrder/StockOutOrderApplicationService.java     | 7 +++++++
 .../repository/persistence/OutMaterialDetailImpl.java      | 1 +
 2 files changed, 8 insertions(+)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
index fbbb4fb12..364bc4dea 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.mhd.common.core.constant.SnowFlakeConstants;
 import com.mhd.common.core.domain.po.UserPo;
@@ -807,6 +808,12 @@ public class StockOutOrderApplicationService {
         Map<Long, OutMaterialDetailPO> outMaterialDetailDbMap = outMaterialDetailPODbList.stream().collect(Collectors.toMap(OutMaterialDetailPO::getMaterialDetailId, Function.identity()));
         List<OutMaterialDetailDO> returnOutMaterialDetailDOList = new ArrayList<>();
         for (OutMaterialDetailDO outMaterialDetailDO : stockOutOrderDO.getMaterialDetailList()){
+            Long uniqueId = outMaterialDetailDO.getUniqueId();
+            OutMaterialDetail outMaterialDetail = outMaterialDetailService.getOne(new LambdaQueryWrapper<OutMaterialDetail>().eq(OutMaterialDetail::getUniqueId, uniqueId));
+            if (outMaterialDetail == null){
+                throw new ServiceException("出库明细不存在");
+            }
+            outMaterialDetailDO.setMaterialDetailId(outMaterialDetail.getMaterialDetailId());
             //设置物料更多属性信息
             OutMaterialDetailPO outMaterialDetailPO = outMaterialDetailDbMap.get(outMaterialDetailDO.getMaterialDetailId());
             if (outMaterialDetailPO == null){
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 909cfe324..aa701969d 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
@@ -397,6 +397,7 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
             outMaterialDetail.setStorageLocationId(null);
             outMaterialDetail.setStorageLocationCode(null);
             outMaterialDetail.setStorageLocationName(null);
+            outMaterialDetail.setInventoryQuantity(null);
             // 设置 actualQuantity 用于 qxfp 方法更新库存（表示本次实际取消的数量）
             outMaterialDetail.setActualQuantity(cancelAllocationQuantity);
             outMaterialDetailList.add(outMaterialDetail);