Merge branch 'dev' of i3-IMPP/i3plus-pojo into test

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java

@@ -51,6 +51,6 @@ public class SwebProcurementPlanOrder extends BaseBean {
 
     @Column(name = "CONSIGNMENT")
     @ApiParam(value = "是否寄售")
-    private Integer consignment;
+    private Integer consignment=2;
 
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java

@@ -116,7 +116,7 @@ public class WmsPOMaster extends BaseBean {
     @ApiParam("集装箱号")
     public String containerNo;
 
-    @Column(name = "PRIOR_RC")
+    @Column(name = "PRIOR_RC",columnDefinition = "int default 2")
     @ApiParam("预收货")
     public Integer priorRC;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -208,7 +208,16 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
-        DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result);
+        if (wmsPOMaster.getPriorRC()!=null&&wmsPOMaster.getPriorRC()==WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()){
+            ArrayList<Integer> numList = new ArrayList<>();
+            numList.add(0);
+            numList.add(wmsPOMaster.getPriorRC());
+            numList.add(null);
+            DdlPreparedPack.getInPackList(numList, "priorRC", result);
+        }else{
+            DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result);
+        }
+
 
         //  查询计划时间在指定范围的单号，查询这些单号的数据
         if (StringUtils.isNotBlank(wmsPOMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsPOMaster.getPlanDateEnd())) {
@@ -1511,7 +1520,7 @@ public class WmsHqlPack {
 
         //查询参数封装
         DdlPreparedPack.getStringEqualPack(wmsPoSn.getOrderNo(), "orderNo", result);
-        DdlPreparedPack.getStringEqualPack(wmsPoSn.getSn(), "sn", result);
+        DdlPreparedPack.getStringEqualPack(wmsPoSn.getSn(), "snOneBarCode", result);
         DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNo(), "partNo", result);
         DdlPreparedPack.getNumEqualPack(wmsPoSn.getQcStatus(), "qcStatus", result);
         DdlPreparedPack.getStringLikerPack(wmsPoSn.getErpAreaNoAdd(), "erpAreaNoAdd", result);