From 64990d01edb2835f1982a1f0b9d8902dd922ed99 Mon Sep 17 00:00:00 2001
From: zhou-hongcheng <1064771933@qq.com>
Date: Wed, 22 Apr 2026 11:24:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=88=B0=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1=E5=8D=95=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/persistence/ReceiptMaterialDetailImpl.java      | 2 +-
 .../main/resources/mapper/stockInOrder/StockInOrderMapper.xml  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java
index 9d42fc6cf..ef5dc2610 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java
@@ -733,7 +733,7 @@ public class ReceiptMaterialDetailImpl extends ServiceImpl<ReceiptMaterialDetail
         QueryWrapper<InMaterialDetail> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("unique_id", receiptMaterialDetailPO.getInUniqueId());
         queryWrapper.eq("del_flag", 1);
-        InMaterialDetail inMaterialDetail = iInMaterialDetailService.getOne(queryWrapper);
+        InMaterialDetail inMaterialDetail = iInMaterialDetailService.list(queryWrapper).get(0);
         if (inMaterialDetail == null) {
             return;
         }
diff --git a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml
index b0de5b893..0f8274b2b 100644
--- a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml
@@ -95,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="packName"    column="pack_name"    />
         <result property="storageLocationName"    column="storage_location_name"    />
         <result property="omsStockInOrderId"    column="stock_in_order"    />
+        <result property="businessOrderNo"    column="business_order_no"    />
     </resultMap>
 
     <sql id="selectStockInOrderPo">
@@ -128,7 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a."TO", a.CONTACT_PERSON, a.VEHICLE_INFO, a.CONSIGNMENT_NO, a.TEL, a.DRIVER_SIGNATURE, a.FAX, a.DECLARATION_AREA, a.MANUFACTURER,
         a.CUSTOMS_BROKER_INFO, a.DELIVERY_ADDRESS, a.ENTRY_EXIT_CUSTOMS, a.ORIGIN_DESTINATION_COUNTRY, a.CARRIER, a.CONTAINER_NO,
         a.TRANSPORT_METHOD, a.SUPERVISION_METHOD, a.CUSTOMS_INSPECTION, a.NEED_CUSTOMS_DECLARATION, a.NEED_TRANSPORT,
-        a.WAREHOUSE_DATE, a.COMPLETION_TIME, a.ORDER_DATE,a.stock_in_order
+        a.WAREHOUSE_DATE, a.COMPLETION_TIME, a.ORDER_DATE,a.stock_in_order,a.business_order_no
     </sql>
 
     <sql id="joinStockInOrderPo">