From 889f5f34bcda06de4655a31093899c3c9280da86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Thu, 11 Jun 2026 16:02:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E9=80=9A=E5=AE=87=20=E4=BF=9D?=
 =?UTF-8?q?=E7=A8=8E=E4=BB=93=E5=85=A5=E5=8F=A3=E8=AE=A2=E5=8D=95=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReservationStockInOrderApplicationService.java       | 2 +-
 .../ReservationStockOutOrderApplicationService.java      | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java
index 65a6d7d49..e3816ce19 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java
@@ -1981,9 +1981,9 @@ public class ReservationStockInOrderApplicationService {
                         gwInDetail.setLineNum("");
                     }
                 }
-                gwInDetail.setItemNo(materialBaseInfoId.toString());
                 gwInDetail.setItemName(reservationInMaterialDetail.getMaterialName());
                 MaterialBaseInfoPO materialBaseInfoPO = reservationStockInOrderMapper.getinfo(materialBaseInfoId);
+                gwInDetail.setItemNo(materialBaseInfoPO.getMaterialCode());
                 gwInDetail.setSpec(materialBaseInfoPO.getSpecificationModel());
                 gwInDetail.setUnit(materialBaseInfoPO.getDeclarationUnit());
                 gwInDetail.setQty(reservationInMaterialDetail.getQuantity());
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 9cd77a82d..93dfba059 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
@@ -1145,10 +1145,6 @@ public class ReservationStockOutOrderApplicationService {
                         item.put("lineNum", split[1]);
                     }
                 }
-                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.getUnit() != null ? detail.getUnit() : "");
                 item.put("qty", detail.getQuantity());
 
                 // 获取物料详情
@@ -1157,7 +1153,10 @@ public class ReservationStockOutOrderApplicationService {
                     if (materialBaseInfoPO != null) {
                         item.put("erpCurr", materialBaseInfoPO.getCurrency() != null ? materialBaseInfoPO.getCurrency() : "");
                         item.put("erpPrice", materialBaseInfoPO.getUnitPrice());
-
+                        item.put("itemNo", materialBaseInfoPO.getMaterialCode() != null ? materialBaseInfoPO.getMaterialCode() : "");
+                        item.put("itemName", materialBaseInfoPO.getMaterialName() != null ? materialBaseInfoPO.getMaterialName() : "");
+                        item.put("spec", materialBaseInfoPO.getSpecificationModel() != null ? materialBaseInfoPO.getSpecificationModel() : "");
+                        item.put("unit", materialBaseInfoPO.getDeclarationUnit() != null ? materialBaseInfoPO.getDeclarationUnit() : "");
                         // 计算金额
                         BigDecimal unitPrice = materialBaseInfoPO.getUnitPrice();
                         BigDecimal quantity = detail.getQuantity();