diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java
index 277ea5c1..a9a34763 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java
@@ -123,4 +123,6 @@ public interface OdsProcureOrderMapper {
     public   void updateodsProcureOrderCardTemNumber(OdsProcureOrder order);
 
     public void updateodsProcureOrderCardByu1(OdsProcureOrder order1);
+
+    String selectBaseProductAttached(@Param("order1MaterialCode")String order1MaterialCode);
 }
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
index e338f2bb..b9a8c9f4 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
@@ -2852,6 +2852,17 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
             String  createBy=        odsProcureOutOrder.getCreateBy();//操作人
             produceCode=  order1.getProcureCode();
             String  userDefined6=   odsProcureOutOrder.getUserDefined6();//标识卡
+            //-这个地方的库区和仓库
+            String  order1MaterialCode=  order1.getMaterialCode();
+            String wcode=  odsProcureOrderMapper.selectBaseProductAttached(order1MaterialCode);
+            if(wcode!=null&&wcode!=""){
+                odsProcureOutOrder.setWaCode(wcode);
+                String  whCode=    baseProductAttachedMapper.selectBaseAreaListnew(wcode);
+                odsProcureOutOrder.setWhCode(whCode);
+            }else {
+                odsProcureOutOrder.setWaCode("0000");
+                odsProcureOutOrder.setWhCode("WH02");
+            }
             String  waCode=    odsProcureOutOrder.getWaCode();
             String  whCode=    odsProcureOutOrder.getWhCode();
             String  wlCode=    odsProcureOutOrder.getWlCode();
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml
index 06cbf724..1970c0f1 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml
@@ -943,5 +943,14 @@
         WHERE
             ods_procure_order_card.User_Defined1= #{userDefined1}
     </select>
+    <select id="selectBaseProductAttached"  resultType="java.lang.String">
+        SELECT DISTINCT
+            wa_code
+        FROM
+            base_product_attached
+        WHERE
+            CONCAT('0000000', product_code) = #{order1MaterialCode}
+          AND wa_code IS NOT NULL;
+    </select>
 </mapper>