wms手持批条件筛选

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

@@ -498,7 +498,16 @@ public class WmsToWCSmissionController {
      */
     @PostMapping("/ScanCodeWholePallet")
     public AjaxResult ScanCodeWholePallet(@RequestBody WmsProductPutTrayCode wmsProductPutTrayCode) {
-        return AjaxResult.success(wmsProductPutService.ScanCodeWholePallet(wmsProductPutTrayCode));
+        List<WmsFpStorageNewsSn>  wmsFpStorageNewsSns=    wmsProductPutService.ScanCodeWholePallet(wmsProductPutTrayCode);
+        if (wmsFpStorageNewsSns!=null&&wmsFpStorageNewsSns.size()>0){
+            WmsFpStorageNewsSn  wmsFpStorageNewsSn1=     wmsFpStorageNewsSns.get(0);
+                    if(  wmsFpStorageNewsSn1.getBatchNumber().contains(wmsProductPutTrayCode.getBatchNumber())){
+                        return AjaxResult.success(wmsFpStorageNewsSns);
+                    }else {
+                        return AjaxResult.error("请查看批次是否与订单相同");
+                    }
+        }
+          return AjaxResult.success(wmsFpStorageNewsSns);
     }
     /**
      * 成品销售出库----单箱扫码

op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPutTrayCode.java

@@ -31,6 +31,16 @@ public class WmsProductPutTrayCode extends BaseEntity {
      */
     @Excel(name = "箱码")
     private String barcode;
+    @Excel(name = "批次号")
+    private String batchNumber;
+
+    public String getBatchNumber() {
+        return batchNumber;
+    }
+
+    public void setBatchNumber(String batchNumber) {
+        this.batchNumber = batchNumber;
+    }
 
     /**
      * 库位

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

@@ -2102,7 +2102,8 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         return result;
     }
 
-    public void OutboundPostingzcSAPGY(List<OdsProcureOutOrder> orderList) {
+    public String OutboundPostingzcSAPGY(List<OdsProcureOutOrder> orderList) {
+        String  TEM="操作成功";
         //先根据出库单获取
 //		* 退料的移动类型为 262
 //				* 领料的移动类型为 261-- 		and	wms_ods_procure_out_order.Order_Status='3'
@@ -2183,6 +2184,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
                 order.setUserDefined10("3");//失败
                 odsProcureOutOrderMapper.updateWMSOdsProcureOutOrderByids(order, orderList2);
             }
+            TEM=msg;
         }
         if (sapMaterialPostingFCList.size() > 0) {
             //反冲过账
@@ -2218,11 +2220,14 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
                     }
                 }
             } else {//
+
                 order.setUserDefined9("");
                 order.setUserDefined10("3");//失败
                 odsProcureOutOrderMapper.updateWMSOdsProcureOutOrderByids(order, orderList2FC);
             }
+            TEM=msg;
         }
+       return  TEM;
     }
 
 

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

@@ -913,7 +913,8 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
         WmsFpStorageNewsSn  wmsFpStorageNewsSn=new WmsFpStorageNewsSn();
         wmsFpStorageNewsSn.setSn(wmsProductPutTrayCode.getSn());
         wmsFpStorageNewsSn.setActiveFlag("1");
-        List<WmsFpStorageNewsSn>    wmsFpStorageNewsSns=   wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnSTList(wmsFpStorageNewsSn);
+        List<WmsFpStorageNewsSn>    wmsFpStorageNewsSns =   wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnSTList(wmsFpStorageNewsSn);
+
         return wmsFpStorageNewsSns;
     }
 

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

@@ -531,6 +531,7 @@
         sap_factory_code
         FROM
         wms_fp_storage_news_sn
+
         <where>
             <if test="whCode != null  and whCode != ''">and wh_code = #{whCode}</if>
             <if test="waCode != null  and waCode != ''">and wa_code = #{waCode}</if>
@@ -544,7 +545,8 @@
             <if test="sn != null  and sn != ''">and sn = #{sn}</if>
             <if test="barCode != null  and barCode != ''">and bar_code = #{barCode}</if>
             <if test="amount != null ">and amount = #{amount}</if>
-            <if test="batchNumber != null  and batchNumber != ''">and batch_number = #{batchNumber}</if>
+            <if test="batchNumber != null  and batchNumber != ''">and batch_number    like concat('%',#{batchNumber} ,
+                '%') </if>
             <if test="userDefined2 != null  and userDefined2 != ''">and user_defined2 = #{userDefined2}</if>
             <if test="userDefined3 != null  and userDefined3 != ''">and user_defined3 = #{userDefined3}</if>
             <if test="userDefined4 != null  and userDefined4 != ''">and user_defined4 = #{userDefined4}</if>