From 408f0939528dedff4b99ca8f736773bd11c0a397 Mon Sep 17 00:00:00 2001
From: zhaoqing <3160641494@qq.com>
Date: Fri, 5 Jun 2026 10:48:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=8F=A3=E8=AE=A2=E5=8D=95=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...vationStockOutOrderApplicationService.java | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java
index 575cde450..eb13f07b2 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java
@@ -1142,7 +1142,7 @@ public class ReservationStockOutOrderApplicationService {
                 item.put("itemNo", detail.getMaterialBaseInfoId() != null ? detail.getMaterialBaseInfoId().toString() : "");
                 item.put("itemName", detail.getMaterialName() != null ? detail.getMaterialName() : "");
                 item.put("spec", detail.getSpecificationModel() != null ? detail.getSpecificationModel() : "");
-                item.put("unit", detail.getDeclareUnit() != null ? detail.getDeclareUnit() : "");
+                item.put("unit", detail.getUnit() != null ? detail.getUnit() : "");
                 item.put("qty", detail.getQuantity());
 
                 // 获取物料详情
@@ -1162,7 +1162,20 @@ public class ReservationStockOutOrderApplicationService {
                     }
                 }
 
-                // 库存关联信息
+                // 库存关联信息（实体默认值 + WMS覆盖）
+                item.put("orderINo", detail.getInOrderNumber() != null ? detail.getInOrderNumber() : "");
+                if (detail.getLotNo() != null && detail.getLotNo().contains("-")) {
+                    String lotNumStr = detail.getLotNo().substring(detail.getLotNo().lastIndexOf("-") + 1);
+                    try {
+                        Integer lotRowNum = Integer.valueOf(lotNumStr);
+                        item.put("orderIRow", lotRowNum);
+                        item.put("billIRow", lotRowNum);
+                    } catch (NumberFormatException ignored) {}
+                }
+                item.put("warehouse", detail.getWarehouseName() != null ? detail.getWarehouseName() : "");
+                item.put("opWhLoc", detail.getStorageLocationName() != null ? detail.getStorageLocationName() : "");
+
+                // WMS仓储数据（如有则覆盖）
                 if (detail.getLotNo() != null) {
                     Long kcId = reservationOutMaterialDetailMapper.getKcId(detail.getLotNo());
                     if (kcId != null) {
@@ -1180,8 +1193,11 @@ public class ReservationStockOutOrderApplicationService {
 
                         item.put("opWhLoc", opWhLoc != null ? opWhLoc : "");
 
+                        // billI = 入库单号
+                        if (inOrderNumber != null) {
+                            item.put("billI", inOrderNumber);
+                        }
                         if (inLotNo != null) {
-                            item.put("billI", inLotNo);
                             if (inLotNo.contains("-")) {
                                 String numStr = inLotNo.substring(inLotNo.lastIndexOf("-") + 1);
                                 try {