Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.andon.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -47,6 +48,7 @@ public class AndonManageQueue extends BaseBean {
 
     @Column(name = "ALARM_CODE")
     @ApiParam(value = "安灯类型")
+    @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "code",value = "description")
     private String alarmCode;
 
     @Column(name = "ACTION_CODE")

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

@@ -770,6 +770,7 @@ public class MesEnumUtil {
         STEP_LIST("stepList", "工步列表"),
         STEP_CONTENT("stepContent", "工步内容"),
         MODULE_CONTENT("moduleContent", "组件内容"),
+        CUSTOM_COMPONENT("customComponent", "定制内容"),
         TASK_COMPLETE("taskComplete", "整个扫描完成");
 
         private String value;
@@ -807,6 +808,7 @@ public class MesEnumUtil {
         TABLE("table", "表格"),
         TEXT("text", "正常文本"),
         EXP_TEXT("exp_text", "异常文本"),
+        FILE("file", "定制内容文件"),
         IMAGE("image", "图片"),
         BUTTON("button", "按钮");
 
@@ -881,15 +883,17 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STEP_PARAM_TYPE {
 
-        QUALIFIED(10, "数字"),
+        QUALIFIED(10,"number", "数字"),
-        DEFECTED(20, "字符串"),
+        DEFECTED(20, "text","字符串"),
-        SCRAPED(30, "可选值");
+        SCRAPED(30,"select", "可选值");
 
         private int value;
+        private String code;
         private String description;
 
-        STEP_PARAM_TYPE(int value, String description) {
+        STEP_PARAM_TYPE(int value,String code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
@@ -897,6 +901,8 @@ public class MesEnumUtil {
             return value;
         }
 
+        public String getCode(){return code;}
+
         public String getDescription() {
             return description;
         }

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.base.enumutil;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.StringUtils;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -227,6 +228,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
     /**
@@ -513,6 +518,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
     /**
@@ -588,13 +597,7 @@ public class WmsEnumUtil {
         }
 
         public static String valueOfDescription(int val) {
-            String tmp = null;
+            return valueOf(val);
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
         }
     }
 
@@ -774,7 +777,7 @@ public class WmsEnumUtil {
                 return null;
             } else {
                 for (int i = 0; i < values().length; i++) {
-                    if (values()[i].value == value) {
+                    if (StringUtils.equalsIgnoreCase(values()[i].value,value)) {
                         return values()[i];
                     }
                 }
@@ -870,6 +873,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
 
@@ -914,13 +921,7 @@ public class WmsEnumUtil {
         }
 
         public static String valueOfDescription(int val) {
-            String tmp = null;
+            return valueOf(val);
-            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) {
@@ -974,13 +975,7 @@ public class WmsEnumUtil {
         }
 
         public static String valueOfDescription(int val) {
-            String tmp = null;
+            return valueOf(val);
-            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) {
@@ -1042,6 +1037,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
     /**
@@ -1087,6 +1086,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
     /**
@@ -1125,6 +1128,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
     /**
@@ -1198,13 +1205,7 @@ public class WmsEnumUtil {
         }
 
         public static String valueOfDescription(int val) {
-            String tmp = null;
+            return valueOf(val);
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
         }
     }
 
@@ -1280,6 +1281,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
     /**
@@ -1565,6 +1570,7 @@ public class WmsEnumUtil {
         public String getDescription() {
             return description;
         }
+
     }
 
     /**
@@ -2699,6 +2705,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
 
@@ -2984,6 +2994,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
     /**
@@ -3088,6 +3102,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
     /**
@@ -3306,6 +3324,10 @@ public class WmsEnumUtil {
             return tmp;
         }
 
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
         public static int descOf(String desc) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {

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

@@ -54,6 +54,29 @@ public class DdlPreparedPack {
     /**
      * 封装日期
      *
+     * @param startDate      开始日期
+     * @param endDate        结束日期
+     * @param columnName     列名
+     * @param isLeftContain  左闭？
+     * @param isRightContain 右闭？
+     * @param packBean       HQL对象
+     */
+    public static void timeBuilder(String startDate, String endDate, String columnName, boolean isLeftContain, boolean isRightContain, DdlPackBean packBean) {
+        if (isLeftContain) {
+            packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, startDate.trim());
+        } else {
+            packBean.addColumnQuery(columnName, " and model." + columnName + " > :m_" + columnName, startDate.trim());
+        }
+        if (isRightContain) {
+            packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, endDate.trim());
+        } else {
+            packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " < :m_s_" + columnName, endDate.trim());
+        }
+    }
+
+    /**
+     * 封装日期
+     *
      * @param date       开始日期和结束日期，以逗号分隔（分为开始时间和结束时间）
      * @param columnName HQL里对应的时间字段
      * @param packBean   封装的HQL
@@ -348,6 +371,18 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装String对象成大于不等于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getStringBiggerNotEqualPack(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null && !StringUtils.isEmpty(String.valueOf(data))) {
+            packBean.addColumnQuery(columnName, " and model." + columnName + " > :m_" + columnName, data);
+        }
+    }
+
+    /**
      * 封装String对象成小于语句
      *
      * @param columnName 列名
@@ -416,7 +451,7 @@ public class DdlPreparedPack {
      * @param packBean
      */
     public static void getOrInPack(String data, String columnName, DdlPackBean packBean) {
-        if (data != null && data.trim().length() > 0) {
+        if (data != null) {
             packBean.addColumnQuery(columnName," or model." + columnName + " in (:m_" + columnName + ")", data);
         }
     }
@@ -506,8 +541,8 @@ public class DdlPreparedPack {
      * @param columnName
      * @param packBean
      */
-    public static void getNotInPack(String data, String columnName, DdlPackBean packBean) {
+    public static void getNotInPack(Object data, String columnName, DdlPackBean packBean) {
-        if (data != null && data.trim().length() > 0) {
+        if (data != null) {
             packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data);
         }
     }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java

@@ -41,7 +41,7 @@ public class MesPcn extends BaseBean {
 
     @Column(name="WORK_CENTER_CODE")
     @ApiParam("工作中心")
-    private String workCentreCode;
+    private String workCenterCode;
 
     @Column(name="PCN_VERSION")
     @ApiParam("PCN版本")

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java

@@ -53,11 +53,11 @@ public class MesPcnSyncCfg extends BaseBean {
     @ApiParam(value ="同步时间")
     private String syncTime;
 
-    @Column(name="SYNC_PATTERN")//2、新增  1、修改
+    @Column(name="SYNC_PATTERN")//2.新增  1.修改
     @ApiParam("同步方式")
     private Integer syncPattern;
 
-    @Column(name="SYNC_TYPE")//1\pcn获取mes数据   2、pcn推送数据至mes
+    @Column(name="SYNC_TYPE")//1.pcn获取mes数据   2.pcn推送数据至mes
     @ApiParam("同步类型")
     private Integer syncType;
 
@@ -66,6 +66,10 @@ public class MesPcnSyncCfg extends BaseBean {
     @ApiParam(value ="上一同步时间")
     private String lastSyncTime;
 
+    @Column(name="EXTRACT_GAP")
+    @ApiParam(value="从数据库抽取的最大值 目前为分钟为限制")
+    private Integer extractGap;
+
     public int getSyncFrequencyVal() {
         return this.syncFrequency == null ? 0 : this.syncFrequency;
     }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java

@@ -37,6 +37,10 @@ public class MesPcnSysUserOffline extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long userId;
 
+    @Column(name = "USER_CODE")
+    @ApiParam(value = "用户编号", access = "用户编号")
+    private String userCode;
+
     @Column(name = "USER_NAME")
     @ApiParam(value = "用户名称", access = "账号名称")
     private String userName;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java

@@ -81,6 +81,10 @@ public class MesPcnTask extends BaseBean {
     @ApiParam("任务状态")
     private Integer taskStatus;
 
+    @Column(name="TASK_PARAM")
+    @ApiParam("任务参数")
+    private String taskParam;
+
     public int getTaskTypeVal() {
         return this.taskType == null ? 0 : this.taskType;
     }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.beans.Transient;
 import java.util.List;
 
 /**
@@ -19,4 +20,22 @@ import java.util.List;
 public class StepPrintSnModel extends MesProduceSn {
     @ApiParam("打印描述")
     private String printDesc;
+
+    @ApiParam("条码")
+    private String barCode;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("批次号")
+    private String batchNo;
+
+    @ApiParam("客户物料号")
+    private String boxQty;
+
+    @ApiParam("订单号")
+    private String orderNo;
+
+    @ApiParam("生产日期")
+    private String productionTime;
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java

@@ -4,6 +4,7 @@ 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 cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate;
 import org.apache.commons.lang3.StringUtils;
 
 /**
@@ -48,4 +49,18 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 根据打印模板的模板代码查询模板信息
+     * @param organizeCode
+     * @param mesLabelTemplate
+     * @return
+     */
+    public static DdlPackBean getLabelTemplate(String organizeCode, MesLabelTemplate mesLabelTemplate) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean();
+        DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean);
+        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
+        return packBean;
+    }
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java

@@ -83,4 +83,8 @@ public class MesESOP extends BaseBean {
     @ApiParam("FILE_TYPE_NAME")
     private String fileTypeName;
 
+    @Column(name="SYNC_TAG")
+    @ApiParam("SYNC_TAG")
+    private Integer syncTag=0;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java

@@ -41,7 +41,7 @@ public class MesPcn extends BaseBean {
 
     @Column(name="WORK_CENTER_CODE")
     @ApiParam("工作中心")
-    private String workCentreCode;
+    private String workCenterCode;
 
     @Column(name="PCN_VERSION")
     @ApiParam("PCN版本")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java

@@ -66,6 +66,11 @@ public class MesPcnSyncCfg extends BaseBean {
     @ApiParam(value ="上一同步时间")
     private String lastSyncTime;
 
+
+    @Column(name="EXTRACT_GAP")
+    @ApiParam(value="从数据库抽取的最大值 目前为分钟为限制")
+    private Integer extractGap;
+
     public int getSyncFrequencyVal() {
         return this.syncFrequency == null ? 0 : this.syncFrequency;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java

@@ -81,6 +81,10 @@ public class MesPcnTask extends BaseBean {
     @ApiParam("任务状态")
     private Integer taskStatus;
 
+    @Column(name="TASK_PARAM")
+    @ApiParam("任务参数")
+    private String taskParam;
+
     public int getTaskTypeVal() {
         return this.taskType == null ? 0 : this.taskType;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesActionMethodModel.java

@@ -31,6 +31,9 @@ public class MesActionMethodModel implements Serializable {
     @ApiParam("函数代码")
     private String methodCode;
 
+    @ApiParam("函数代码")
+    private String methodName;
+
     @ApiParam("序号")
     private Integer seq;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -265,13 +265,8 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode);
-        if (StringUtils.isNotEmpty(mesWorkCenter.getWorkCenterCode())) {
+        DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
-            DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean);
-        }
-        if (StringUtils.isNotEmpty(mesWorkCenter.getAreaCode())) {
-            DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean);
-        }
-
         return packBean;
     }
 
@@ -513,6 +508,7 @@ public class MesHqlPack {
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
         return packBean;
     }
+
     public static DdlPackBean getMesEventByEventName(MesEvent mesEvent) {
         DdlPackBean packBean = getAllBaseData(mesEvent.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(mesEvent.getEventName(), "eventName", packBean);
@@ -525,6 +521,7 @@ public class MesHqlPack {
         DdlPreparedPack.getStringEqualPack(mesAction.getActionCode(), "actionCode", packBean);
         return packBean;
     }
+
     public static DdlPackBean getMesActionByActionName(MesAction mesAction, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, organizeCode);
         DdlPreparedPack.getStringEqualPack(mesAction.getActionName(), "actionName", packBean);
@@ -557,7 +554,6 @@ public class MesHqlPack {
      * 函数分页获取封装
      *
      * @param mesMethod
-     * @param organizeCode
      * @return
      */
     public static DdlPackBean getMesMethod(MesMethod mesMethod) {
@@ -574,6 +570,7 @@ public class MesHqlPack {
         DdlPreparedPack.getStringEqualPack(mesMethod.getMethodCode(), "methodCode", packBean);
         return packBean;
     }
+
     public static DdlPackBean getMesMethodByMethodName(MesMethod mesMethod) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesMethod, mesMethod.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(mesMethod.getMethodName(), "methodName", packBean);
@@ -1173,6 +1170,7 @@ public class MesHqlPack {
 
     /**
      * 条码生成规则校验同一机构下条码规则唯一性
+     *
      * @param numberRule
      * @param id
      * @param organizeCode

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

@@ -77,6 +77,14 @@ public class BasVendor extends BaseBean{
     @ApiParam("手机")
     private String vendorPhone;
 
+    @Column(name = "KILOBIT")
+    @ApiParam("千位符号")
+    private String kilobit;
+
+    @Column(name = "DECIMALS")
+    @ApiParam("小数位符号")
+    private String decimals;
+
     public BasVendor() {
     }
 

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -78,6 +80,7 @@ public class WmsCSFactTrans extends BaseBean {
      */
     @Column(name="ITEM_STATUS")
     @ApiParam(value = "状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
     public Integer itemStatus;
 
     @Column(name="REMARK")
@@ -112,6 +115,10 @@ public class WmsCSFactTrans extends BaseBean {
     @ApiParam(value = "物料数量", example = "1")
     public Double sumPartQty;
 
+    @Transient
+    @ApiParam("存储区编号")
+    public String[] zoneNos;
+
     public WmsCSFactTrans(){}
 
     public Integer getIsScopeVal() {

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -78,6 +80,7 @@ public class WmsCSOrderDetails extends BaseBean {
      */
     @Column(name = "QC_STATUS")
     @ApiParam(value = "质检状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description")
     public Integer qcStatus;
 
     /**
@@ -87,6 +90,7 @@ public class WmsCSOrderDetails extends BaseBean {
      */
     @Column(name = "SN_STATUS")
     @ApiParam(value = "条码状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
     public Integer snStatus;
 
     /**
@@ -94,6 +98,7 @@ public class WmsCSOrderDetails extends BaseBean {
      */
     @Column(name = "TRANS_STATUS")
     @ApiParam(value = "处理状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.CS_TRANS_STATUS.class,refForeignKey = "value",value = "description")
     public Integer transStatus;
 
     @Transient
@@ -116,11 +121,16 @@ public class WmsCSOrderDetails extends BaseBean {
     @ApiParam("源单位")
     public String srcUnit;
 
+    @Transient
+    @ApiParam("存储区编号")
+    public String[] zoneNos;
+
     /**
      * 差异类型：10：盘平，20：盘亏，30盘赢
      */
     @Transient
     @ApiParam("差异类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class,refForeignKey = "value",value = "description")
     public Integer differenceType;
 
     public Double getQty() {

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -41,10 +43,12 @@ public class WmsCSOrderMaster extends BaseBean {
      */
     @Column(name = "ORDER_TYPE")
     @ApiParam(value = "单据类型", example = "10")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_TYPE.class,refForeignKey = "value",value = "description")
     public Integer orderType;
 
     @Column(name = "ORDER_STATUS")
     @ApiParam(value = "状态 (10-创建 20-开启盘点  30-盘点中  40-盘点完成  50-已解冻 60-已关闭)", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_STATUS.class,refForeignKey = "value",value = "description")
     public Integer orderStatus;
 
     @Column(name = "ACTION_PERSENT")
@@ -57,14 +61,17 @@ public class WmsCSOrderMaster extends BaseBean {
 
     @Column(name = "IS_INVENTORY")
     @ApiParam(value = "是否允许清点", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     public Integer isInventory;
 
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生产任务", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description")
     public Integer isTask;
 
     @Column(name = "IS_PART")
     @ApiParam(value = "是否散件")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     public Integer isPart;
 
     @Column(name = "YEAR")
@@ -73,6 +80,7 @@ public class WmsCSOrderMaster extends BaseBean {
 
     @Column(name = "IS_SYNC_ERP")
     @ApiParam("是否同步ERP: 1=已同步，2=未同步")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_ERP_SYNC_FLAG.class,refForeignKey = "value",value = "description")
     public Integer isSyncErp;
 
     @Transient

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.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 : 盘点范围信息
@@ -57,6 +58,10 @@ public class WmsCSRange extends BaseBean {
     @ApiParam("单位")
     public String unit;
 
+    @Transient
+    @ApiParam("存储区编号")
+    public String[] zoneNos;
+
     public WmsCSRange(){}
 
     public WmsCSRange(String zoneNo,String partNo,String partNameRdd){

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -102,6 +104,7 @@ public class WmsDocMovementDetails extends BaseBean {
      */
     @Column(name = "ITEM_STATUS")
     @ApiParam(value = "状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
     private Integer itemStatus;
 
     /**
@@ -109,6 +112,7 @@ public class WmsDocMovementDetails extends BaseBean {
      */
     @Column(name = "IS_FREE")
     @ApiParam(value = "是否免费", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     public Integer isFree;
 
     @Column(name = "REMARK")
@@ -185,10 +189,12 @@ public class WmsDocMovementDetails extends BaseBean {
 
     @Transient
     @ApiParam("任务状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description")
     private Integer isTask;
 
     @Transient
     @ApiParam("主表单据状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
     private Integer orderMasterStatus;
 
     public String getRecommondLot() {
@@ -218,6 +224,7 @@ public class WmsDocMovementDetails extends BaseBean {
 
     @Transient
     @ApiParam("业务类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
     public Integer busiType;
 
     @Column(name = "IS_SN")

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -43,6 +45,7 @@ public class WmsDocMovementMaster extends BaseBean {
      */
     @Column(name = "MOVE_TYPE")
     @ApiParam("移动类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_MOVE_TYPE.class,refForeignKey = "value",value = "description")
     public Integer moveType;
     /**
      * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发,
@@ -51,6 +54,7 @@ public class WmsDocMovementMaster extends BaseBean {
      */
     @Column(name = "BUSI_TYPE")
     @ApiParam("业务类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
     public Integer busiType;
 
     /**
@@ -59,6 +63,7 @@ public class WmsDocMovementMaster extends BaseBean {
      */
     @Column(name = "ORDER_STATUS")
     @ApiParam(value = "状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
     public Integer orderStatus;
 
     @Column(name = "CUST_NO")
@@ -90,6 +95,7 @@ public class WmsDocMovementMaster extends BaseBean {
 
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生产任务", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description")
     public Integer isTask;
 
     @Column(name = "PRIORITY")
@@ -117,6 +123,7 @@ public class WmsDocMovementMaster extends BaseBean {
 
     @Column(name = "IS_PART")
     @ApiParam(value = "是否散件", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     private Integer isPart;
 
     @Column(name = "SRC_WH_NO")

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -65,6 +67,7 @@ public class WmsDocMovementSn extends BaseBean {
      */
     @Column(name="SN_STATUS")
     @ApiParam(value = "操作状态", example = "10")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
     public Integer snStatus;
 
     @Column(name="SN")

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

@@ -229,7 +229,7 @@ public class WmsMoveDetails extends BaseBean {
             ,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,Integer busiTypeCode,
-                          String createUser,String createDatetime){
+                          String createUser,String createDatetime,String modifyUser,String modifyDatetime){
         this.organizeCode = organizeCode;
         this.partNo = partNo;
         this.orderNo = orderNo;
@@ -253,5 +253,7 @@ public class WmsMoveDetails extends BaseBean {
         this.busiTypeCode = busiTypeCode;
         this.createUser = createUser;
         this.createDatetime = createDatetime;
+        this.modifyDatetime =modifyDatetime;
+        this.modifyUser =modifyUser;
     }
 }

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

@@ -146,8 +146,32 @@ public class WmsMoveMaster extends BaseBean {
 
     public WmsMoveMaster(){};
 
+    public WmsMoveMaster(String orderNo, Integer orderStatus,  String transTypeCode, String errorMessage,
+                         Integer isUrgent,String carNo, Integer busiTypeCode, String refOrderNo, String refSrc,String partNo, Integer itemStatus,String remark,
+                         String organizeCode,String createDatetime,String createUser,String modifyDatetime,String modifyUser,String fixId) {
+        this.orderNo = orderNo;
+        this.orderStatus = orderStatus;
+        this.remark = remark;
+        this.isUrgent=isUrgent;
+        this.transTypeCode = transTypeCode;
+        this.errorMessage = errorMessage;
+        this.busiTypeCode = busiTypeCode;
+        this.partNo = partNo;
+        this.itemStatus = itemStatus;
+        this.refOrderNo = refOrderNo;
+        this.carNo = carNo;
+        this.refSrc = refSrc;
+        this.organizeCode =organizeCode;
+        this.createDatetime= createDatetime;
+        this.createUser = createUser;
+        this.modifyDatetime =modifyDatetime;
+        this.modifyUser =modifyUser;
+        this.fixId = fixId;
+    }
+
     public WmsMoveMaster(Long id,String orderNo,String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus,
-                         String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId,Integer busiTypeCode,String refSrc) {
+                         String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId,Integer busiTypeCode,String refSrc,
+                        String createDatetime,String createUser,String modifyUser,String modifyDatetime) {
         this.id = id;
         this.orderNo = orderNo;
         this.organizeCode = organizeCode;
@@ -166,5 +190,9 @@ public class WmsMoveMaster extends BaseBean {
         this.fixId = fixId;
         this.busiTypeCode = busiTypeCode;
         this.refSrc = refSrc;
+        this.createDatetime= createDatetime;
+        this.createUser = createUser;
+        this.modifyUser =modifyUser;
+        this.modifyDatetime =modifyDatetime;
     }
 }

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

@@ -214,10 +214,11 @@ public class WmsMoveSn extends BaseBean {
         this.transTypeCode = transTypeCode;
         this.refSrc = refSrc;
     }
+
     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 busiTypeCode,String sn,
-            String createUser,String createDatetime){
+            String createUser,String createDatetime,String modifyDatetime,String modifyUser){
             this.organizeCode=organizeCode;
             this.orderNo=orderNo;
             this.item=item;
@@ -245,5 +246,7 @@ public class WmsMoveSn extends BaseBean {
             this.sn = sn;
             this.createUser = createUser;
             this.createDatetime = createDatetime;
-}
+            this.modifyDatetime =modifyDatetime;
+            this.modifyUser =modifyUser;
+    }
 }

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -40,6 +42,7 @@ public class WmsQCMaster extends BaseBean {
      */
     @Column(name = "ORDER_TYPE")
     @ApiParam(value = "业务类型", example = "0")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.QC_INFO_TYPE.class,refForeignKey = "value",value = "description")
     public Integer orderType;
 
     /**
@@ -47,6 +50,7 @@ public class WmsQCMaster extends BaseBean {
      */
     @Column(name = "ORDER_STATUS")
     @ApiParam(value = "状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
     public Integer orderStatus;
 
     @Column(name = "REMARK")
@@ -83,9 +87,11 @@ public class WmsQCMaster extends BaseBean {
 
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生产任务", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description")
     public Integer isTask;
 
     @Column(name="IS_PART")
     @ApiParam(value = "是否散件", example = "2")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     public Integer isPart;
 }

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -116,18 +118,21 @@ public class WmsStockSn extends BaseBean {
      */
     @Column(name = "QC_STATUS")
     @ApiParam(value = "质检状态", example = "0")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description")
     private Integer qcStatus;
     /**
      * 条码状态：1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途
      */
     @Column(name = "SN_STATUS")
     @ApiParam(value = "条码状态", example = "0")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
     private Integer snStatus;
     /**
      * 1:已打印；2：未打印
      */
     @Column(name = "PRINTED")
     @ApiParam(value = "是否打印", example = "0")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     private Integer printed;
 
     @Column(name = "PDATE")
@@ -155,6 +160,7 @@ public class WmsStockSn extends BaseBean {
 
     @Column(name = "SN_TYPE")
     @ApiParam(value = "条码类型", example = "10")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class,refForeignKey = "value",value = "description")
     private Integer snType = 10;
 
     @ApiParam(value = "仓库名称")

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

@@ -1310,7 +1310,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getLocateNo(), "locateNo", result);
-        DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getZoneNo(), "zoneNo", result);
+        DdlPreparedPack.getInPackArray(wmsCSOrderDetails.getZoneNos(), "zoneNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getSn(), "sn", result);
 
         getStringBuilderPack(wmsCSOrderDetails, result);
@@ -1331,7 +1331,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getLocateNo(), "locateNo", result);
-        DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getZoneNo(), "zoneNo", result);
+        DdlPreparedPack.getInPackArray(wmsCSFactTrans.getZoneNos(), "zoneNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getSn(), "sn", result);
 
         getStringBuilderPack(wmsCSFactTrans, result);
@@ -2073,8 +2073,8 @@ public class WmsHqlPack {
 
         DdlPreparedPack.getStringEqualPack(wmsCSRange.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSRange.getPartNo(), "partNo", result);
-        DdlPreparedPack.getNumEqualPack(wmsCSRange.getLocateNo(), "locateNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSRange.getLocateNo(), "locateNo", result);
-        DdlPreparedPack.getStringLikerPack(wmsCSRange.getZoneNo(), "zoneNo", result);
+        DdlPreparedPack.getInPackArray(wmsCSRange.getZoneNos(), "zoneNo", result);
 
         DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{
                 DdlPreparedPack.getOrderColConvertType("item", CommonEnumUtil.BASIS_TYPE.INT.getValue())}, result);