Jenkins自动合并

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -266,6 +266,18 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装String对象成equal语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getStringLikePack(String val, String columnName, DdlPackBean packBean) {
+        if (val != null && val.trim().length() > 0) {
+            packBean.addColumnQuery(columnName, " and model." + columnName + " like  :m_" + columnName, val);
+        }
+    }
+
+    /**
      * 封装String对象成不等于语句
      *
      * @param columnName 列名

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

@@ -44,4 +44,24 @@ public class WmsPackage extends BaseBean {
     @Column(name="PACKAGE_QTY")
     @ApiParam(value = "包装件数", example = "1")
     public Integer packageQty;
+
+    @Column(name="PACK_SPEC")
+    @ApiParam(value = "包装规格")
+    public String packSpec;
+
+    @Column(name="POCKET_NO")
+    @ApiParam(value = "容器编号")
+    public String pocketNo;
+
+    @Column(name="PRINT_STATUS")
+    @ApiParam(value = "打印状态", example = "1")
+    public Integer printStatus;
+
+    @Column(name="PACK_LEVEL")
+    @ApiParam(value = "包装层级", example = "1")
+    public Integer packLevel;
+
+    @Column(name="MEMO")
+    @ApiParam(value = "备注")
+    public String memo;
 }

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

@@ -171,11 +171,33 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", packBean);
         DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorName(), "vendorName", packBean);
         DdlPreparedPack.getStringRightLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
         getStringBuilderPack(swebProcurementPlanOrder, packBean);
         return packBean;
     }
 
     /**
+     * 物理包装封装
+     *
+     * @param wmsPackage
+     * @return
+     */
+    public static DdlPackBean packWmsPackage(WmsPackage wmsPackage) {
+        DdlPackBean packBean = new DdlPackBean();
+        //查询参数封装
+        DdlPreparedPack.getNumEqualPack(wmsPackage.getOrganizeCode(), "organizeCode", packBean);
+        DdlPreparedPack.getStringLikePack(wmsPackage.getPackageNo(), "packageNo", packBean);
+        DdlPreparedPack.getStringEqualPack(wmsPackage.getPackSpec(), "packSpec", packBean);
+        DdlPreparedPack.getStringLikePack(wmsPackage.getPocketNo(), "pocketNo", packBean);
+        DdlPreparedPack.getNumEqualPack(wmsPackage.getPackLevel(), "packLevel", packBean);
+        DdlPreparedPack.getNumEqualPack(wmsPackage.getIsValid()==null?CommonEnumUtil.IS_VAILD.VAILD.getValue():wmsPackage.getIsValid(), "isValid", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
+        getStringBuilderPack(wmsPackage, packBean);
+        return packBean;
+    }
+
+    /**
      * 库存移动单查询封装
      *
      * @param wmsDocMovementMaster
@@ -1064,7 +1086,7 @@ public class WmsHqlPack {
         //查询参数封装
         DdlPreparedPack.getStringLikerPack(wmsPackage.getPackageNo(), "packageNo", result);
         DdlPreparedPack.getStringLikerPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result);
-        DdlPreparedPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result);
+//        DdlPreparedPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result);
 
         getStringBuilderPack(wmsPackage, result);