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

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

@@ -6,7 +6,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * @Description : 模块枚举类
+ * @Description : 模块报表枚举类
  * @Reference :
  * @Author : alwaysfrin
  * @CreateDate : 2018-12-25 21:08

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

@@ -1584,6 +1584,42 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 打印单号数据类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRINT_ORDER_TYPE {
+        PO(10, "PO"),
+        MOVEMENT(20, "MOVEMENT"),
+        ASN(30, "ASN");
+
+        private int value;
+        private String description;
+
+        PRINT_ORDER_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return 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;
+        }
+    }
+
+    /**
      * 组件统一返回提示
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -1852,7 +1888,7 @@ public class WmsEnumUtil {
         STEP_SEQ("STEP_SEQ", "步骤调用序号"),
         MOVE_ORDER_NO("MOVE_ORDER_NO", "移库单单号"),
         QC_ORDER_NO("QC_ORDER_NO", "质检单单号"),
-        ORDER_NO("ORDER_NO", "盘点主表序号");
+        CHECK_ORDER_NO("CHECK_ORDER_NO", "盘点主表序号");
 
         private String code;
         private String description;
@@ -1877,6 +1913,35 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 通用条码枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum COMMON_SN {
+        PO_SN("PO_SN", "PO条码");
+
+        private String code;
+        private String description;
+        int value;
+
+        COMMON_SN(String code, String description) {
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
      * 可选项类型枚举
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -1998,7 +2063,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TRANS_QUAN_GENERAL_TAG {
-        MINUS(-1, "MINUS", "一条：负"), ZERO(0, "ZERO", "一条：0"), PLUS(1, "PLUS", "一条：正"), TWO(2, "TWO", "两条：一正一负");
+        SRC(-1, "SRC", "一条：负"), ZERO(0, "ZERO", "一条：0"), DEST(1, "DEST", "一条：正"), TWO(2, "TWO", "两条：一正一负");
 
         private String code;
         private String description;
@@ -2032,4 +2097,160 @@ public class WmsEnumUtil {
             return null;
         }
     }
+
+    /**
+     * 数据状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DATA_STATUS {
+        YES(1, "是", "fa fa-success cell-fa fa-check"),
+        NO(2, "否", "fa fa-disabled cell-fa fa-times-circle");
+
+        private int value;
+        private String description;
+        private String code;
+
+        DATA_STATUS(int value, String code, String description){
+            this.value = value;
+            this.description = description;
+            this.code = code;
+        }
+
+        public int getValue () {
+            return value;
+        }
+
+        public String getDescription () {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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].getDescription();
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 打印模板
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRINT_TEMPLATE {
+        SN_PRINT_TEMPLATE(10, "SN_PRINT_TEMPLATE", "条码打印模板"),
+        ORDER_PRINT_TEMPLATE(20, "ORDER_PRINT_TEMPLATE", "订单打印模板"),
+        RC_BACK_PRINT_TEMPLATE(30, "RC_BACK_PRINT_TEMPLATE", "收货回执打印模板");
+
+        private int value;
+        private String code;
+        private String description;
+
+        PRINT_TEMPLATE(int value, String code, String description){
+            this.value = value;
+            this.description = description;
+            this.code = code;
+        }
+
+        public int getValue () {
+            return value;
+        }
+
+        public String getDescription () {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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].getDescription();
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 版本号
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum VERSION {
+        PO_VERSION(10, "VERSION", "PO版本号");
+
+        private int value;
+        private String code;
+        private String description;
+
+        VERSION(int value, String code, String description){
+            this.value = value;
+            this.description = description;
+            this.code = code;
+        }
+
+        public int getValue () {
+            return value;
+        }
+
+        public String getDescription () {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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].getDescription();
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 包装类型枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PACKAGE_TYPE {
+        BOX(10 , "BOX", "BOX（盒）"),
+        CARTON(20 , "CARTON", "CARTON（箱）"),
+        PALLET(30 , "PALLET", "PALLET（栈板）"),
+        CONTAINER(40 , "PALLET", "PALLET（集装箱）");
+
+        private String code;
+        private String description;
+        int value;
+
+        PACKAGE_TYPE(int value , String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.java

@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.model.platform;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.platform.bean.SysRole;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : siliter
+ * @CreateDate : 2019-03-19 13:52
+ * @Modify:
+ **/
+@Data
+public class UserRolePagerModel {
+
+    private SysRole sysRole;
+
+    private Pager pager;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 订单打印数据封装model
+ * @Reference :
+ * @Author : siliter
+ * @CreateDate : 2019-03-18 11:50
+ * @Modify:
+ **/
+@Data
+public class PrintOrderDataModel {
+
+    @ApiParam(value = "工厂代码")
+    public String organizeCode;
+
+    @ApiParam(value = "单号")
+    public String orderNo;
+
+    @ApiParam(value = "业务类型", example = "-1")
+    public Integer busiType;
+
+    @ApiParam(value = "状态", example = "-1")
+    public Integer status;
+
+    @ApiParam(value = "打印标志", example = "-1")
+    public Integer printFlag;
+
+    @ApiParam(value = "供应商编号")
+    public String vendorNo;
+
+    @ApiParam(value = "客户编号")
+    public String custNo;
+
+    @ApiParam(value = "版本")
+    public String version;
+
+    @ApiParam(value = "ERP单号")
+    public String erpSrcNo;
+
+    @ApiParam(value = "业务数据类型", example = "-1")
+    public Integer busiDataType;
+}

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -38,6 +39,11 @@ public class SysDictionary extends BaseBean {
     @ApiParam(value ="字典代码")
     private String dictionaryCode;
 
+    //枚举 CommonEnumUtil.SOFT_TYPE
+    @Column(name="SOFT_TYPE")
+    @ApiParam(value ="微服务软件类型")
+    private Integer softType;
+
     // 根节点-1
     @Column(name="PARENT_ID")
     @ApiParam(value ="父节点" , example = "-1")

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

@@ -25,19 +25,19 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="SYS_LABELTEMPLATE")
+@Table(name="SYS_LABEL_TEMPLATE")
 @Api(value="打印模板",description = "打印模板")
 public class SysLabelTemplate extends BaseBean {
 
-    @Column(name="TEMPLATECODE")
+    @Column(name="TEMPLATE_CODE")
     @ApiParam(value ="模板代码")
     private String templateCode;
 
-    @Column(name="TEMPLATENAME")
+    @Column(name="TEMPLATE_NAME")
     @ApiParam(value ="模板名称")
     private String templateName;
 
-    @Column(name="TEMPLATECONTENT", columnDefinition = "TEXT")
+    @Column(name="TEMPLATE_CONTENT", columnDefinition = "TEXT")
     @ApiParam(value ="模板内容")
     private String templateContent;
 

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

@@ -27,24 +27,24 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="SYS_LABELTEMPLATEPARAM")
+@Table(name="SYS_LABEL_TEMPLATE_PARAM")
 @Api(value="打印模板参数",description = "打印模板参数")
 public class SysLabelTemplateParam extends BaseBean {
 
-    @Column(name="TEMPLATEID")
+    @Column(name="TEMPLATE_ID")
     @ApiParam(value ="模板ID" , access ="模板ID" ,example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long templateId;
 
-    @Column(name="TEMPLATECODE")
+    @Column(name="TEMPLATE_CODE")
     @ApiParam(value ="模板代码")
     private String templateCode;
 
-    @Column(name="TEMPLATEPARAM")
+    @Column(name="TEMPLATE_PARAM")
     @ApiParam(value ="模板参数")
     private String templateParam;
 
-    @Column(name="TEMPLATEPARAMTEXT", columnDefinition = "TEXT")
+    @Column(name="TEMPLATE_PARAM_TEXT", columnDefinition = "TEXT")
     @ApiParam(value ="模板参数描述")
     private String templateParamText;
 

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

@@ -406,9 +406,10 @@ public class CoreHqlPack {
 
         // and
         HqlPack.getStringEqualPack(dictionary.getDictionaryCode(),"dictionaryCode",result);
+        HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result);
+        HqlPack.getNumEqualPack(dictionary.getSoftType(),"softType",result);
         // not
         HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result);
-        HqlPack.getNumNOEqualPack(dictionary.getParentId(),"parentId",result);
 
         // 添加默认排序
         HqlPack.getOrderDefault(dictionary);
@@ -426,9 +427,10 @@ public class CoreHqlPack {
 
         // and
         HqlPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result);
+        HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result);
+        HqlPack.getNumEqualPack(dictionary.getSoftType(),"softType",result);
         // not
         HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result);
