用于wms一键退货入库功能接口--查询订单对应所有标识卡

op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java

@@ -124,7 +124,9 @@ public interface OdsProcureOrderMapper {
 
     public void updateodsProcureOrderCardByu1(OdsProcureOrder order1);
 
-    String selectBaseProductAttached(@Param("order1MaterialCode")String order1MaterialCode);
+    public String selectBaseProductAttached(@Param("order1MaterialCode")String order1MaterialCode);
 
     public  List<OdsProcureOrder> selectOdsProcureOrderListT(OdsProcureOrder odsProcureOrder);
+
+    public  OdsProcureOrder selectOdsProcureOrderCardTLTWO(OdsProcureOrder odsProcureOrder);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java

@@ -160,4 +160,6 @@ public interface IOdsProcureOrderService {
     void OutboundPostingzcSAPTH(List<OdsProcureOutOrder> orderList);
 
     List<OdsProcureOrder> PurchaseOrderPdaT(OdsProcureOrder odsProcureOrder);
+
+    OdsProcureOrder selectOrderCardTLTWO(OdsProcureOrder odsProcureOrder);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java

@@ -1784,6 +1784,14 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         return odsProcureOrderMapper.selectOdsProcureOrderListT(odsProcureOrder);
     }
 
+    @Override
+    public OdsProcureOrder selectOrderCardTLTWO(OdsProcureOrder odsProcureOrder) {
+        //送货单，采购单，行项目，物料编码，物料名称，工厂号，托盘，状态，实际收货
+        DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode());
+        OdsProcureOrder order=  odsProcureOrderMapper.selectOdsProcureOrderCardTLTWO(odsProcureOrder);
+        return order;
+    }
+
 
     @Override
     @DS("#header.poolName")

op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml

@@ -643,6 +643,24 @@
              WHERE
             card.User_Defined1= #{userDefined1}
     </select>
+    <select id="selectOdsProcureOrderCardTLTWO"      resultMap="OdsProcureOrderResult">
+        SELECT
+            card.Site_code,
+            card.Procure_Code ,
+            card.Material_Code ,
+            card.Material_Desc ,
+            card.User_Defined3 ,
+            card.User_Defined4 ,
+            card.User_Defined1  sn,
+            card.Plan_Number ,
+            card.User_Defined10,
+            card.User_Defined7,
+            card.User_Defined1
+        FROM
+            ods_procure_order_card card
+        WHERE
+            card.Procure_Code= #{procureCode}
+    </select>
     <select id="selectOdsProcureOrderList1" parameterType="OdsProcureOrder" resultMap="OdsProcureOrderResult">
             SELECT
                 o.Site_code,

op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml

@@ -1387,6 +1387,7 @@
 		WHERE
 			workorder_code =#{userDefined4}
 		  AND material_code = #{materialCode}
+		  AND	del_flag='0'
 	</select>
 	<select id="selectMesReportWorkConsumeFC"	resultMap="OdsProcureOutOrderResult">
 		select