Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo

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

@@ -16,8 +16,11 @@ public class CommonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SOFT_TYPE {
-        IMPP(1, "IMPP", "IMPP平台"), CORE(2, "CORE", "i3业务平台"), WMS(3, "WMS", "仓库管理软件"), MES(4, "MES", "生产管理软件"),
-        CENTER(99,"CENTER","注册服务中心");
+        IMPP(1, "impp-platform", "IMPP平台"),
+        CORE(2, "i3core", "i3业务平台"),
+        WMS(3, "i3wms", "仓库管理软件"),
+        MES(4, "i3mes", "生产管理软件"),
+        CENTER(99,"regist-center","注册服务中心");
 
         public int value;
         public String code;

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

@@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  **/
 public class WmsEnumUtil {
     /**
-     * PO订单明细信息 是否免费
+     * 订单明细信息 是否免费
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum IS_FREE {
@@ -20,7 +20,7 @@ public class WmsEnumUtil {
         private int value;
         private String description;
 
-        private IS_FREE(int value, String description) {
+        IS_FREE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -45,18 +45,19 @@ public class WmsEnumUtil {
     }
 
     /**
-     * PO订单明细信息 状态
+     * 订单明细信息 状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ORDER_DETAILS_STATUS {
         NORMAL(10, "N", "正常"),
-        ANCEL(20, "C", "行取消");
+        ANCEL(20, "C", "行取消"),
+        RECEIPTED(30, "R", "已收货");
 
         private int value;
         private String code;
         private String description;
 
-        private ORDER_DETAILS_STATUS(int value, String code, String description) {
+        ORDER_DETAILS_STATUS(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -96,10 +97,10 @@ public class WmsEnumUtil {
     }
 
     /**
-     * PO主表信息 单据来源
+     * 主表信息 单据来源
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum PO_ORDER_SRC {
+    public enum ORDER_SRC {
         MNU(1, "MNU", "手工"),
         ERP(2, "ERP", "ERP接口");
 
@@ -107,7 +108,7 @@ public class WmsEnumUtil {
         private String code;
         private String description;
 
-        private PO_ORDER_SRC(int value, String code, String description) {
+        ORDER_SRC(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -146,10 +147,10 @@ public class WmsEnumUtil {
         }
     }
     /**
-     * PO主表信息 单据类型
+     * 主表信息 单据类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum PO_ORDER_TYPE {
+    public enum ORDER_TYPE {
         REG(1, "REG", "原物料采购"),
         SUB(10, "SUB", "委外采购"),
         TAR(20, "TAR", "多角贸易采购"),
@@ -159,7 +160,7 @@ public class WmsEnumUtil {
         private String code;
         private String description;
 
-        private PO_ORDER_TYPE(int value, String code, String description) {
+        ORDER_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -199,11 +200,11 @@ public class WmsEnumUtil {
     }
 
     /**
-     * PO主表信息 状态
+     * 主表信息 状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ORDER_STATUS {
-        CREATE(0, "新建"),
+        CREATE(1, "新建"),
         RECEIPT(10, "收货中"),
         RECEIPT_FINISH(20, "收货完成"),
         WAREHOUSING(30, "入库中"),
@@ -214,7 +215,7 @@ public class WmsEnumUtil {
         private int value;
         private String description;
 
-        private ORDER_STATUS(int value, String description) {
+        ORDER_STATUS(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -258,7 +259,7 @@ public class WmsEnumUtil {
         private int value;
         private String description;
 
-        private TRANS_STATUS(int value, String description) {
+        TRANS_STATUS(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -282,6 +283,8 @@ public class WmsEnumUtil {
         }
     }
 
+
+
     /**
      * 消息队列，队列名称
      * 1: success_queue
@@ -297,9 +300,6 @@ public class WmsEnumUtil {
         private String name;
         private String description;
 
-        QUEUE_NAME() {
-        }
-
         QUEUE_NAME(int value, String name, String description) {
             this.value = value;
             this.name = name;
@@ -350,21 +350,21 @@ public class WmsEnumUtil {
     }
 
     /**
-     * ASN单据类型
+     * 产品入库的产品状态
      */
-    public enum ASN_ORDER_TYPE{
-
-        REG("REG","原物料采购"),SUB("SUB","委外采购"),TAR("TAR","多角贸易采购"),TAP("TAP","多角代采购");
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRODUCT_INSTOCK_STATUS {
+        CREATE(10, "创建"), FINISH(20, "已处理"),FAIL(30,"处理出错");
 
-        private String value;
+        private int value;
         private String description;
 
-        ASN_ORDER_TYPE(String value, String description) {
+        PRODUCT_INSTOCK_STATUS(int value, String description) {
             this.value = value;
             this.description = description;
         }
 
-        public String getValue() {
+        public int getValue() {
             return value;
         }
 
@@ -372,7 +372,7 @@ public class WmsEnumUtil {
             return description;
         }
 
-        public static String valueOfDescription(String val) {
+        public static String valueOf(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
@@ -384,19 +384,22 @@ public class WmsEnumUtil {
     }
 
     /**
-     * ASN明细表状态
+     * 库位类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum ASN_MASTER_ORDER_STATUS {
-        NORMAL(1, "N", "正常"),
-        CANCEL(2, "C", "行取消"),
-        RECEIPTED(3, "R", "已收货");
+    public enum LOCATE_TYPE {
+        COLLECT_LOCATE(10, "I", "收货库"),
+        BASICS_LOCATE(20, "P", "基础库"),
+        maneuver_LOCATE(30, "R", "机动库"),
+        COMBINATION_LOCATE(40, "D", "组合库"),
+        LINE_LOCATE(50, "L", "线边库"),
+        NC_LOCATE(60, "N", "NC库");
 
         private int value;
         private String code;
         private String description;
 
-        private ASN_MASTER_ORDER_STATUS(int value, String code, String description) {
+        LOCATE_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -434,38 +437,4 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
-
-    /**
-     * 是否已删除
-     */
-    public enum IS_DELETED {
-        DELETED(1, "已删除"), INDELETED(2, "未删除");
-
-        private int value;
-        private String description;
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        IS_DELETED(int value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-
-        public static String valueOf(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-    }
-
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java

@@ -58,9 +58,9 @@ public class SysMenu extends BaseBean {
         }
     }
 
-    @Column(name="RED_PARENT_NAME")
+    @Column(name="PARENT_NAME_RDD")
     @ApiParam(value ="父级功能名称" , access ="父级功能名称")
-    private String redParentName;
+    private String parentNameRdd;
  
     @Column(name="MENU_CLASS_PATH")
     @ApiParam(value ="资源class path" , access ="资源class path")

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java

@@ -5,10 +5,12 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
+import javafx.scene.text.TextBoundsType;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.Type;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -55,28 +57,28 @@ public class SysRole extends BaseBean {
         }
     }
 
-    @Column(name="RED_PARENT_NAME")
+    @Column(name="PARENT_NAME_RDD")
     @ApiParam(value ="角色父节点名称" , access ="角色父节点名称")
-    private String redParentName;
+    private String parentNameRdd;
 
-    @Column(name="RED_MODULE_NAMES")
-    @ApiParam(value ="权限模块名称" , access ="权限模块名称")
-    private String redModuleNames;
-
-    @Column(name="RED_MODULE_NUMBER")
+    @Column(name="MODULE_NUMBER")
     @ApiParam(value ="权限模块数量" , example ="0" , access ="权限模块数量")
-    private Integer redModuleNumber;
+    private Integer moduleNumber;
 
-    @Column(name="RED_MENU_NAMES")
-    @ApiParam(value ="权限功能名称" , access ="权限功能名称")
-    private String redMenuNames;
+    @Column(name="MODULE_NAMES_RDD")
+    @ApiParam(value ="权限模块名称" , access ="权限模块名称")
+    private String moduleNamesRdd;
 
-    @Column(name="RED_MENU_NUMBER")
+    @Column(name="MENU_NUMBER_RDD")
     @ApiParam(value ="权限功能数量" , example ="0" , access ="权限功能数量")
-    private Integer redMenuNumber;
+    private Integer menuNumber;
+
+    @Column(name="MENU_NAMES_RDD",columnDefinition="TEXT")
+    @ApiParam(value ="权限功能名称" , access ="权限功能名称")
+    private String menuNamesRdd;
 
-    @Column(name="ROLE_STATUS_ID")
+    @Column(name="ROLE_STATUS")
     @ApiParam(value ="角色状态（枚举：1.正常，2.状态）" , example ="-1")
-    private Integer roleStatusId;
+    private Integer roleStatus;
 
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java

@@ -103,128 +103,4 @@ public class TaskTime extends BaseBean {
     @Column(name="LAST_RUN_DATE_TIME")
     @ApiParam(value ="最后运行时间" , access ="最后运行时间")
     private String lastRunDateTime;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getGroupName() {
-        return groupName;
-    }
-
-    public void setGroupName(String groupName) {
-        this.groupName = groupName;
-    }
-
-    public void setTimeExpressionId(Long timeExpressionId) {
-        this.timeExpressionId = timeExpressionId;
-    }
-
-    public String getTimeExpressionNameRdd() {
-        return timeExpressionNameRdd;
-    }
-
-    public void setTimeExpressionNameRdd(String timeExpressionNameRdd) {
-        this.timeExpressionNameRdd = timeExpressionNameRdd;
-    }
-
-    public String getTimeExpressionContentRdd() {
-        return timeExpressionContentRdd;
-    }
-
-    public void setTimeExpressionContentRdd(String timeExpressionContentRdd) {
-        this.timeExpressionContentRdd = timeExpressionContentRdd;
-    }
-
-    public Integer getTaskNumSum() {
-        return taskNumSum;
-    }
-
-    public void setTaskNumSum(Integer taskNumSum) {
-        this.taskNumSum = taskNumSum;
-    }
-
-    public Integer getTaskNumRun() {
-        return taskNumRun;
-    }
-
-    public void setTaskNumRun(Integer taskNumRun) {
-        this.taskNumRun = taskNumRun;
-    }
-
-    public Integer getTaskTypeId() {
-        return taskTypeId;
-    }
-
-    public void setTaskTypeId(Integer taskTypeId) {
-        this.taskTypeId = taskTypeId;
-    }
-
-    public Integer getTaskMethodTypeId() {
-        return taskMethodTypeId;
-    }
-
-    public void setTaskMethodTypeId(Integer taskMethodTypeId) {
-        this.taskMethodTypeId = taskMethodTypeId;
-    }
-
-    public String getTaskPackage() {
-        return taskPackage;
-    }
-
-    public void setTaskPackage(String taskPackage) {
-        this.taskPackage = taskPackage;
-    }
-
-    public String getTaskClass() {
-        return taskClass;
-    }
-
-    public void setTaskClass(String taskClass) {
-        this.taskClass = taskClass;
-    }
-
-    public String getTaskStartDateTimeRdd() {
-        return taskStartDateTimeRdd;
-    }
-
-    public void setTaskStartDateTimeRdd(String taskStartDateTimeRdd) {
-        this.taskStartDateTimeRdd = taskStartDateTimeRdd;
-    }
-
-    public String getTaskEndDateTimeRdd() {
-        return taskEndDateTimeRdd;
-    }
-
-    public void setTaskEndDateTimeRdd(String taskEndDateTimeRdd) {
-        this.taskEndDateTimeRdd = taskEndDateTimeRdd;
-    }
-
-    public String getTaskDescription() {
-        return taskDescription;
-    }
-
-    public void setTaskDescription(String taskDescription) {
-        this.taskDescription = taskDescription;
-    }
-
-    public Integer getTaskStatus() {
-        return taskStatus;
-    }
-
-    public void setTaskStatus(Integer taskStatus) {
-        this.taskStatus = taskStatus;
-    }
-
-    public String getLastRunDateTime() {
-        return lastRunDateTime;
-    }
-
-    public void setLastRunDateTime(String lastRunDateTime) {
-        this.lastRunDateTime = lastRunDateTime;
-    }
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -142,7 +142,7 @@ public class CoreHqlPack {
         StringBuffer result = new StringBuffer();
 
         // 查询参数封装
-        HqlPack.getNumEqualPack(role.getRoleStatusId(),"roleStatusId",result);
+        HqlPack.getNumEqualPack(role.getRoleStatus(),"roleStatus",result);
         HqlPack.getStringLikerPack(role.getName(),"name",result);
 
         return result.toString();

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

@@ -41,7 +41,7 @@ public class WmsASNMaster extends BaseBean {
     public String asnType;
 
     /**
-     * 状态:0=新建,10=收货中,20=收货完成,
+     * 状态:1=新建,10=收货中,20=收货完成,
      * 30=入库中,40=入库完成,90=已关闭,91=已取消
      */
     @Column(name="ASN_STATUS")

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

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
+import cn.estsh.i3plus.pojo.base.tool.SqlPack;
 import cn.estsh.i3plus.pojo.wms.bean.*;
 import org.apache.commons.lang3.StringUtils;
 
@@ -24,16 +25,15 @@ public class WmsHqlPack {
      */
     public static String getStringBuilderPack(BaseBean bean, StringBuffer hqlStr) {
 
-        if (hqlStr != null && hqlStr.toString().trim().length() > 0) {
-            if (StringUtils.isNotBlank(bean.getOrganizeCode())) {
-                hqlStr.append(" and model.organizeCode = " + bean.getOrganizeCode());
-            } else if (bean.getIsValid() > 0) {
-                hqlStr.append(" and model.isValid = " + bean.getIsValid());
-            }
-
-            hqlStr.append(" and model.isDeleted = " + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
+        // 判断工厂代码是否为空
+        if (StringUtils.isNotBlank(bean.getOrganizeCode())) {
+            SqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
         }
 
+        // 封装有效状态和删除状态
+        SqlPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
+        SqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
+
         return hqlStr.toString();
     }
 
@@ -115,11 +115,9 @@ public class WmsHqlPack {
         HqlPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result);
         HqlPack.getStringLikerPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
         HqlPack.getStringLikerPack(wmsPOMaster.getSrc(), "src", result);
-//        HqlPack.getNumEqualPack(wmsPOMaster.getIsValid(), "isValid", result);
-//        HqlPack.getNumEqualPack(wmsPOMaster.getIsDeleted(), "isDeleted", result);
+        HqlPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
 
         getStringBuilderPack(wmsPOMaster, result);
-
         return result.toString();
     }
 
@@ -192,6 +190,8 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result);
+        HqlPack.timeBuilder(wmsIbCheckPlan.getStartDate(), null, "startDate", result, true);
+        HqlPack.timeBuilder(wmsIbCheckPlan.getEndDate(), null, "endDate", result, true);
         HqlPack.getNumEqualPack(wmsIbCheckPlan.getIsValid(), "isValid", result);
         HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
         HqlPack.getStringEqualPack(wmsIbCheckPlan.getOrganizeCode(),"organizeCode",result);
@@ -231,7 +231,7 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getStringLikerPack(wmsLocate.getLocateNo(), "locateNo", result);
         HqlPack.getStringLikerPack(wmsLocate.getLocateName(), "locateName", result);
-        HqlPack.getStringLikerPack(wmsLocate.getLocateType(), "locateType", result);
+        HqlPack.getStringEqualPack(wmsLocate.getLocateType(), "locateType", result);
         HqlPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result);
         HqlPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result);
         HqlPack.getNumEqualPack(wmsLocate.getIsValid(), "isValid", result);
@@ -487,10 +487,7 @@ public class WmsHqlPack {
         //客户全称
         HqlPack.getStringLikerPack(basCustomer.getCustDesc(), "custDesc", result);
 
-        HqlPack.getStringEqualPack(basCustomer.getOrganizeCode(), "organizeCode", result);
-        HqlPack.getNumEqualPack(basCustomer.getIsValid(), "isValid", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
-                "isDeleted", result);
+        getStringBuilderPack(basCustomer, result);
         return result.toString();
     }
 
@@ -503,15 +500,14 @@ public class WmsHqlPack {
     public static String packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag) {
         StringBuffer result = new StringBuffer();
 
-        //有效性,删除标记
-        HqlPack.getNumEqualPack(wmsShippingFlag.getIsValid(), "isValid", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
         //供应商编号
         HqlPack.getStringLikerPack(wmsShippingFlag.getFlagNo(), "flagNo", result);
         //供应商简称
         HqlPack.getStringLikerPack(wmsShippingFlag.getFlagName(), "flagName", result);
         //供应商全称
         HqlPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(), "flagDesc", result);
+        getStringBuilderPack(wmsShippingFlag, result);
+
         return result.toString();
     }
 
@@ -526,7 +522,9 @@ public class WmsHqlPack {
 
         HqlPack.getStringLikerPack(wmsASNMaster.getOrderNo(), "orderNo", result);
         HqlPack.getStringLikerPack(wmsASNMaster.getAsnType(), "type", result);
-        HqlPack.getStringLikerPack(wmsASNMaster.getAsnStatus().toString(), "status", result);
+        if (wmsASNMaster.getAsnStatus() != null) {
+            HqlPack.getStringLikerPack(wmsASNMaster.getAsnStatus().toString(), "status", result);
+        }
         HqlPack.getStringLikerPack(wmsASNMaster.getVendorNo(), "vendorNo", result);
         HqlPack.getStringLikerPack(wmsASNMaster.getVersion(), "version", result);
         HqlPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result);
@@ -535,6 +533,7 @@ public class WmsHqlPack {
         HqlPack.getNumEqualPack(wmsASNMaster.getIsValid(), "isValid", result);
         HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
         HqlPack.getStringEqualPack(wmsASNMaster.getOrganizeCode(), "organizeCode", result);
+//        getStringBuilderPack(wmsASNMaster,result);
         return result.toString();
     }
 
@@ -655,8 +654,8 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsFGInStock.getCustNo(), "custNo", result);
         HqlPack.getStringLikerPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result);
         HqlPack.getStringLikerPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result);
-        HqlPack.getNumEqualPack(wmsFGInStock.getIsValid(), "isValid", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+        getStringBuilderPack(wmsFGInStock, result);
+
         return result.toString();
     }
 
@@ -668,13 +667,14 @@ public class WmsHqlPack {
      */
     public static String packHqlWmsTaskInfo(WmsTaskInfo wmsTaskInfo) {
         StringBuffer result = new StringBuffer();
+
         HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", result);
         HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(), "userNo", result);
         HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result);
         HqlPack.getStringLikerPack(wmsTaskInfo.getReMark(), "reMark", result);
         HqlPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result);
-        HqlPack.getNumEqualPack(wmsTaskInfo.getIsValid(), "isValid", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+        getStringBuilderPack(wmsTaskInfo, result);
+
         return result.toString();
     }
 }