From b6fd5fb08d84c6cdb936c7b05d6aafc659d663b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Mon, 1 Jun 2026 17:15:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AEcode=E6=9F=A5=E7=89=A9?=
 =?UTF-8?q?=E6=96=99;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/mapper/ReservationStockInOrderMapper.java  | 2 ++
 .../persistence/ReservationStockInOrderImpl.java          | 8 ++++----
 .../repository/vo/StockInProductDetail.java               | 6 +++---
 .../ReservationStockInOrderMapper.xml                     | 3 +++
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java
index 4021063d3..c01e3ec65 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java
@@ -30,6 +30,8 @@ public interface ReservationStockInOrderMapper extends BaseMapper<ReservationSto
 
     public MaterialBaseInfoPO getByName(@Param("name") String name);
 
+    public MaterialBaseInfoPO getByCode(@Param("code") String code);
+
     public List<MaterialBaseInfoPO> getMaterialBaseInfoList(@Param("id") String id);
 
     public MaterialWarehouseControlPO getInfoByMaterialBaseInfoIds(@Param("id") Long id);
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java
index 5c24b7e36..ea6bf402e 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java
@@ -180,7 +180,7 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
         List<Map<String,Object>> shipperIds = new ArrayList<>();
         Set<Long> processedShipperIds = new HashSet<>();
         for (ProductDetail productDetail : productDetailList) {
-            MaterialBaseInfoPO materialBaseInfoPO = stockInOrderMapper.getByName(productDetail.getProductName());
+            MaterialBaseInfoPO materialBaseInfoPO = stockInOrderMapper.getByCode(productDetail.getProductCode());
             if (materialBaseInfoPO != null && materialBaseInfoPO.getShipperId() != null) {
                 Long shipperId = materialBaseInfoPO.getShipperId();
                 if (processedShipperIds.add(shipperId)) {
@@ -234,7 +234,7 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
         for (ProductDetail productDetail : productDetailList) {
             ReservationOutMaterialDetailDO reservationOutMaterialDetailDO = new ReservationOutMaterialDetailDO();
             reservationOutMaterialDetailDO.setOutOrderNumber(reservationStockOutOrderDO.getOutOrderNumber());
-            MaterialBaseInfoPO materialBaseInfoPO = stockInOrderMapper.getByName(productDetail.getProductName());
+            MaterialBaseInfoPO materialBaseInfoPO = stockInOrderMapper.getByCode(productDetail.getProductCode());
             reservationOutMaterialDetailDO.setMaterialBaseInfoId(materialBaseInfoPO.getMaterialBaseInfoId());
             reservationOutMaterialDetailDO.setQuantity(new BigDecimal(productDetail.getPieceCount()).setScale(2, BigDecimal.ROUND_HALF_UP).add(new BigDecimal(productDetail.getBoxCount()).setScale(2, BigDecimal.ROUND_HALF_UP)));
             reservationOutMaterialDetailDO.setMaterialCode(materialBaseInfoPO.getMaterialCode());
@@ -325,7 +325,7 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
         List<Map<String,Object>> shipperIds = new ArrayList<>();
         Set<Long> processedShipperIds = new HashSet<>();
         for (StockInProductDetail productDetail : productDetailList) {
-            MaterialBaseInfoPO materialBaseInfoPO = stockInOrderMapper.getByName(productDetail.getProductName());
+            MaterialBaseInfoPO materialBaseInfoPO = stockInOrderMapper.getByCode(productDetail.getProductCode());
             if (materialBaseInfoPO != null && materialBaseInfoPO.getShipperId() != null) {
                 Long shipperId = materialBaseInfoPO.getShipperId();
                 if (processedShipperIds.add(shipperId)) {
@@ -374,7 +374,7 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
             reservationInMaterialDetailDO.setCreateBy(loginUser.getUserPo().getUserId());
             reservationInMaterialDetailDO.setCreateByName(loginUser.getUserPo().getUserName());
             reservationInMaterialDetailDO.setCreateTime(new Date());
-            MaterialBaseInfoPO materialBaseInfoPO = stockInOrderMapper.getByName(stockInProductDetail.getProductName());
+            MaterialBaseInfoPO materialBaseInfoPO = stockInOrderMapper.getByCode(stockInProductDetail.getProductCode());
             if (materialBaseInfoPO != null) {
                 reservationInMaterialDetailDO.setMaterialBaseInfoId(materialBaseInfoPO.getMaterialBaseInfoId());
                 reservationInMaterialDetailDO.setMaterialName(materialBaseInfoPO.getMaterialName());
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/vo/StockInProductDetail.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/vo/StockInProductDetail.java
index df3efbc4c..e7dc331c8 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/vo/StockInProductDetail.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/vo/StockInProductDetail.java
@@ -10,7 +10,7 @@ import java.util.Date;
 @Data
 public class StockInProductDetail {
     // 产品编号（Excel第1列）
-    private Integer productCode;
+    private String productCode;
     // 产品名称（Excel第2列）
     private String productName;
     // 箱含量（Excel第5列）
@@ -23,11 +23,11 @@ public class StockInProductDetail {
     private Date drinkDate;
 
     // Getter和Setter方法
-    public Integer getProductCode() {
+    public String getProductCode() {
         return productCode;
     }
 
-    public void setProductCode(Integer productCode) {
+    public void setProductCode(String productCode) {
         this.productCode = productCode;
     }
 
diff --git a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
index a44d108fb..1180b0a0b 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
@@ -465,6 +465,9 @@
     <select id="getByName" parameterType="java.lang.String" resultType="com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialBaseInfoPO">
         select * from "NGWL_TEST_WMS".MATERIAL_BASE_INFO where 1 = 1 and DEL_FLAG = 1 and MATERIAL_NAME = #{name}
     </select>
+    <select id="getByCode" parameterType="java.lang.String" resultType="com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialBaseInfoPO">
+        select * from "NGWL_TEST_WMS".MATERIAL_BASE_INFO where 1 = 1 and DEL_FLAG = 1 and MATERIAL_CODE = #{code}
+    </select>
     <select id="getMaterialBaseInfoList" parameterType="java.lang.String" resultType="com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialBaseInfoPO">
         select * from "NGWL_TEST_WMS".MATERIAL_BASE_INFO where 1 = 1 and DEL_FLAG = 1 and material_code = #{id}
     </select>