Merge remote-tracking branch 'origin/dev' into dev

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

@@ -53,4 +53,8 @@ public class SwebProcurementPlanOrder extends BaseBean {
     @ApiParam(value = "是否寄售")
     private Integer consignment=2;
 
+    @Column(name = "organize_code")
+    @ApiParam(value = "组织代码")
+    private String organizeCode;
+
 }

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

@@ -99,6 +99,10 @@ public class WmsCSOrderMaster extends BaseBean {
     @ApiParam(value = "盘点库位清单")
     public String[] wmsCSLocates;
 
+    @ApiParam(value = "是否明盘 1-是 2-否")
+    @Column(name = "is_obvious")
+    private Integer isObvious;
+
     public Integer getIsInventoryVal() {
         return this.isInventory == null ? 0 :this.isInventory.intValue();
     }

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

@@ -153,6 +153,26 @@ public class WmsHqlPack {
     }
 
     /**
+     * 开口合同查询封装
+     *
+     * @param swebProcurementPlanOrder
+     * @return
+     */
+    public static DdlPackBean packSwebProcurementPlanOrder(SwebProcurementPlanOrder swebProcurementPlanOrder) {
+        DdlPackBean packBean = new DdlPackBean();
+
+        //查询参数封装
+        DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getOrganizeCode(), "organizeCode", packBean);
+        DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getPartName(), "partName", packBean);
+        DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", packBean);
+        DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorName(), "vendorName", packBean);
+        DdlPreparedPack.getStringRightLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", packBean);
+        getStringBuilderPack(swebProcurementPlanOrder, packBean);
+        return packBean;
+    }
+
+    /**
      * 库存移动单查询封装
      *
      * @param wmsDocMovementMaster