wms包材部分修改50

op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java

@@ -110,9 +110,6 @@ public class WmsToWCSmissionController {
         int tem = odsProcureOrderService.PurchaseOrderdeliPda(odsProcureOrder);
         return success(tem);
     }
-    /**
-     * 手持 －－包材采购单采购收货查询总共已经收货数量
-     */
 
     /**
      * 手持 －－包材采购单采购收货确认操作
@@ -136,6 +133,10 @@ public class WmsToWCSmissionController {
         String result = odsProcureOrderService.ArrivalRegistration(odsProcureOrder);
         return success(result);
     }
+    /**
+     * 手持 －－包材采购单采购收货查询总共已经收货数量
+     */
+
     @PostMapping("/selectOdsProcureOrderAlready")
     public AjaxResult selectOdsProcureOrderAlready(@RequestBody OdsProcureOrder odsProcureOrder) {
 //        odsProcureOrderService.PurchaseOrderdeliPdas(odsProcureOrder);

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

@@ -166,7 +166,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         wmsRawOrderInSn.setUserDefined2(odsProcureOrder.getIncomeBatchNo());//批次
         wmsRawOrderInSn.setWhCode(odsProcureOrder.getWhCode());//厂库编号
         wmsRawOrderInSn.setPoNo(order.getProcureCode());//采购单号
-//		wmsRawOrderInSn.setPoLine(odsProcureOrder.getPoLine());//行项目
+		wmsRawOrderInSn.setPoLine(odsProcureOrder.getPoLine());//行项目
         wmsRawOrderInSn.setMaterialCode(odsProcureOrder.getMaterialCode());
         wmsRawOrderInSn.setMaterialDesc(odsProcureOrder.getMaterialDesc());
         wmsRawOrderInSn.setAmount(odsProcureOrder.getPlanNumber());
@@ -722,6 +722,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode());
         String  result="操作成功";
         List<WmsRawOrderInSn> wmsRawOrderInSn  =   wmsRawOrderInSnMapper.selecPurchaseOrderdeliPdaList(odsProcureOrder);
+
         return result;
     }
 

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

@@ -51,7 +51,8 @@
             <if test="workOrder != null  and workOrder != ''">and work_order    like concat('%', #{workOrder},
                 '%') </if>
             <if test="factoryCode != null  and factoryCode != ''">and factory_code = #{factoryCode}</if>
-            <if test="productOrder != null  and productOrder != ''">and product_order = #{productOrder}</if>
+            <if test="productOrder != null  and productOrder != ''">and product_order  like concat('%', #{productOrder},
+                '%')</if>
             <if test="whCode != null  and whCode != ''">and wh_code = #{whCode}</if>
             <if test="waCode != null  and waCode != ''">and wa_code = #{waCode}</if>
             <if test="wlCode != null  and wlCode != ''">and wl_code = #{wlCode}</if>