diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
index 393f698..d1a06e2 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.andon.sqlpack;
 import cn.estsh.i3plus.pojo.andon.bean.*;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
@@ -17,6 +18,19 @@ import org.apache.commons.lang3.StringUtils;
  **/
 public class AndonHqlPack {
     /**
+     * genju 安灯队列参数查询安灯队列
+     * @param andonManageQueue
+     * @return
+     */
+    public static DdlPackBean getAndonQueuePack(AndonManageQueue andonManageQueue, String statusCode) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean();
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getOrganizeCode(), "organizeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringEqualPack(statusCode, "statusCode", packBean);
+        return packBean;
+    }
+    /**
      * 封装公用查询参数
      *
      * @param bean   实体对象
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index 15a7e6d..0c9da50 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@@ -12,6 +12,42 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class MesEnumUtil {
 
     /**
+     * 关键件条码规则信息绑定规则
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BIND_RULE {
+
+        COOPERATION_PART(0, "外协件"),
+        SELF_CONTROL_PART(1, "自制件");
+
+        private int value;
+        private String description;
+
+        BIND_RULE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(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)
@@ -757,8 +793,8 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CONFIG_TYPE {
 
-        FASTDFS_SAVE_PATH(10, "savePath");
-
+        FASTDFS_SAVE_PATH(10, "savePath"),
+        NGINX_IP(20,"nginxIp");
 
         private int value;
         private String description;
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index 2f70a65..203bbce 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -3189,4 +3189,57 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 盘点差异类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum INVENTORY_DIFFERENCE_TYPE {
+        INVENTORY_FLAT(10, "INVENTORY_FLAT", "盘平"),
+        INVENTORY_LOSSES(20, "INVENTORY_LOSSES", "盘亏"),
+        INVENTORY_WIN(30, "INVENTORY_WIN", "盘赢");
+
+        private int value;
+        private String code;
+        private String description;
+
+        INVENTORY_DIFFERENCE_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        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].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java
index e5253fc..655ffd0 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java
@@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.mes.pcn.sqlpack;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesConfig;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @Description:
@@ -26,4 +28,24 @@ public class MesHqlPack {
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
         return packBean;
     }
+
+    /**
+     * MES PCN系统配置信息条件查询
+     *
+     * @param mesConfig
+     * @return
+     */
+    public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) {
+        DdlPackBean packBean = getAllBaseData(organizeCode);
+        if (StringUtils.isNotEmpty(mesConfig.getCfgCode())) {
+            DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesConfig.getCfgName())) {
+            DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean);
+        }
+        if (mesConfig.getIsValid() != null) {
+            DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean);
+        }
+        return packBean;
+    }
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java
index f3e3d85..c4fcecf 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java
@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -65,10 +66,12 @@ public class MesPlanOrder extends BaseBean {
     private Integer status;
 
     @Column(name="START_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam("计划开始时间")
     private String startTime;
 
     @Column(name="END_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam("计划结束时间")
     private String endTime;
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
index b3eaebc..973555a 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
@@ -147,23 +147,23 @@ public class MesWorkOrder extends BaseBean {
     public String prodCfgName;
 
     @Transient
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59")
     public String startTimeStart;
 
 
     @Transient
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="计划开始日期查询用，查询截至日期",example = "2018-12-31 23:59:59")
     public String startTimeEnd;
 
     @Transient
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="计划结束日期查询用，查询结束日期起始",example = "2018-12-31 23:59:59")
     public String endTimeStart;
 
     @Transient
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="计划结束日期查询用，查询结束日期截至",example = "2018-12-31 23:59:59")
     public String endTimeEnd;
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java
index bef0a34..0e0da69 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java
@@ -26,6 +26,9 @@ public class FastDfsDownloadModel {
     private String fileName;
 
     @ApiParam("文件字节")
-    private byte[] fileByte;
+    private String fileByte;
+
+    @ApiParam("文件url")
+    private String url;
 
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
index 02349f5..648be8b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@@ -75,7 +75,7 @@ public class MesHqlPack {
             DdlPreparedPack.getNumEqualPack(mesPlanOrder.getStatus(), "status", packBean);
         }
         if (StringUtils.isNotEmpty(mesPlanOrder.getCreateUser())) {
-            DdlPreparedPack.getStringEqualPack(mesPlanOrder.getCreateUser(), "createUser", packBean);
+            DdlPreparedPack.getStringLikerPack(mesPlanOrder.getCreateUser(), "createUser", packBean);
         }
 
         // 时间段查询
@@ -161,7 +161,7 @@ public class MesHqlPack {
             DdlPreparedPack.getStringEqualPack(mesWorkOrder.getProdCfgCode(), "prodCfgCode", packBean);
         }
         if (StringUtils.isNotEmpty(mesWorkOrder.getPlanOrderNo())) {
-            DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean);
+            DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean);
         }
         if (mesWorkOrder.getIsValid() != null) {
             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getIsValid(), "isValid", packBean);
