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 3a90a3340..874745576 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
@@ -31,7 +31,7 @@ public interface ReservationStockInOrderMapper extends BaseMapper<ReservationSto
 
     public MaterialBaseInfoPO getByName(@Param("name") String name);
 
-    public MaterialBaseInfoPO getByCode(@Param("code") String code);
+    public MaterialBaseInfoPO getByCode(@Param("code") String code,@Param("orgId") Long orgId);
 
     public List<MaterialBaseInfoPO> getMaterialBaseInfoList(@Param("id") String 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 c01027de2..af18fa80b 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
@@ -196,7 +196,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.getByCode(productDetail.getProductCode());
+            MaterialBaseInfoPO materialBaseInfoPO = stockInOrderMapper.getByCode(productDetail.getProductCode(),loginUser.getUserPo().getOrganizationId());
             if (materialBaseInfoPO != null && materialBaseInfoPO.getShipperId() != null) {
                 Long shipperId = materialBaseInfoPO.getShipperId();
                 if (processedShipperIds.add(shipperId)) {
@@ -261,7 +261,7 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
         for (ProductDetail productDetail : productDetailList) {
             ReservationOutMaterialDetailDO reservationOutMaterialDetailDO = new ReservationOutMaterialDetailDO();
             reservationOutMaterialDetailDO.setOutOrderNumber(reservationStockOutOrderDO.getOutOrderNumber());
-            MaterialBaseInfoPO materialBaseInfoPO = stockInOrderMapper.getByCode(productDetail.getProductCode());
+            MaterialBaseInfoPO materialBaseInfoPO = stockInOrderMapper.getByCode(productDetail.getProductCode(),loginUser.getUserPo().getOrganizationId());
             reservationOutMaterialDetailDO.setQuantity(new BigDecimal(productDetail.getPieceCount()).setScale(2, BigDecimal.ROUND_HALF_UP));
             if (materialBaseInfoPO != null) {
                 Long materialBaseInfoId = materialBaseInfoPO.getMaterialBaseInfoId();
@@ -380,7 +380,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.getByCode(productDetail.getProductCode());
+            MaterialBaseInfoPO materialBaseInfoPO = stockInOrderMapper.getByCode(productDetail.getProductCode(),loginUser.getUserPo().getOrganizationId());
             if (materialBaseInfoPO != null && materialBaseInfoPO.getShipperId() != null) {
                 Long shipperId = materialBaseInfoPO.getShipperId();
                 if (processedShipperIds.add(shipperId)) {
@@ -434,7 +434,7 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
             reservationInMaterialDetailDO.setCreateBy(loginUser.getUserPo().getUserId());
             reservationInMaterialDetailDO.setCreateByName(loginUser.getUserPo().getUserName());
             reservationInMaterialDetailDO.setCreateTime(new Date());
-            MaterialBaseInfoPO materialBaseInfoPO = stockInOrderMapper.getByCode(stockInProductDetail.getProductCode());
+            MaterialBaseInfoPO materialBaseInfoPO = stockInOrderMapper.getByCode(stockInProductDetail.getProductCode(),loginUser.getUserPo().getOrganizationId());
             reservationInMaterialDetailDO.setQuantity(new BigDecimal(stockInProductDetail.getBoxCount()).setScale(2, BigDecimal.ROUND_HALF_UP));
             if (materialBaseInfoPO != null) {
                 reservationInMaterialDetailDO.setMaterialBaseInfoId(materialBaseInfoPO.getMaterialBaseInfoId());
diff --git a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
index 06bf5165c..77621bf66 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
@@ -519,8 +519,8 @@
     <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 id="getByCode" 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} and ORGANIZATION_ID = #{orgId}
     </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}