Jenkins自动合并

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -3485,7 +3485,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WMS_STOCK_TYPE {
-        SOURCE(10, "实物条码"), TARGET(20, "虚拟条码");
+        SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"),CUST_SN(30, "客户条码");
 
         private int value;
         private String description;

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

@@ -293,6 +293,15 @@ public class DdlPreparedPack {
      * @param columnName 列名
      * @param packBean
      */
+    public static void getStringNotBlanklPack(String columnName, DdlPackBean packBean) {
+        packBean.addColumnQuery(null, " and (model." + columnName + " is not null  and model." + columnName + " !='')", null);
+    }
+    /**
+     * 封装String对象成equal语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
     public static void getStringEqualPackOr(String val, String columnName, DdlPackBean packBean) {
         if (val != null && val.trim().length() > 0) {
             packBean.addColumnQuery(columnName, " or model." + columnName + " = :m_" + columnName, val);

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

@@ -78,6 +78,11 @@ public class WmsDocMovementSn extends BaseBean {
     @ApiParam(value = "供应商编码")
     public String vendorNo;
 
+    @Column(name = "SN_TYPE")
+    @ApiParam(value = "条码类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer snType;
+
     @Transient
     @ApiParam("前端表格编辑使用")
     private Boolean isSet = false;
@@ -113,4 +118,8 @@ public class WmsDocMovementSn extends BaseBean {
     @Transient
     @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
     public Integer itemStatus;
+
+    @Transient
+    @ApiParam("打印模板名称")
+    private String templateName;
 }

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

@@ -58,9 +58,15 @@ public class WmsPullTaskMaster extends BaseBean{
     @ApiParam(value = "单据状态", example = "0")
     private Integer orderStatus = 0;
 
+    @Column(name="IS_SUSPEND")
+    @ApiParam(value = "是否暂停", example = "0")
+    private Integer isSuspend = 2;
+
     public Integer getOrderStatus() {
         return orderStatus == null ? 0 : this.orderStatus.intValue();
     }
 
-
+    public Integer getIsSuspend() {
+        return isSuspend == null ? 0 : this.isSuspend.intValue();
+    }
 }