@@ -345,7 +345,7 @@ public class MesHqlPack {
     public static DdlPackBean getMesShift(MesShift shift, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(shift, organizeCode);
         if (StringUtils.isNotEmpty(shift.getShiftCode())) {
-            DdlPreparedPack.getStringEqualPack(shift.getShiftCode(), "shiftCode", packBean);
+            DdlPreparedPack.getStringLikerPack(shift.getShiftCode(), "shiftCode", packBean);
         }
         if (StringUtils.isNotEmpty(shift.getShiftName())) {
             DdlPreparedPack.getStringLikerPack(shift.getShiftName(), "shiftName", packBean);
@@ -451,7 +451,7 @@ public class MesHqlPack {
             DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean);
         }
         if (StringUtils.isNotEmpty(mesESOP.getPartNo())) {
-            DdlPreparedPack.getStringEqualPack(mesESOP.getPartNo(), "partNo", packBean);
+            DdlPreparedPack.getStringLikerPack(mesESOP.getPartNo(), "partNo", packBean);
         }
 
         return packBean;
@@ -603,7 +603,7 @@ public class MesHqlPack {
     public static DdlPackBean getMesProcess(MesProcess process, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(process, organizeCode);
         if (StringUtils.isNotEmpty(process.getProcessCode())) {
-            DdlPreparedPack.getStringEqualPack(process.getProcessCode(), "processCode", packBean);
+            DdlPreparedPack.getStringLikerPack(process.getProcessCode(), "processCode", packBean);
         }
         if (StringUtils.isNotEmpty(process.getProcessName())) {
             DdlPreparedPack.getStringLikerPack(process.getProcessName(), "processName", packBean);
@@ -621,7 +621,7 @@ public class MesHqlPack {
     public static DdlPackBean getMesStep(MesStep step, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(step, organizeCode);
         if (StringUtils.isNotEmpty(step.getStepCode())) {
-            DdlPreparedPack.getStringEqualPack(step.getStepCode(), "stepCode", packBean);
+            DdlPreparedPack.getStringLikerPack(step.getStepCode(), "stepCode", packBean);
         }
         if (StringUtils.isNotEmpty(step.getStepName())) {
             DdlPreparedPack.getStringLikerPack(step.getStepName(), "stepName", packBean);
@@ -645,7 +645,7 @@ public class MesHqlPack {
             DdlPreparedPack.getStringEqualPack(stepParam.getStepCode(), "stepCode", packBean);
         }
         if (StringUtils.isNotEmpty(stepParam.getParamCode())) {
-            DdlPreparedPack.getStringEqualPack(stepParam.getParamCode(), "paramCode", packBean);
+            DdlPreparedPack.getStringLikerPack(stepParam.getParamCode(), "paramCode", packBean);
         }
         if (StringUtils.isNotEmpty(stepParam.getParamName())) {
             DdlPreparedPack.getStringLikerPack(stepParam.getParamName(), "paramName", packBean);
@@ -687,13 +687,13 @@ public class MesHqlPack {
     public static DdlPackBean getMesBom(MesBom bom, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(bom, organizeCode);
         if (StringUtils.isNotEmpty(bom.getPartNo())) {
-            DdlPreparedPack.getStringEqualPack(bom.getPartNo(), "partNo", packBean);
+            DdlPreparedPack.getStringLikerPack(bom.getPartNo(), "partNo", packBean);
         }
         if (StringUtils.isNotEmpty(bom.getItemPartNo())) {
-            DdlPreparedPack.getStringEqualPack(bom.getItemPartNo(), "itemPartNo", packBean);
+            DdlPreparedPack.getStringLikerPack(bom.getItemPartNo(), "itemPartNo", packBean);
         }
         if (StringUtils.isNotEmpty(bom.getBomVersion())) {
-            DdlPreparedPack.getStringEqualPack(bom.getBomVersion(), "bomVersion", packBean);
+            DdlPreparedPack.getStringLikerPack(bom.getBomVersion(), "bomVersion", packBean);
         }
 
         return packBean;
@@ -708,13 +708,13 @@ public class MesHqlPack {
     public static DdlPackBean getMesProcessBom(MesProcessBom processBom, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(processBom, organizeCode);
         if (StringUtils.isNotEmpty(processBom.getPartNo())) {
-            DdlPreparedPack.getStringEqualPack(processBom.getPartNo(), "partNo", packBean);
+            DdlPreparedPack.getStringLikerPack(processBom.getPartNo(), "partNo", packBean);
         }
         if (StringUtils.isNotEmpty(processBom.getItemPartNo())) {
-            DdlPreparedPack.getStringEqualPack(processBom.getItemPartNo(), "itemPartNo", packBean);
+            DdlPreparedPack.getStringLikerPack(processBom.getItemPartNo(), "itemPartNo", packBean);
         }
         if (StringUtils.isNotEmpty(processBom.getProcessCode())) {
-            DdlPreparedPack.getStringEqualPack(processBom.getProcessCode(), "processCode", packBean);
+            DdlPreparedPack.getStringLikerPack(processBom.getProcessCode(), "processCode", packBean);
         }
 
         return packBean;
@@ -729,7 +729,7 @@ public class MesHqlPack {
     public static DdlPackBean getMesCustomer(MesCustomer customer, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(customer, organizeCode);
         if (StringUtils.isNotEmpty(customer.getCustomerCode())) {
-            DdlPreparedPack.getStringEqualPack(customer.getCustomerCode(), "customerCode", packBean);
+            DdlPreparedPack.getStringLikerPack(customer.getCustomerCode(), "customerCode", packBean);
         }
         if (StringUtils.isNotEmpty(customer.getCustomerName())) {
             DdlPreparedPack.getStringLikerPack(customer.getCustomerName(), "customerName", packBean);
@@ -747,7 +747,7 @@ public class MesHqlPack {
     public static DdlPackBean getMesCustProdLine(MesCustProdLine custProdLine, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(custProdLine, organizeCode);
         if (StringUtils.isNotEmpty(custProdLine.getCustProdLineCode())) {
-            DdlPreparedPack.getStringEqualPack(custProdLine.getCustProdLineCode(), "custProdLineCode", packBean);
+            DdlPreparedPack.getStringLikerPack(custProdLine.getCustProdLineCode(), "custProdLineCode", packBean);
         }
         if (StringUtils.isNotEmpty(custProdLine.getCustProdLineName())) {
             DdlPreparedPack.getStringLikerPack(custProdLine.getCustProdLineName(), "custProdLineName", packBean);
@@ -768,10 +768,10 @@ public class MesHqlPack {
             DdlPreparedPack.getStringEqualPack(customerPart.getCustomerCode(), "customerCode", packBean);
         }
         if (StringUtils.isNotEmpty(customerPart.getPartNo())) {
-            DdlPreparedPack.getStringEqualPack(customerPart.getPartNo(), "partNo", packBean);
+            DdlPreparedPack.getStringLikerPack(customerPart.getPartNo(), "partNo", packBean);
         }
         if (StringUtils.isNotEmpty(customerPart.getCustomerPartNo())) {
-            DdlPreparedPack.getStringEqualPack(customerPart.getCustomerPartNo(), "customerPartNo", packBean);
+            DdlPreparedPack.getStringLikerPack(customerPart.getCustomerPartNo(), "customerPartNo", packBean);
         }
 
         return packBean;
@@ -786,10 +786,10 @@ public class MesHqlPack {
     public static DdlPackBean getMesKeyData(MesKeyData keyData, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(keyData, organizeCode);
         if (StringUtils.isNotEmpty(keyData.getKeyDataCode())) {
-            DdlPreparedPack.getStringEqualPack(keyData.getKeyDataCode(), "keyDataCode", packBean);
+            DdlPreparedPack.getStringLikerPack(keyData.getKeyDataCode(), "keyDataCode", packBean);
         }
         if (StringUtils.isNotEmpty(keyData.getKeyDataName())) {
-            DdlPreparedPack.getStringEqualPack(keyData.getKeyDataName(), "keyDataName", packBean);
+            DdlPreparedPack.getStringLikerPack(keyData.getKeyDataName(), "keyDataName", packBean);
         }
 
         return packBean;
@@ -804,10 +804,10 @@ public class MesHqlPack {
     public static DdlPackBean getMesKpData(MesKpData kpData, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(kpData, organizeCode);
         if (StringUtils.isNotEmpty(kpData.getPartNo())) {
-            DdlPreparedPack.getStringEqualPack(kpData.getKeyDataCode(), "partNo", packBean);
+            DdlPreparedPack.getStringLikerPack(kpData.getKeyDataCode(), "partNo", packBean);
         }
         if (StringUtils.isNotEmpty(kpData.getKeyDataCode())) {
-            DdlPreparedPack.getStringEqualPack(kpData.getKeyDataCode(), "keyDataCode", packBean);
+            DdlPreparedPack.getStringLikerPack(kpData.getKeyDataCode(), "keyDataCode", packBean);
         }
 
         return packBean;
@@ -822,10 +822,10 @@ public class MesHqlPack {
     public static DdlPackBean getMesProdCfgType(MesProdCfgType prodCfgType, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfgType, organizeCode);
         if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeCode())) {
-            DdlPreparedPack.getStringEqualPack(prodCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
+            DdlPreparedPack.getStringLikerPack(prodCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
         }
         if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeName())) {
-            DdlPreparedPack.getStringEqualPack(prodCfgType.getProdCfgTypeName(), "prodCfgTypeName", packBean);
+            DdlPreparedPack.getStringLikerPack(prodCfgType.getProdCfgTypeName(), "prodCfgTypeName", packBean);
         }
 
         return packBean;
@@ -840,7 +840,7 @@ public class MesHqlPack {
     public static DdlPackBean getMesProdCfg(MesProdCfg prodCfg, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfg, organizeCode);
         if (StringUtils.isNotEmpty(prodCfg.getProdCfgCode())) {
-            DdlPreparedPack.getStringEqualPack(prodCfg.getProdCfgCode(), "prodCfgCode", packBean);
+            DdlPreparedPack.getStringLikerPack(prodCfg.getProdCfgCode(), "prodCfgCode", packBean);
         }
         if (StringUtils.isNotEmpty(prodCfg.getProdCfgName())) {
             DdlPreparedPack.getStringLikerPack(prodCfg.getProdCfgName(), "prodCfgName", packBean);
@@ -864,7 +864,7 @@ public class MesHqlPack {
             DdlPreparedPack.getStringEqualPack(prodCfgDetail.getProdCfgCode(), "prodCfgCode", packBean);
         }
         if (StringUtils.isNotEmpty(prodCfgDetail.getPartNo())) {
-            DdlPreparedPack.getStringEqualPack(prodCfgDetail.getPartNo(), "partNo", packBean);
+            DdlPreparedPack.getStringLikerPack(prodCfgDetail.getPartNo(), "partNo", packBean);
         }
 
         return packBean;
@@ -879,7 +879,7 @@ public class MesHqlPack {
     public static DdlPackBean getMesPart(MesPart part, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(part, organizeCode);
         if (StringUtils.isNotEmpty(part.getPartNo())) {
-            DdlPreparedPack.getStringEqualPack(part.getPartNo(), "partNo", packBean);
+            DdlPreparedPack.getStringLikerPack(part.getPartNo(), "partNo", packBean);
         }
         if (StringUtils.isNotEmpty(part.getPartName())) {
             DdlPreparedPack.getStringLikerPack(part.getPartName(), "partName", packBean);
@@ -906,7 +906,7 @@ public class MesHqlPack {
     public static DdlPackBean getMesPartCategory(MesPartCategory partCategory, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(partCategory, organizeCode);
         if (StringUtils.isNotEmpty(partCategory.getCategoryCode())) {
-            DdlPreparedPack.getStringEqualPack(partCategory.getCategoryCode(), "categoryCode", packBean);
+            DdlPreparedPack.getStringLikerPack(partCategory.getCategoryCode(), "categoryCode", packBean);
         }
         if (StringUtils.isNotEmpty(partCategory.getCategoryName())) {
             DdlPreparedPack.getStringLikerPack(partCategory.getCategoryName(), "categoryName", packBean);
@@ -924,7 +924,7 @@ public class MesHqlPack {
     public static DdlPackBean getMesPackSpec(MesPackSpec packSpec, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(packSpec, organizeCode);
         if (StringUtils.isNotEmpty(packSpec.getSpecCode())) {
-            DdlPreparedPack.getStringEqualPack(packSpec.getSpecCode(), "specCode", packBean);
+            DdlPreparedPack.getStringLikerPack(packSpec.getSpecCode(), "specCode", packBean);
         }
         if (StringUtils.isNotEmpty(packSpec.getSpecName())) {
             DdlPreparedPack.getStringLikerPack(packSpec.getSpecName(), "specName", packBean);
@@ -945,7 +945,7 @@ public class MesHqlPack {
     public static DdlPackBean getMesProduceCategory(MesProduceCategory produceCategory, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(produceCategory, organizeCode);
         if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryCode())) {
-            DdlPreparedPack.getStringEqualPack(produceCategory.getProduceCategoryCode(), "produceCategoryCode", packBean);
+            DdlPreparedPack.getStringLikerPack(produceCategory.getProduceCategoryCode(), "produceCategoryCode", packBean);
         }
         if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryName())) {
             DdlPreparedPack.getStringLikerPack(produceCategory.getProduceCategoryName(), "produceCategoryName", packBean);
@@ -963,7 +963,7 @@ public class MesHqlPack {
     public static DdlPackBean getMesKpsnRule(MesKpsnRule kpsnRule, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(kpsnRule, organizeCode);
         if (StringUtils.isNotEmpty(kpsnRule.getPartNo())) {
-            DdlPreparedPack.getStringEqualPack(kpsnRule.getPartNo(), "partNo", packBean);
+            DdlPreparedPack.getStringLikerPack(kpsnRule.getPartNo(), "partNo", packBean);
         }
 
         return packBean;
@@ -978,7 +978,7 @@ public class MesHqlPack {
     public static DdlPackBean getMesPartScheduleBom(MesPartScheduleBom partScheduleBom, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(partScheduleBom, organizeCode);
         if (StringUtils.isNotEmpty(partScheduleBom.getPartNo())) {
-            DdlPreparedPack.getStringEqualPack(partScheduleBom.getPartNo(), "partNo", packBean);
+            DdlPreparedPack.getStringLikerPack(partScheduleBom.getPartNo(), "partNo", packBean);
         }
         if (StringUtils.isNotEmpty(partScheduleBom.getItemPartNo())) {
             DdlPreparedPack.getStringLikerPack(partScheduleBom.getItemPartNo(), "itemPartNo", packBean);
@@ -996,10 +996,10 @@ public class MesHqlPack {
     public static DdlPackBean getMesObjectDao(MesObjectDao objectDao, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(objectDao, organizeCode);
         if (StringUtils.isNotEmpty(objectDao.getObjectCode())) {
-            DdlPreparedPack.getStringEqualPack(objectDao.getObjectCode(), "objectCode", packBean);
+            DdlPreparedPack.getStringLikerPack(objectDao.getObjectCode(), "objectCode", packBean);
         }
         if (StringUtils.isNotEmpty(objectDao.getDaoClass())) {
-            DdlPreparedPack.getStringEqualPack(objectDao.getDaoClass(), "daoClass", packBean);
+            DdlPreparedPack.getStringLikerPack(objectDao.getDaoClass(), "daoClass", packBean);
         }
 
         return packBean;
@@ -1014,10 +1014,10 @@ public class MesHqlPack {
     public static DdlPackBean getMesPcnSyncCfg(MesPcnSyncCfg pcnSyncCfg, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(pcnSyncCfg, organizeCode);
         if (StringUtils.isNotEmpty(pcnSyncCfg.getObjectCode())) {
-            DdlPreparedPack.getStringEqualPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean);
+            DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean);
         }
         if (StringUtils.isNotEmpty(pcnSyncCfg.getPcnCode())) {
-            DdlPreparedPack.getStringEqualPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean);
+            DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean);
         }
         if (null != pcnSyncCfg.getSyncType()) {
             DdlPreparedPack.getNumEqualPack(pcnSyncCfg.getSyncType(), "syncType", packBean);
@@ -1035,10 +1035,10 @@ public class MesHqlPack {
     public static DdlPackBean getMesWorkCellParamCfg(MesWorkCellParamCfg workCellParamCfg, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(workCellParamCfg, organizeCode);
         if (StringUtils.isNotEmpty(workCellParamCfg.getWorkCellCode())) {
-            DdlPreparedPack.getStringEqualPack(workCellParamCfg.getWorkCellCode(), "workCellCode", packBean);
+            DdlPreparedPack.getStringLikerPack(workCellParamCfg.getWorkCellCode(), "workCellCode", packBean);
         }
         if (StringUtils.isNotEmpty(workCellParamCfg.getParamCode())) {
-            DdlPreparedPack.getStringEqualPack(workCellParamCfg.getParamCode(), "paramCode", packBean);
+            DdlPreparedPack.getStringLikerPack(workCellParamCfg.getParamCode(), "paramCode", packBean);
         }
 
         return packBean;
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java
index 7d034c6..e1ede6a 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java
@@ -18,7 +18,6 @@ public class WmsTaskInfoModel implements Serializable {
     private static final long serialVersionUID = 8755413052807531167L;
     @ApiParam("任务单号")
     public String orderNo;
-    @Column(name = "TRANS_TYPE_CODE")
     /**
      * 状态:1=创建,10=待处理,20=已处理
      */
@@ -28,6 +27,7 @@ public class WmsTaskInfoModel implements Serializable {
     @ApiParam("作业类型名称")
     public String opTypeName;
 
+    @Column(name = "TRANS_TYPE_CODE")
     @ApiParam(value = "交易类型代码")
     private String transTypeCode;
 
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
index ee10f50..9c929a5 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
@@ -116,6 +116,13 @@ public class WmsCSOrderDetails extends BaseBean {
     @ApiParam("源单位")
     public String srcUnit;
 
+    /**
+     * 差异类型：10：盘平，20：盘亏，30盘赢
+     */
+    @Transient
+    @ApiParam("差异类型")
+    public Integer differenceType;
+
     public Double getQty() {
         return this.qty == null ? 0 : this.qty;
     }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
index 3c493d7..d3a23e6 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
@@ -145,6 +145,10 @@ public class WmsMoveDetails extends BaseBean {
     @ApiParam("交易类型名称")
     private String transTypeName;
 
+    @Transient
+    @ApiParam("业务类型编码")
+    private Integer busiTypeCode;
+
     public WmsMoveDetails(){}
 
     public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){
@@ -173,7 +177,7 @@ public class WmsMoveDetails extends BaseBean {
     public WmsMoveDetails(String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,String transTypeCode
             ,String transTypeName,Integer itemStatus,String unit,String srcWhNo,String destWhNo,
                           String srcZoneNo,String destZoneNo,String srcLocateNo, String destLocateNo,
-                          Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo){
+                          Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo,Integer busiTypeCode){
         this.organizeCode = organizeCode;
         this.partNo = partNo;
         this.orderNo = orderNo;
@@ -194,6 +198,6 @@ public class WmsMoveDetails extends BaseBean {
         this.refSrc = refSrc;
         this.vendorNo = vendorNo;
         this.custNo = custNo;
-
+        this.busiTypeCode = busiTypeCode;
     }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
index f8d9e0e..7453a8c 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
@@ -155,7 +155,7 @@ public class WmsMoveSn extends BaseBean {
 
     @Transient
     @ApiParam("业务类型编码")
-    private String busiTypeCode;
+    private Integer busiTypeCode;
 
 
     @Transient
@@ -194,7 +194,7 @@ public class WmsMoveSn extends BaseBean {
         return finishedCounts == null ? 0L : this.finishedCounts;
     }
 
-    public WmsMoveSn(String partNo, String partNameRdd, Double destQty,String busiTypeCode,  String transTypeCode, String refSrc) {
+    public WmsMoveSn(String partNo, String partNameRdd, Double destQty,Integer busiTypeCode,  String transTypeCode, String refSrc) {
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
         this.destQty = destQty;
@@ -211,7 +211,7 @@ public class WmsMoveSn extends BaseBean {
     }
     public  WmsMoveSn( String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,
             String transTypeCode,String transTypeName,Integer itemStatus,String unit, String srcLocateNo,String destLocateNo,Double srcQty,Double destQty,Integer srcQcStatus,Integer descQcStatus,Integer srcSnStatus,
-            Integer destSnStatus, String lotNo,String dateCode,String refSrc,String destZoneNo,String destWhNo){
+            Integer destSnStatus, String lotNo,String dateCode,String refSrc,String destZoneNo,String destWhNo,Integer busiTypeCode){
             this.organizeCode=organizeCode;
             this.orderNo=orderNo;
             this.item=item;
@@ -235,6 +235,6 @@ public class WmsMoveSn extends BaseBean {
             this.refSrc = refSrc;
             this.destZoneNo = destZoneNo;
             this.destWhNo =destWhNo;
-
+            this.busiTypeCode = busiTypeCode;
 }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingMovement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingMovement.java
index 2b345d4..3cc6419 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingMovement.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingMovement.java
@@ -47,4 +47,14 @@ public class WmsPickingMovement extends BaseBean {
     @ApiParam(value = "工厂")
     @AnnoOutputColumn
     private String factory;
+
+    @ApiParam(value = "计划日期")
+    @AnnoOutputColumn
+    private String planDate;
+
+    @ApiParam(value = "计划时间")
+    @AnnoOutputColumn
+    private String planTime;
+
+
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java
index e33b3b1..a01642f 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java
@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.util.List;
 
 /**
@@ -26,7 +23,10 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_TASK")
+@Table(name = "WMS_TASK",indexes = {
+        @Index(columnList = "TASK_STATUS"),
+        @Index(columnList = "TRANS_TYPE_CODE")
+})
 @Api("作业任务表")
 public class WmsTaskInfo extends BaseBean {
 
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index b5e6fe6..4dffc39 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -40,10 +40,13 @@ public class WmsHqlPack {
             DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
         }
 
-        // 封装有效状态和删除状态
+        // 封装有效状态、删除状态、创建人和创建时间
         DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
 
+        DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", hqlStr);
+        DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd(),"createDatetime",hqlStr,true);
+
         return hqlStr;
     }
 
@@ -124,9 +127,6 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestZoneNo(), "destZoneNo", result);
         DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestLocateNo(), "destLocateNo", result);
-        DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getCreateUser(), "createUser", result);
-        DdlPreparedPack.timeBuilder(wmsDocMovementDetails.getCreateDateTimeStart(),
-                wmsDocMovementDetails.getCreateDateTimeEnd(), "createDatetime", result, true);
         getStringBuilderPack(wmsDocMovementDetails, result);
 
         return result;
@@ -165,7 +165,6 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean);
         DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean);
         DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean);
-        DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getCreateUser(),"createUser",packBean);
 
         getStringBuilderPack(wmsDocMovementMaster, packBean);
 
@@ -206,8 +205,6 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
-        DdlPreparedPack.getStringLikerPack(wmsPOMaster.getCreateUser(), "createUser", result);
-        DdlPreparedPack.timeBuilder(wmsPOMaster.getCreateDateTimeStart(),wmsPOMaster.getCreateDateTimeEnd(),"createDatetime",result,true);
         getStringBuilderPack(wmsPOMaster, result);
 
         return result;
@@ -592,8 +589,6 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result);
         DdlPreparedPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result);
         DdlPreparedPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result);
-        DdlPreparedPack.getStringLikerPack(wmsASNMaster.getCreateUser(), "createUser", result);
-        DdlPreparedPack.timeBuilder(wmsASNMaster.getCreateDateTimeStart(),wmsASNMaster.getCreateDateTimeEnd(),"createDatetime",result,true);
 
         getStringBuilderPack(wmsASNMaster, result);
 
@@ -623,9 +618,6 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsShipping.getShippingFlag(), "shippingFlag", result);
         //单据来源
         DdlPreparedPack.getStringEqualPack(wmsShipping.getSrc(), "src", result);
-
-        DdlPreparedPack.getStringLikerPack(wmsShipping.getCreateUser(), "createUser", result);
-        DdlPreparedPack.timeBuilder(wmsShipping.getCreateDateTimeStart(),wmsShipping.getCreateDateTimeEnd(),"createDatetime",result,true);
         getStringBuilderPack(wmsShipping, result);
         getStringBuilderPack(wmsShipping, result);
 
@@ -713,8 +705,6 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(wmsFGInStock.getCustNo(), "custNo", result);
         DdlPreparedPack.getStringEqualPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result);
         DdlPreparedPack.getStringEqualPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result);
-        DdlPreparedPack.getStringLikerPack(wmsFGInStock.getCreateUser(), "createUser", result);
-        DdlPreparedPack.timeBuilder(wmsFGInStock.getCreateDateTimeStart(),wmsFGInStock.getCreateDateTimeEnd(),"createDatetime",result,true);
 
         getStringBuilderPack(wmsFGInStock, result);
 
@@ -912,7 +902,6 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result);
         DdlPreparedPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringEqualPack(wmsStockQuan.getCustNo(), "custNo", result);
-
         getStringBuilderPack(wmsStockQuan, result);
 
         return result;
@@ -1059,11 +1048,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result);
         DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result);
         DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getBusiTypeCode(), "busiTypeCode", result);
-        DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getCreateUser(), "createUser", result);
         DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getModifyUser(), "modifyUser", result);
-
-        DdlPreparedPack.timeBuilder(wmsMoveMaster.getCreateDateTimeStart(),
-                wmsMoveMaster.getCreateDateTimeEnd(), "createDatetime", result, true);
         DdlPreparedPack.timeBuilder(wmsMoveMaster.getModifyDateTimeStart(),
                 wmsMoveMaster.getModifyDateTimeEnd(), "modifyDatetime", result, true);
         getStringBuilderPack(wmsMoveMaster, result);
@@ -1300,7 +1285,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getOrderType(), "orderType", result);
         DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getOrderStatus(), "orderStatus", result);
         DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getIsPart(), "isPart", result);
-
+        DdlPreparedPack.timeBuilder(wmsCSOrderMaster.getCreateDateTimeStart(),
+                wmsCSOrderMaster.getCreateDateTimeEnd(), "createDatetime", result, true);
         getStringBuilderPack(wmsCSOrderMaster, result);
 
         return result;
@@ -2078,8 +2064,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(wmsCSRange.getLocateNo(), "locateNo", result);
         DdlPreparedPack.getStringLikerPack(wmsCSRange.getZoneNo(), "zoneNo", result);
 
-        DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"item"}, result);
-
+        DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{
+                DdlPreparedPack.getOrderColConvertType("item",CommonEnumUtil.BASIS_TYPE.INT.getValue())}, result);
         getStringBuilderPack(wmsCSRange, result);
 
         return result;