-        HqlPack.getNumNOEqualPack(dictionary.getParentId(),"parentId",result);
 
         // 添加默认排序
         HqlPack.getOrderDefault(dictionary);

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java

@@ -49,8 +49,6 @@ public class BrLayoutRow extends BaseBean {
     @ApiParam(value ="排序")
     private Integer rowSort;
 
-    private Integer rowSeq;
-
     @Column(name="ROW_STYLE",columnDefinition = "TEXT")
     @ApiParam(value ="行样式")
     private String rowStyle;

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

@@ -75,6 +75,12 @@ public class WmsActionResponseBean<Obj> {
     public Boolean isDetailsBtnDisabled = true;
 
     /**
+     * 默认为true，如果这个值为true就禁用按钮否则可用，
+     */
+    @ApiParam(value = "输入框是否禁用")
+    public Boolean isInputBtnDisabled = false;
+
+    /**
      * 与 toSelected 属性配合使用，
      * 选择数据后把选中行的 keyColumn 字段的值写入界面输入框并触发回车事件
      */

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

@@ -86,8 +86,7 @@ public class WmsCSOrderDetails extends BaseBean {
     public Integer snStatus;
 
     /**
-     * 处理状态:1=已创建,5=已盘,10=已冻结
-     * ,20=已解冻,30=取消冻结
+     * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结
      */
     @Column(name = "TRANS_STATUS")
     @ApiParam(value = "处理状态", example = "1")

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

@@ -65,4 +65,16 @@ public class WmsCSOrderMaster extends BaseBean {
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生产任务", example = "1")
     public Integer isTask;
+
+    @Transient
+    @ApiParam(value = "盘点物料清单")
+    public String[] wmsCSParts;
+
+    @Transient
+    @ApiParam(value = "盘点存储区清单")
+    public String[] wmsCSZones;
+
+    @Transient
+    @ApiParam(value = "盘点库位清单")
+    public String[] wmsCSLocates;
 }

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 盘点存储区信息
@@ -35,4 +36,8 @@ public class WmsCSZone extends BaseBean {
     @Column(name="ZONE_NO")
     @ApiParam("存储区代码")
     public String zoneNo;
+
+    @Transient
+    @ApiParam("库位代码")
+    public String locateNo;
 }

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

@@ -97,4 +97,15 @@ public class WmsDocMovementMaster extends BaseBean {
     @Column(name = "CUST_ORDER_NO")
     @ApiParam(value = "客户单号")
     private String custOrderNo;
+
+    @Transient
+    private List<WmsDocMovementDetails> movementDetailsList;
+
+    @Transient
+    @ApiParam(value = "源库存地代码")
+    private String srcAreaNo;
+
+    @Transient
+    @ApiParam(value = "目的库存地代码")
+    private String desrAreaNo;
 }

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

@@ -91,18 +91,9 @@ public class WmsOpType extends BaseBean {
 
     @Column(name = "USE_TIME")
     @ApiParam(value = "标准工时(每箱)", example = "0")
-    private Integer userTime;
+    private Integer useTime;
 
     @Column(name = "IS_MULITI")
     @ApiParam(value = "是否允许多人操作", example = "0")
     private Integer isMuliti;
-
-    @Column(name = "TM_ID")
-    @ApiParam(value = "处理组件编号")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long tmId;
-
-    @Column(name = "DATA_SRC")
-    @ApiParam("数据来源")
-    private String dataSrc;
 }

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

@@ -75,14 +75,4 @@ public class WmsQCDetails extends BaseBean {
     @Column(name = "REJECT_QTY")
     @ApiParam(value = "不合格数量", example = "0")
     public Double rejectQty;
-
-    @Column(name = "QC_USER")
-    @ApiParam("检验员")
-    public String qcUser;
-
-    @Column(name = "QC_TIME")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value = "检验时间", example = "2000-01-01 01:00:00")
-    public String qcTime;
-
 }

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -45,7 +46,7 @@ public class WmsQCTrans extends BaseBean {
 
     @Column(name="REMARK")
     @ApiParam("备注")
-    public String reMark;
+    public String remark;
 
     @Column(name="PASS_QTY")
     @ApiParam("合格数量")
@@ -70,4 +71,13 @@ public class WmsQCTrans extends BaseBean {
     @Column(name="SN")
     @ApiParam("条码")
     public String sn;
+
+    @Column(name = "QC_USER")
+    @ApiParam("检验员")
+    public String qcUser;
+
+    @Column(name = "QC_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value = "检验时间", example = "2000-01-01 01:00:00")
+    public String qcTime;
 }

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

@@ -56,14 +56,6 @@ public class WmsTransQuan extends BaseBean {
     @ApiParam(value = "单位")
     private String unit;
 
-    @Column(name = "QTY")
-    @ApiParam(value = "交易数量", example = "1")
-    private Double qty;
-
-    @Column(name = "REJECT_QTY")
-    @ApiParam(value = "不合格交易数量", example = "1")
-    private Double rejectQty;
-
     @Column(name = "TRANS_STATUS")
     @ApiParam(value = "状态", example = "10")
     private Integer transStatus;
@@ -99,4 +91,36 @@ public class WmsTransQuan extends BaseBean {
     @Column(name = "ERROR_MESSAGE")
     @ApiParam(value = "错误信息")
     private String errorMessage;
+
+    @Column(name = "QTY")
+    @ApiParam(value = "可用数量", example = "0")
+    public Double qty;
+
+    @Column(name = "FAIL_QTY")
+    @ApiParam(value = "不合格数量", example = "0")
+    private Double failQty;
+
+    @Column(name = "HOLD_QTY")
+    @ApiParam(value = "隔离数量", example = "0")
+    private Double holdQty;
+
+    @Column(name = "QC_QTY")
+    @ApiParam(value = "质检中数量", example = "0")
+    private Double qcQty;
+
+    @Column(name = "RIN_QTY")
+    @ApiParam(value = "待入库数量", example = "0")
+    private Double rinQty;
+
+    @Column(name = "FREEZE_QTY")
+    @ApiParam(value = "冻结数量", example = "0")
+    private Double freezeQty;
+
+    @Column(name = "CONSIGN_QTY")
+    @ApiParam(value = "寄售数量", example = "0")
+    private Double consignQty;
+
+    @Column(name = "LOCK_QTY")
+    @ApiParam(value = "锁定数量", example = "0")
+    private Double lockQty;
 }

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

@@ -24,6 +24,12 @@ import java.util.stream.Collectors;
  **/
 public class WmsHqlPack {
 
+    public static String packInParams(String colnumName, String[] params) {
+        StringBuffer sb = new StringBuffer();
+        HqlPack.getInPackString(String.join(",", params), colnumName, sb);
+        return sb.toString();
+    }
+
     /**
      * 封装公用查询参数
      * @param bean   实体对象
@@ -82,27 +88,27 @@ public class WmsHqlPack {
 
         return result.toString();
     }
+
     /**
      * 查询任务合并的移库单明细 查询条件封装
      *
+     * @param colName
      * @param orderNos
      * @return
      */
-    public static String packWmsOrderDetailsByOrderNos(List<String> orderNos) {
+    public static String packWmsOrderDetailsByOrderNos(String colName, List<String> orderNos) {
         StringBuffer result = new StringBuffer();
         StringBuffer orderNoStr = new StringBuffer();
         for (int i = 0; i < orderNos.size(); i++) {
-            if (i == orderNos.size()) {
-                orderNoStr.append("'" + orderNos.get(i) + "'");
-            } else {
             orderNoStr.append("'" + orderNos.get(i) + "',");
         }
-        }
+        orderNoStr.deleteCharAt(orderNoStr.length() - 1);
         result.append(" and model.isDeleted=" + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() +
                 " and model.isValid=" + CommonEnumUtil.IS_VAILD.VAILD.getValue() +
-                "and model.orderNo in (" + orderNos + ")" + " order by model.partNo,model.orderNo");
+                " and model.orderNo in (" + orderNoStr + ")" + " order by model." + colName + ",model.orderNo");
         return result.toString();
     }
+
     /**
      * 库存移动单查询封装
      *
@@ -188,7 +194,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result);
-        HqlPack.getStringLikerPack(wmsPart.getPartName(), "partNameRdd", result);
+        HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result);
         HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
         HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result);
 
@@ -351,7 +357,6 @@ public class WmsHqlPack {
 
         HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
         HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result);
-        HqlPack.getNumEqualPack(wmsOpType.getTmId(), "tmId", result);
         HqlPack.getNumEqualPack(wmsOpType.getSeq(), "seq", result);
 
         getStringBuilderPack(wmsOpType, result);
@@ -406,6 +411,7 @@ public class WmsHqlPack {
 
         return result.toString();
     }
+
     /**
      * 查询满足处理周期的作业类型 查询条件封装
      *
@@ -436,6 +442,7 @@ public class WmsHqlPack {
 
         return result.toString();
     }
+
     /**
      * 存储区信息 查询条件封装
      *
@@ -643,6 +650,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", result);
+        HqlPack.getStringLikerPack(wmsTaskInfo.getOrderNo(), "orderNo", result);
         HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(), "userNo", result);
         HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result);
         HqlPack.getStringLikerPack(wmsTaskInfo.getRemark(), "remark", result);
@@ -782,7 +790,11 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result);
         HqlPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result);
-
+        HqlPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result);
+        HqlPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result);
+        HqlPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result);
+        HqlPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
+        HqlPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
         getStringBuilderPack(wmsStockSn, result);
 
         return result.toString();
@@ -863,6 +875,7 @@ public class WmsHqlPack {
 
         return result.toString();
     }
+
     /**
      * 内部单据：库存移动单主表唯一性查询
      * @param wmsMoveMaster
@@ -1284,6 +1297,7 @@ public class WmsHqlPack {
 
     /**
      * 按moveNo 取最后一笔插入的数据
+     *
      * @param wmsMoveSn
      * @return
      */
@@ -1299,6 +1313,7 @@ public class WmsHqlPack {
 
     /**
      * 根据条件查询库存条码信息
+     *
      * @param wmsStockSn
      * @return
      */
@@ -1314,6 +1329,7 @@ public class WmsHqlPack {
 
     /**
      * 根据条件模糊查询库存条码信息
+     *
      * @param wmsStockSn
      * @return
      */
@@ -1327,6 +1343,7 @@ public class WmsHqlPack {
 
     /**
      * 根据条件查询库存信息
+     *
      * @param wmsStockQuan
      * @return
      */
@@ -1340,6 +1357,7 @@ public class WmsHqlPack {
 
     /**
      * 根据用户角色id列表查询数据权限信息
+     *
      * @return
      */
     public static String packHqlWmsDataAuth(WmsDataAuth dataAuth, List<String> roleIds) {
@@ -1437,6 +1455,7 @@ public class WmsHqlPack {
 
     /**
      * 根据条件查询任务生成日志
+     *
      * @param wmsTaskCreateLog
      * @return
      */
@@ -1450,6 +1469,7 @@ public class WmsHqlPack {
 
     /**
      * 根据条件查询作业处理组件
+     *
      * @param wmsTransModule
      * @return
      */
@@ -1467,4 +1487,17 @@ public class WmsHqlPack {
         getStringBuilderPack(wmsTransModule, result);
         return result.toString();
     }
+
+    /**
+     * 根据条件查询系统配置信息
+     * @param wmsConfig
+     * @return
+     */
+    public static String packHqlWmsConfig(WmsConfig wmsConfig) {
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringEqualPack(wmsConfig.getConfigCode(), "configCode", result);
+        getStringBuilderPack(wmsConfig, result);
+        return result.toString();
+    }
+
 }