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 = "value",value = "description")
     private String alarmCode;
 
     @Column(name = "ACTION_CODE")

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.base.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -66,8 +67,7 @@ public abstract class BaseBean implements Serializable {
 
     @Column(name="IS_VALID")
     @ApiParam(value = "有效性",example = "1")
-    @AnnoOutputColumn(hidden = true)
-    //启用停用
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     public Integer isValid;    //CommonEnumUtil.IS_VAILD;
 
     @Column(name="IS_DELETED")

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java

@@ -60,7 +60,7 @@ public class XStreamFactory {
             }
         });
 
-        xStream.setMode(XStream.NO_REFERENCES);
+//        xStream.setMode(XStream.NO_REFERENCES);
         xStream.autodetectAnnotations(true);
 
         return xStream;
@@ -123,6 +123,16 @@ public class XStreamFactory {
     }
 
     /**
+     * Javabean 转XML
+     * @param <T>
+     * @return xml字符串
+     */
+    public static <T> String toXmlNoHeadLine(T t) {
+        xStream.processAnnotations(t.getClass());
+        return xStream.toXML(t);
+    }
+
+    /**
      * XML字符串转javabean
      *
      * @param xmlStr xml字符串

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/converter/LinkedCaseInsensitiveMapConverter.java

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.base.common.converter;
+
+import com.thoughtworks.xstream.converters.Converter;
+import com.thoughtworks.xstream.converters.collections.MapConverter;
+import com.thoughtworks.xstream.mapper.Mapper;
+import org.springframework.util.LinkedCaseInsensitiveMap;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-09-09 14:35
+ * @Modify:
+ **/
+public class LinkedCaseInsensitiveMapConverter extends MapConverter implements Converter {
+
+    public LinkedCaseInsensitiveMapConverter(Mapper mapper) {
+        super(mapper);
+    }
+
+    @Override
+    public boolean canConvert(Class aClass) {
+        return aClass.equals(LinkedCaseInsensitiveMap.class);
+    }
+}

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

@@ -3,6 +3,9 @@ package cn.estsh.i3plus.pojo.base.enumutil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Description : 软适配 枚举接口
  * @Reference :
@@ -10,19 +13,19 @@ import org.apache.commons.lang3.StringUtils;
  * @CreateDate : 2019-08-13 9:34
  * @Modify:
  **/
-public class SoftSwitchEnumUtil {
+public class BlockSoftSwitchEnumUtil {
 
     /**
      * 套件类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CASE_TYPE{
-        SOCKET(1,"SOCKET"),
-        RESTFUL(2,"RESTFUL"),
-        DATASOURCE(3,"数据源"),
-        WEBSERVICE(4,"WebService"),
-        MQ(5,"消息队列"),
-        WebSocket(6,"WebSocket");
+        SOCKET(10,"SOCKET"),
+        RESTFUL(20,"RESTFUL"),
+        DATASOURCE(30,"数据源"),
+        WEB_SERVICE(40,"WebService"),
+        MQ(50,"消息队列"),
+        WEB_SOCKET(60,"WebSocket");
 
         private int value;
         private String description;
@@ -49,6 +52,145 @@ public class SoftSwitchEnumUtil {
             }
             return tmp;
         }
+
+        public static CASE_TYPE valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * 适配模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SUIT_MODE{
+        CLIENT(1,"客户端"),
+        SERVER(2,"服务端");
+
+        private int value;
+        private String description;
+
+        SUIT_MODE(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;
+        }
+    }
+
+    /**
+     * 软适配命令集合
+     * <per>
+     * <br/> ID 编号规则
+     * <br/>      第一位             服务端或者客户端 1 或者 2
+     * <br/>      第二至三位         适配类型编号
+     * <br/>      后三位             适配器ID升序
+     * </per>
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SOFTS_WITCH_ACTION{
+        /* WebService */
+        SERVER_WEB_SERVICE_SEND_EMAIL(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240001,"Server IMPP 服务邮件服务"),
+        SERVER_WEB_SERVICE_HELLO(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240003,"Server Hello测试服务"),
+        CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"),
+
+        /* 数据源 */
+        CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"Client 数据库适配服务"),
+
+        /* Restful */
+        CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client Impp Test");
+
+        private int value;
+        private String description;
+        private String clazzName;
+        private SUIT_MODE mode;
+        private CASE_TYPE type;
+
+        SOFTS_WITCH_ACTION(SUIT_MODE mode, CASE_TYPE type,int value, String description) {
+            this.value = value;
+            this.description = description;
+            this.mode = mode;
+            this.type = type;
+        }
+
+        SOFTS_WITCH_ACTION(SUIT_MODE mode, CASE_TYPE type,int value, String clazzName, String description) {
+            this.value = value;
+            this.description = description;
+            this.clazzName = clazzName;
+            this.mode = mode;
+            this.type = type;
+        }
+
+        public static SOFTS_WITCH_ACTION valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static SOFTS_WITCH_ACTION[] valueOfCaseType(CASE_TYPE type) {
+            List<SOFTS_WITCH_ACTION> result = new ArrayList<>();
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].type.equals(type)) {
+                    result.add(values()[i]);
+                }
+            }
+            return result.toArray(new SOFTS_WITCH_ACTION[result.size()]);
+        }
+
+        public static SOFTS_WITCH_ACTION[] valueOfMode(SUIT_MODE mode) {
+            List<SOFTS_WITCH_ACTION> result = new ArrayList<>();
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].mode.equals(mode)) {
+                    result.add(values()[i]);
+                }
+            }
+            return result.toArray(new SOFTS_WITCH_ACTION[result.size()]);
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getClazzName() {
+            return clazzName;
+        }
+
+        public SUIT_MODE getMode() {
+            return mode;
+        }
+
+        public CASE_TYPE getType() {
+            return type;
+        }
     }
 
     /**
@@ -57,7 +199,10 @@ public class SoftSwitchEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum REQUEST_SOURCE{
         ACTIVE(1,"主动请求"),
-        SCHEDULE(2,"定时调度");
+        SCHEDULE(2,"定时调度"),
+        RABBITMQ(3,"MQ 调用"),
+        HTTP(4,"接口调用"),
+        CLOUD(5,"Cloud调用");
 
         private int value;
         private String description;
@@ -234,7 +379,7 @@ public class SoftSwitchEnumUtil {
             return tmp;
         }
 
-        public static SoftSwitchEnumUtil.DATA_SOURCE_TYPE valueOf(int val) {
+        public static BlockSoftSwitchEnumUtil.DATA_SOURCE_TYPE valueOf(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
@@ -267,7 +412,7 @@ public class SoftSwitchEnumUtil {
             return null;
         }
 
-        public static SoftSwitchEnumUtil.DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){
+        public static BlockSoftSwitchEnumUtil.DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){
             if(StringUtils.isNotBlank(databaseProductName)){
                 if(databaseProductName.indexOf(":mysql:") != -1){
                     return SOURCE_MARIA_DB;
@@ -304,11 +449,11 @@ public class SoftSwitchEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PARAM_VALUE_TYPE{
-        NUM(1,"数字"),
-        STRING(2,"字符串"),
-        BOOLEAN(3,"布尔"),
-        MAP(4,"字典"),
-        LIST(5,"列表");
+        NUM(10,"数字"),
+        STRING(20,"字符串"),
+        BOOLEAN(30,"布尔"),
+        MAP(40,"字典"),
+        LIST(50,"列表");
 
         private int value;
         private String description;
@@ -374,17 +519,17 @@ public class SoftSwitchEnumUtil {
     }
 
     /**
-     * 适配模式
+     * 适配方式
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum SUIT_MODE{
-        ACTIVE(1,"主动"),
-        PASSIVE(2,"被动");
+    public enum SUIT_METHOD{
+        ACTIVE(1,"主动适配"),
+        SCHEDULE(2,"定时调度");
 
         private int value;
         private String description;
 
-        SUIT_MODE(int value, String description) {
+        SUIT_METHOD(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -409,17 +554,17 @@ public class SoftSwitchEnumUtil {
     }
 
     /**
-     * 适配方式
+     * 数据库操作方式
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum SUIT_METHOD{
-        ACTIVE(1,"主动适配"),
-        SCHEDULE(2,"定时调度");
+    public enum DATABASE_OPERATE_TYPE{
+        READ(1,"读取"),
+        WRITE(2,"写入");
 
         private int value;
         private String description;
 
-        SUIT_METHOD(int value, String description) {
+        DATABASE_OPERATE_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }

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

@@ -18,8 +18,8 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_PCN_TASK_STATUS {
 
-        OPEN(1, "OPEN"),
-        CLOSE(2, "CLOSE");
+        OPEN(1, "开启"),
+        CLOSE(2, "关闭");
 
         private int value;
         private String description;
@@ -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, "数字"),
-        DEFECTED(20, "字符串"),
-        SCRAPED(30, "可选值");
+        QUALIFIED(10,"number", "数字"),
+        DEFECTED(20, "text","字符串"),
+        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);
+        }
     }
 
     /**
@@ -586,6 +595,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
 
@@ -704,7 +717,9 @@ public class WmsEnumUtil {
         OUTSTOCK("OUTSTOCK", "出库"),
         INSTOCK("INSTOCK", "入库"),
         MOVESTOCK("MOVESTOCK", "移库"),
-        CS("CS", "盘点");
+        CS("CS", "盘点"),
+        VDARC("VDARC", "VDA收货");
+
         private String value;
         private String description;
 
@@ -764,7 +779,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];
                     }
                 }
@@ -860,6 +875,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
 
@@ -903,6 +922,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++) {
@@ -953,6 +976,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++) {
@@ -1012,6 +1039,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
     /**
@@ -1057,6 +1088,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
     /**
@@ -1095,6 +1130,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
     /**
@@ -1166,6 +1205,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
     /**
@@ -1240,6 +1283,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
     /**
@@ -1525,6 +1572,7 @@ public class WmsEnumUtil {
         public String getDescription() {
             return description;
         }
+
     }
 
     /**
@@ -2659,6 +2707,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
 
@@ -2944,6 +2996,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
     /**
@@ -3048,6 +3104,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
     /**
@@ -3266,6 +3326,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++) {
@@ -3277,4 +3341,57 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 收货状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REC_STATUS{
+        UNRECEIVED("UNRECEIVED", "未收货"),
+        COMPLETE_RECEIPT("COMPLETE_RECEIPT", "完成收货"),
+        PARTIAL_RECEIPT("PARTIAL_RECEIPT", "部分收货"),
+        OVER_RECEIVED_GOODS("OVER_RECEIVED_GOODS", "超量收货"),
+        OTHER("ELSE", "其他"),;
+
+        private String value;
+        private String description;
+
+        REC_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+
+        public static String getDes(String 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 String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val) ) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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) {
-        if (data != null && data.trim().length() > 0) {
+    public static void getNotInPack(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null) {
             packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data);
         }
     }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java

@@ -79,6 +79,10 @@ public class BfElement extends BaseBean {
     @ApiParam(value = "是否删除")
     private Integer isObjectDel;
 
+    @Column(name = "IS_OBJECT_EXPORT")
+    @ApiParam(value = "是否导出")
+    private Integer isObjectExport;
+
     @Column(name="ELEMENT_SORT_ATTR_ID")
     @ApiParam(value ="默认排序属性")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java

@@ -136,7 +136,7 @@ public class BfElementProperty extends BaseBean {
     @AnnoOutputColumn(hidden = true)
     private BfDataObjectProperty objectProperty;
 
-    public Object getFormValue() {
-        return propertyFormValue;
-    }
+//    public Object getFormValue() {
+//        return propertyFormValue == null ? propertyDefaultValue : propertyFormValue;
+//    }
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java

@@ -341,6 +341,8 @@ public final class FormHqlPack {
 
         DdlPreparedPack.getNegativeNumEqualPack(bfMenu.getId(), "parentId", result);
         DdlPreparedPack.getNumEqualPack(
+                CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(
                 CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
 
         // 按顺序字段进行排序

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

@@ -77,15 +77,12 @@ public class MesPcnTask extends BaseBean {
     @ApiParam("任务周期描述")
     private String taskCycleDescription;
 
-    @Column(name="TASK_STATUS")
-    @ApiParam("任务状态")
-    private Integer taskStatus;
+    @Column(name="TASK_PARAM")
+    @ApiParam("任务参数")
+    private String taskParam;
 
     public int getTaskTypeVal() {
         return this.taskType == null ? 0 : this.taskType;
     }
 
-    public int getTaskStatusVal() {
-        return this.taskStatus == null ? 0 : this.taskStatus;
-    }
 }

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

@@ -77,15 +77,12 @@ public class MesPcnTask extends BaseBean {
     @ApiParam("任务周期描述")
     private String taskCycleDescription;
 
-    @Column(name="TASK_STATUS")
-    @ApiParam("任务状态")
-    private Integer taskStatus;
+    @Column(name="TASK_PARAM")
+    @ApiParam("任务参数")
+    private String taskParam;
 
     public int getTaskTypeVal() {
         return this.taskType == null ? 0 : this.taskType;
     }
 
-    public int getTaskStatusVal() {
-        return this.taskStatus == null ? 0 : this.taskStatus;
-    }
 }

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);
-        }
-        if (StringUtils.isNotEmpty(mesWorkCenter.getAreaCode())) {
-            DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean);
-        }
-
+        DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
+        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);
@@ -545,7 +542,7 @@ public class MesHqlPack {
      * @return
      */
     public static DdlPackBean getMesAction(MesAction mesAction) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction.getOrganizeCode());
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, mesAction.getOrganizeCode());
         DdlPreparedPack.getStringRightLikerPack(mesAction.getActionCode(), "actionCode", packBean);
         DdlPreparedPack.getStringLikerPack(mesAction.getActionName(), "actionName", packBean);
         DdlPreparedPack.getNumEqualPack(mesAction.getActionType(), "actionType", 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);
@@ -1164,15 +1161,13 @@ public class MesHqlPack {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesPcnTask, organizeCode);
         DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean);
         DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean);
-        if (null != mesPcnTask.getTaskStatus()) {
-            DdlPreparedPack.getNumEqualPack(mesPcnTask.getTaskStatus(), "taskStatus", packBean);
-        }
         packBean.setOrderByStr(mesPcnTask.orderBy());
         return packBean;
     }
 
     /**
      * 条码生成规则校验同一机构下条码规则唯一性
+     *
      * @param numberRule
      * @param id
      * @param organizeCode
@@ -1187,4 +1182,17 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 系统业务动作
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesActionAllData(String organizeCode) {
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
+        return packBean;
+    }
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.model.softswitch;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSocketSuitCase;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSource;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description : 适配器model
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-09-04 15:30
+ * @Modify:
+ **/
+@Data
+public class BsSuitCaseModel implements Serializable {
+    private static final long serialVersionUID = -7420782744192475445L;
+
+    @ApiParam(value = "适配器")
+    private BsSuitCase bsSuitCase;
+
+    @ApiParam(value = "数据源适配套件")
+    private BsSuitCaseDataSource bsSuitCaseDataSource;
+
+    @ApiParam(value = "socket适配套件")
+    private BsSocketSuitCase bsSocketSuitCase;
+
+    @ApiParam(value = "Web Service 适配套件")
+    private BsSuitCaseWebService webService;
+
+    @ApiParam(value = "分页数据")
+    private Pager pager;
+
+    public BsSuitCaseModel() {
+    }
+
+    public BsSuitCaseModel(BsSuitCase bsSuitCase) {
+        this.bsSuitCase = bsSuitCase;
+    }
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/DataSwitchModel.java

@@ -1,26 +1,26 @@
-package cn.estsh.i3plus.pojo.model.softswitch;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description : 数据模型转换对象
- * @Reference :
- * @Author : alwaysfrin
- * @CreateDate : 2019-04-29 11:11
- * @Modify:
- **/
-public class DataSwitchModel {
-
-    private String stringVal;
-
-    private Long longVal;
-
-    private Double doubleVal;
-
-    private List<?> listVal;
-
-    private Map<String,?> mapVal;
-
-    private Object[] arrayVal;
-}
+//package cn.estsh.i3plus.pojo.model.softswitch;
+//
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+// * @Description : 数据模型转换对象
+// * @Reference :
+// * @Author : alwaysfrin
+// * @CreateDate : 2019-04-29 11:11
+// * @Modify:
+// **/
+//public class DataSwitchModel {
+//
+//    private String stringVal;
+//
+//    private Long longVal;
+//
+//    private Double doubleVal;
+//
+//    private List<?> listVal;
+//
+//    private Map<String,?> mapVal;
+//
+//    private Object[] arrayVal;
+//}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/PojoAuth.java

@@ -1,50 +1,50 @@
-package cn.estsh.i3plus.pojo.model.softswitch;
-
-import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
-import lombok.Data;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description :
- * @Reference :
- * @Author : wei.peng
- * @CreateDate : 19-7-25 下午3:31
- * @Modify:
- **/
-@Data
-@XStreamAlias("auth")
-public class PojoAuth{
-
-    @XStreamAsAttribute
-    private Long id;
-    @XStreamAsAttribute
-    private Integer authType;
-
-    @XStreamImplicit
-    private List<Prop> params;
-
-    private String authPath;
-    private String userName ="登录名称";
-    private String password ="登录名称";
-    private String languageCode ="登录名称";
-
-    // 认证令牌
-    private String token;
-//    // 认证令牌集合(复杂认证令牌)
-//    private List<Prop> tokenList;
-    // 原始认证数据
-    @XStreamCDATA
-    private String result;
-
-    public PojoAuth(Long id, Integer authType,String authPath, List<Prop> params) {
-        this.id = id;
-        this.authType = authType;
-        this.authPath = authPath;
-        this.params = params;
-    }
-}
+//package cn.estsh.i3plus.pojo.model.softswitch;
+//
+//import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
+//import com.thoughtworks.xstream.annotations.XStreamAlias;
+//import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+//import com.thoughtworks.xstream.annotations.XStreamImplicit;
+//import lombok.Data;
+//
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+// * @Description :
+// * @Reference :
+// * @Author : wei.peng
+// * @CreateDate : 19-7-25 下午3:31
+// * @Modify:
+// **/
+//@Data
+//@XStreamAlias("auth")
+//public class PojoAuth{
+//
+//    @XStreamAsAttribute
+//    private Long id;
+//    @XStreamAsAttribute
+//    private Integer authType;
+//
+//    @XStreamImplicit
+//    private List<Prop> params;
+//
+//    private String authPath;
+//    private String userName ="登录名称";
+//    private String password ="登录名称";
+//    private String languageCode ="登录名称";
+//
+//    // 认证令牌
+//    private String token;
+////    // 认证令牌集合(复杂认证令牌)
+////    private List<Prop> tokenList;
+//    // 原始认证数据
+//    @XStreamCDATA
+//    private String result;
+//
+//    public PojoAuth(Long id, Integer authType,String authPath, List<Prop> params) {
+//        this.id = id;
+//        this.authType = authType;
+//        this.authPath = authPath;
+//        this.params = params;
+//    }
+//}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Prop.java

@@ -1,28 +1,28 @@
-package cn.estsh.i3plus.pojo.model.softswitch;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import lombok.Data;
-
-/**
- * @Description :
- * @Reference :
- * @Author : wei.peng
- * @CreateDate : 19-7-25 下午5:18
- * @Modify:
- **/
-@Data
-@XStreamAlias("prop")
-public class Prop {
-
-    @XStreamAsAttribute
-    private Long id;
-    private String paramName;
-    private String paramValue;
-
-    public Prop(Long id, String paramName, String paramValue) {
-        this.id = id;
-        this.paramName = paramName;
-        this.paramValue = paramValue;
-    }
-}
+//package cn.estsh.i3plus.pojo.model.softswitch;
+//
+//import com.thoughtworks.xstream.annotations.XStreamAlias;
+//import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+//import lombok.Data;
+//
+///**
+// * @Description :
+// * @Reference :
+// * @Author : wei.peng
+// * @CreateDate : 19-7-25 下午5:18
+// * @Modify:
+// **/
+//@Data
+//@XStreamAlias("prop")
+//public class Prop {
+//
+//    @XStreamAsAttribute
+//    private Long id;
+//    private String paramName;
+//    private String paramValue;
+//
+//    public Prop(Long id, String paramName, String paramValue) {
+//        this.id = id;
+//        this.paramName = paramName;
+//        this.paramValue = paramValue;
+//    }
+//}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Request.java

@@ -1,33 +1,33 @@
-package cn.estsh.i3plus.pojo.model.softswitch;
-
-import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import lombok.Data;
-
-/**
- * @Description :
- * @Reference :
- * @Author : wei.peng
- * @CreateDate : 19-7-25 下午3:31
- * @Modify:
- **/
-@Data
-@XStreamAlias("request")
-public class Request{
-
-    @XStreamAsAttribute
-    private Long id;
-    @XStreamAsAttribute
-    private Integer requestType;
-    private String requestPath;
-
-    @XStreamCDATA
-    private String result;
-
-    public Request(Long id, Integer requestType,String requestPath) {
-        this.id = id;
-        this.requestType = requestType;
-        this.requestPath = requestPath;
-    }
-}
+//package cn.estsh.i3plus.pojo.model.softswitch;
+//
+//import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
+//import com.thoughtworks.xstream.annotations.XStreamAlias;
+//import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+//import lombok.Data;
+//
+///**
+// * @Description :
+// * @Reference :
+// * @Author : wei.peng
+// * @CreateDate : 19-7-25 下午3:31
+// * @Modify:
+// **/
+//@Data
+//@XStreamAlias("request")
+//public class Request{
+//
+//    @XStreamAsAttribute
+//    private Long id;
+//    @XStreamAsAttribute
+//    private Integer requestType;
+//    private String requestPath;
+//
+//    @XStreamCDATA
+//    private String result;
+//
+//    public Request(Long id, Integer requestType,String requestPath) {
+//        this.id = id;
+//        this.requestType = requestType;
+//        this.requestPath = requestPath;
+//    }
+//}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.model.softswitch;
+
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 2019/9/12 下午2:00
+ * @Modify:
+ **/
+@Data
+public class SoftswitchIocModel {
+    private String beanName;
+    private Object obj;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java

@@ -1,16 +1,15 @@
 package cn.estsh.i3plus.pojo.model.softswitch;
 
 import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKey;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import com.thoughtworks.xstream.annotations.XStreamOmitField;
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import javax.persistence.Transient;
+import java.util.HashMap;
 
 /**
  * @Description :
@@ -20,86 +19,72 @@ import javax.persistence.Transient;
  * @Modify:
  **/
 @Data
-@XStreamAlias("model")
-public class SuitCoreModel {
+@XStreamAlias("client")
+public class SuitClientModel {
 
     /**
      * 适配套件代码
      */
     @XStreamAsAttribute
-    private String suitCaseCode;// adapterId
+    private String suitCaseCode;
+
+    @ApiParam(value = "套件类型(枚举)")
+    @XStreamAsAttribute
+    private Integer caseTypeId;
+
+    @ApiParam(value = "适配命令(枚举)")
+    private Integer actionId;
 
     /**
-     * 套件类型
+     * 适配器信息
      */
-    @XStreamAsAttribute
-    private Integer caseType;
+    private BsSuitCaseModel suitCaseModel;
 
     /**
      * 适配结果信息
      */
     private String suitMessage;
-
     /**
      * 请求来源
      */
     private Integer requestSource;
-
-    private String suitCaseStatusCode;
-
     /**
-     * 适配认证
+     * 适配状态码
      */
-    private BsSslKey sslKey;
-
+    private String suitCaseStatusCode;
     /**
      * 认证令牌
      */
     private String token;
-
-    /**
-     * 适配器套件
-     */
-    private BsSuitCase bsSuitCase;
-
-    private Object bsSuitCaseDetail;
-
     /**
      * 认证结果
      */
     private Integer suitSslKeyResult;
-
     /**
      * 认证信息
      */
     private String suitSslKeyResultMessage;
-
     /**
      * 适配结果
      */
     private Integer suitResult;
-
     /**
      * 适配报文
      */
     @XStreamCDATA
     private String suitResultMessage;
 
-    /**
-     *
-     * @param requestSource 请求来源
-     * @param sslKey 适配认证对象
-     * @param bsSuitCase 适配器信息
-     */
-    public SuitCoreModel(Integer requestSource,BsSslKey sslKey, BsSuitCase bsSuitCase) {
-        this.sslKey = sslKey;
-        this.bsSuitCase = bsSuitCase;
+    public SuitClientModel() {
+    }
+
+    public SuitClientModel(Integer requestSource,BsSuitCaseModel suitCaseModel) {
         this.requestSource = requestSource;
 
-        // 设置套件类型
-        this.caseType = bsSuitCase.getCaseTypeId();
-        // 设置套件代码
-        this.suitCaseCode = bsSuitCase.getSuitCaseCode();
+        this.caseTypeId = suitCaseModel.getBsSuitCase().getCaseTypeId();
+        this.actionId = suitCaseModel.getBsSuitCase().getSuitActionId();
+        this.suitCaseCode = suitCaseModel.getBsSuitCase().getSuitCaseCode();
+        this.suitCaseModel = suitCaseModel;
+
         // 设置默认
         this.suitCaseStatusCode = ResourceEnumUtil.MESSAGE.SUCCESS.getCode();
         // 设置默认
@@ -107,7 +92,4 @@ public class SuitCoreModel {
         // 设置默认
         this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
     }
-}
-
-
-
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java

@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.model.softswitch;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 19-9-5 下午7:30
+ * @Modify:
+ **/
+@Data
+@XStreamAlias("server")
+public class SuitServerModel {
+
+    // 执行方法命令
+    @ApiParam(value = "适配命令(枚举)")
+    private Integer actionId;
+    /* 认证使用 以后使用 */
+    private String token;
+    // 传输单对象
+    private Object obj;
+    // 传输集合
+    private List list;
+    // 传输键值对
+    private Map<String,Object> map;
+    // 传输 JSON 数据
+    private String json;
+
+    /**
+     * 适配结果信息
+     */
+    private String suitMessage;
+    /**
+     * 适配状态码
+     */
+    private String suitCaseStatusCode;
+
+}

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

@@ -41,6 +41,9 @@ public class WmsActionResponseBean<Obj> implements Serializable {
     @ApiParam("总步数")
     public int totalStep;
 
+    @ApiParam("错误提示信息")
+    public String errorMsg;
+
     @ApiParam("提示信息")
     public String message;
 
@@ -49,14 +52,16 @@ public class WmsActionResponseBean<Obj> implements Serializable {
 
     @ApiParam("可选项")
     public List<WmsOptionModel> options;
-    public List<WmsOptionModel> getOptions(){
-        if(options == null){
+
+    public List<WmsOptionModel> getOptions() {
+        if (options == null) {
             options = new ArrayList<>();
         }
         return options;
     }
-    public void setOptions(List<WmsOptionModel> opt){
-        if(opt == null){
+
+    public void setOptions(List<WmsOptionModel> opt) {
+        if (opt == null) {
             opt = new ArrayList<>();
         }
         options = opt;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java

@@ -61,7 +61,7 @@ public class BsDataSource extends BaseBean {
 
     @Column(name = "DATA_SOURCE_STATUS")
     @ApiParam(value = "数据源状态")
-    private String dataSourceStatus;
+    private Integer dataSourceStatus;
 
     @Column(name = "DATA_SOURCE_DESCRIPTION")
     @ApiParam(value = "数据源描述")

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java

@@ -39,6 +39,13 @@ public class BsSuitCase extends BaseBean {
     @ApiParam(value = "套件类型id(枚举)")
     private Integer caseTypeId;
 
+    public int getCaseTypeIdVal(){
+        if(caseTypeId == null) {
+            return -1;
+        }
+        return caseTypeId.intValue();
+    }
+
     @Column(name = "CASE_DETAIL_ID")
     @ApiParam(value = "适配器明细id")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -49,9 +56,16 @@ public class BsSuitCase extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long suitTypeId;
 
-    @Column(name = "SUIT_TYPE_NAME")
+    public long getSuitTypeIdVal(){
+        if(suitTypeId != null){
+            return -1;
+        }
+        return suitTypeId.longValue();
+    }
+
+    @Column(name = "SUIT_TYPE_NAME_RDD")
     @ApiParam(value = "适配类型名称")
-    private String suitTypeName;
+    private String suitTypeNameRdd;
 
     @Column(name = "SUIT_CASE_CODE")
     @ApiParam(value = "适配器代码")
@@ -61,6 +75,10 @@ public class BsSuitCase extends BaseBean {
     @ApiParam(value = "适配模式(枚举,主动，被动)")
     private Integer suitModeId;
 
+    @Column(name = "SUIT_ACTION_ID")
+    @ApiParam(value = "Server 适配命令")
+    private Integer suitActionId;
+
     @Column(name = "SUIT_CASE_HOST")
     @ApiParam(value = "适配主机")
     private String suitCaseHost;
@@ -107,7 +125,20 @@ public class BsSuitCase extends BaseBean {
     private Integer suitCaseStatus;
 
     @Transient
+    @ApiParam(value = "适配器套件明细")
+    private  Object bsSuitCaseDetail;
+
+    @Transient
     @ApiParam(value = "适配器参数")
-    List<BsSuitCaseParam> bsSuitCaseParamList;
+    private List<BsSuitCaseParam> bsSuitCaseParamList;
+
+    @Transient
+    @ApiParam(value = "入参转换")
+    private List<BsParamAdapter> bsInParamAdapterList;
+
+    @Transient
+    @ApiParam(value = "出参转换")
+    private List<BsParamAdapter> bsOutParamAdapterList;
 }
 
+

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java

@@ -12,6 +12,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : 数据库套件
@@ -25,19 +27,15 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "BS_DATA_SOURCE_SUIT_CASE")
+@Table(name = "BS_SUIT_CASE_DATA_SOURCE")
 @Api(value = "数据库套件", description = "数据库套件")
-public class BsDataSourceSuitCase extends BaseBean {
+public class BsSuitCaseDataSource extends BaseBean {
 
     @Column(name = "SUIT_CASE_ID")
     @ApiParam(value = "套件id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long suitCaseId;
 
-    @Column(name = "DATA_SOURCE_MODE_ID")
-    @ApiParam(value = "数据源套件模式（枚举，被动读，主动写）")
-    private Integer dataSourceModeId;
-
     @Column(name = "DATA_SOURCE_CODE")
     @ApiParam(value = "数据源编码")
     private String dataSourceCode;
@@ -46,5 +44,12 @@ public class BsDataSourceSuitCase extends BaseBean {
     @ApiParam(value = "数据源名称")
     private String dataSourceNameRdd;
 
+    @Transient
+    @ApiParam(value = "数据源")
+    private BsDataSource bsDataSource;
+
+    @Transient
+    @ApiParam(value = "数据库操作")
+    private List<BsSuitCaseDataSourceTable> bsDataSourceSuitCaseTableList;
 }
 

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java

@@ -25,9 +25,9 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "BS_DATA_SOURCE_SUIT_CASE_TABLE")
+@Table(name = "BS_SUIT_CASE_DATA_SOURCE_TABLE")
 @Api(value = "数据库表操作", description = "数据库表操作")
-public class BsDataSourceSuitCaseTable extends BaseBean {
+public class BsSuitCaseDataSourceTable extends BaseBean {
 
     @Column(name = "SUIT_CASE_ID")
     @ApiParam(value = "套件id")
@@ -42,6 +42,13 @@ public class BsDataSourceSuitCaseTable extends BaseBean {
     @ApiParam(value = "操作类型")
     private Integer operateTypeId;
 
+    public int getOperateTypeIdVal(){
+        if(operateTypeId == null){
+            return -1;
+        }
+        return operateTypeId.intValue();
+    }
+
     @Column(name = "EXECUTE_SQL")
     @ApiParam(value = "执行sql")
     private String executeSql;
@@ -52,7 +59,14 @@ public class BsDataSourceSuitCaseTable extends BaseBean {
 
     @Column(name = "IS_RETURN")
     @ApiParam(value = "是否有返回")
-    private String isReturn;
+    private Integer isReturn;
+
+    public int getIsReturnVal(){
+        if(isReturn == null){
+            return -1;
+        }
+        return isReturn.intValue();
+    }
 
 
 }

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java

@@ -47,10 +47,18 @@ public class BsSuitCaseParam extends BaseBean {
     @ApiParam(value = "参数名称)")
     private String paramName;
 
+    @Column(name = "PARENT_PARAM_NAME")
+    @ApiParam(value = "上级参数名称)")
+    private String parentParamName;
+
     @Column(name = "PARAM_VAL_TYPE_ID")
     @ApiParam(value = "参数值类型")
     private Integer paramValTypeId;
 
+    @Column(name = "PARAM_SORT")
+    @ApiParam(value = "参数参数排序")
+    private Integer paramSort;
+
     @Column(name = "PARAM_DEFAULT_VALUE")
     @ApiParam(value = "参数默认值")
     private String paramDefaultValue;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.softswitch.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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;
+
+/**
+ * @Description :   WebService 适配套件
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 2019/9/9 上午11:09
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "BS_SUIT_CASE_WEB_SERVICE")
+@Api(value = "WebService", description = "WebService 适配套件")
+public class BsSuitCaseWebService extends BaseBean {
+
+    @Column(name = "SUIT_CASE_ID")
+    @ApiParam(value = "套件id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long suitCaseId;
+
+    @Column(name = "SERVICE_TAG_NAME")
+    @ApiParam(value = "Service Tag Name(包名称)")
+    private String serviceTagName;
+
+    @Column(name = "SERVICE_FUNCTION_NAME")
+    @ApiParam(value = "Service Function Name(方法名称)")
+    private String serviceFunctionName;
+
+}

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseDataSourceRepository.java

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.softswitch.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSourceSuitCase;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSource;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  */
 @Repository
-public interface BsDataSourceSuitCaseRepository extends BaseRepository<BsDataSourceSuitCase,Long> {
+public interface BsSuitCaseDataSourceRepository extends BaseRepository<BsSuitCaseDataSource,Long> {
 
 }
 

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseDataSourceTableRepository.java

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.softswitch.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSourceSuitCaseTable;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSourceTable;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  */
 @Repository
-public interface BsDataSourceSuitCaseTableRepository extends BaseRepository<BsDataSourceSuitCaseTable,Long> {
+public interface BsSuitCaseDataSourceTableRepository extends BaseRepository<BsSuitCaseDataSourceTable,Long> {
 
 }
 

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseWebServiceRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.softswitch.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 2019/9/9 上午11:41
+ * @Modify:
+ **/
+public interface BsSuitCaseWebServiceRepository extends BaseRepository<BsSuitCaseWebService,Long> {
+}

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java

@@ -47,7 +47,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsSuitCaseParam(BsSuitCaseParam bsSuitCaseParam){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getStringLikerPack(bsSuitCaseParam.getParamName(),"paramName",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getParamTypeId(), "paramTypeId", ddlPackBean);
@@ -65,7 +65,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsSuitCaseParamOnly(BsSuitCaseParam bsSuitCaseParam){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumNOEqualPack(bsSuitCaseParam.getId(),"id",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getSuitCaseId(), "suitCaseId", ddlPackBean);
@@ -80,12 +80,11 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsSuitCaseParam(BsSuitCase bsSuitCase){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseName(),"suitCaseName",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitTypeId(), "suitTypeId", ddlPackBean);
-        DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitTypeName(),"suitTypeName",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitCase.getCaseTypeId(), "caseTypeId", ddlPackBean);
 
         ddlPackBean.setOrderByStr(bsSuitCase.orderBy());
@@ -99,7 +98,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsSuitCaseOnly(BsSuitCase bsSuitCase){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumNOEqualPack(bsSuitCase.getId(),"id",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitCaseCode(), "suitCaseCode", ddlPackBean);
@@ -113,12 +112,12 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsParamAdapter(BsParamAdapter bsParamAdapter){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.getStringEqualPack(bsParamAdapter.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
-        DdlPreparedPack.getStringLikerPack(bsParamAdapter.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsParamAdapter.getSuitParamNameRdd(), "suitParamNameRdd", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitParamTypeId(), "suitParamTypeId", ddlPackBean);
 
         ddlPackBean.setOrderByStr(bsParamAdapter.orderBy());
 
@@ -131,7 +130,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsParamAdapterOnly(BsParamAdapter bsParamAdapter){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsParamAdapter.getId(), "id", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(), "suitCaseId", ddlPackBean);
@@ -147,7 +146,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsSuitSchedule(BsSuitSchedule bsSuitSchedule){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getStringLikerPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getSuitCaseId(),"suitCaseId",ddlPackBean);
@@ -165,7 +164,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsSuitScheduleOnly(BsSuitSchedule bsSuitSchedule){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getId(),"id",ddlPackBean);
         DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean);
@@ -180,7 +179,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsSslKey(BsSslKey bsSslKey){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(),"keyName",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSslKey.getKeyTypeId(),"keyTypeId",ddlPackBean);
@@ -196,7 +195,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsSslKeyOnly(BsSslKey bsSslKey){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsSslKey.getId(),"id",ddlPackBean);
         DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(), "keyName", ddlPackBean);
@@ -210,7 +209,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsSslKeyParam(BsSslKeyParam bsSslKeyParam){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsSslKeyParam.getSslKeyId(), "sslKeyId", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSslKeyParam.getParamName(), "paramName", ddlPackBean);
@@ -226,7 +225,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsSslKeyParamOnly(BsSslKeyParam bsSslKeyParam){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsSslKeyParam.getSslKeyId(), "sslKeyId", ddlPackBean);
         DdlPreparedPack.getStringEqualPack(bsSslKeyParam.getParamName(), "paramName", ddlPackBean);
@@ -240,7 +239,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsDataSource(BsDataSource bsDataSource){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceName(), "dataSourceName", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean);
@@ -258,7 +257,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsDataSourceOnly(BsDataSource bsDataSource){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsDataSource.getId(), "id", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean);
@@ -266,4 +265,43 @@ public class SoftSwitchHqlPack {
         return ddlPackBean;
     }
 
+    /**
+     * 数据源适配操作查询条件封装
+     * @param bsSuitCaseDataSourceTable
+     * @return
+     */
+    public static DdlPackBean packHqlBsSuitCaseDataSourceTable(BsSuitCaseDataSourceTable bsSuitCaseDataSourceTable){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(bsSuitCaseDataSourceTable.getSuitCaseId(),"suitCaseId",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitCaseDataSourceTable.getOperateName(),"operateName",ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 数据适配操作操作唯一校验
+     * @param bsSuitCaseDataSourceTable
+     * @return
+     */
+    public static DdlPackBean packHqlCheckBsSuitCaseDataSourceTableOnly(BsSuitCaseDataSourceTable bsSuitCaseDataSourceTable){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(bsSuitCaseDataSourceTable.getId(), "id", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSuitCaseDataSourceTable.getSuitCaseId(), "suitCaseId", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitCaseDataSourceTable.getOperateName(), "operateName", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    /**
+     * WebService 唯一校验
+     * @param webService
+     * @return
+     */
+    public static DdlPackBean packHqlCheckWebService(BsSuitCaseWebService webService){
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
+
+        return result;
+    }
 }

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/SwebProcurementPlanOrder.java

@@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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;
+
+/**
+ * @Description : 开口合同主表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-09-09 11:14
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SWEB_PROCUREMENT_PLAN_ORDER")
+@Api("开口合同主表")
+public class SwebProcurementPlanOrder extends BaseBean {
+
+    private static final long serialVersionUID = -4332932784803175933L;
+    @Column(name = "ORDER_NO")
+    @ApiParam(value = "合同号")
+    private String orderNo;
+
+    @Column(name = "VENDOR_CODE")
+    @ApiParam(value = "物料名称")
+    private String vendorCode;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam(value = "物料名称")
+    private String vendorName;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料名称")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam(value = "物料名称")
+    private String partName;
+
+    @Column(name = "CONSIGNMENT")
+    @ApiParam(value = "是否寄售")
+    private Integer consignment;
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.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,6 +43,7 @@ public class WmsASNMaster extends BaseBean {
 
     @Column(name = "ASN_STATUS")
     @ApiParam(value = "状态", example = "0")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
     public Integer asnStatus;
 
     @Column(name = "VENDOR_NO")
@@ -65,6 +68,7 @@ public class WmsASNMaster extends BaseBean {
 
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生产任务", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description")
     public Integer isTask;
 
     @ApiParam("ASN详情列表")
@@ -122,4 +126,75 @@ public class WmsASNMaster extends BaseBean {
     @Transient
     @ApiParam("手机")
     private String vendorPhone;
+
+    @Transient
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Transient
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Transient
+    @ApiParam("收货数量")
+    private Double sumRecQty;
+
+    @Transient
+    @ApiParam("需求数量")
+    private Double sumQty;
+
+    @Transient
+    @ApiParam("计划日期")
+    private String planDate;
+
+    @Transient
+    @ApiParam("计划日期开始")
+    private String planDateStart;
+
+    @Transient
+    @ApiParam("计划日期结束")
+    private String planDateEnd;
+
+    @Transient
+    @ApiParam("计划时间")
+    private String planTime;
+
+    @Transient
+    @ApiParam("差异数量")
+    private Double diffQty;
+
+    @Transient
+    @ApiParam("单据类型") // PO/ASN
+    private String orderType;
+
+    @Transient
+    @ApiParam("收货状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.REC_STATUS.class,refForeignKey = "value",value = "description")
+    private String recStatus;
+
+    @Transient
+    @ApiParam("项目")
+    private String prodCfgTypeCode;
+
+    public  WmsASNMaster(){}
+
+    public  WmsASNMaster(String orderNo,Integer asnStatus,String vendorNo,String partNo,String partNameRdd,
+                                       Double sumQty,Double sumRecQty,String planDate,String planTime,Double diffQty,String orderType,
+                                       String recStatus){
+
+        this.orderNo = orderNo;
+        this.asnStatus = asnStatus;
+        this.vendorNo = vendorNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.sumQty = sumQty;
+        this.sumRecQty = sumRecQty;
+        this.planDate = planDate;
+        this.planTime = planTime;
+        this.diffQty = diffQty;
+        this.orderType = orderType;
+        this.recStatus = recStatus;
+    }
+
+
 }

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")
@@ -72,7 +79,8 @@ public class WmsCSOrderMaster extends BaseBean {
     public String year;
 
     @Column(name = "IS_SYNC_ERP")
-    @ApiParam("是否同步ERP: 1=已同步，2=未同步")
+    @ApiParam("是否同步ERP")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.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

@@ -150,6 +150,7 @@ public class WmsMoveDetails extends BaseBean {
 
     @Transient
     @ApiParam("业务类型编码")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
     private Integer busiTypeCode;
 
     @Transient
@@ -158,11 +159,11 @@ public class WmsMoveDetails extends BaseBean {
 
     @Transient
     @ApiParam("父物料编码")
-    private String fPartNo;
+    private String fpartNo;
 
     @Transient
     @ApiParam("父物料名称")
-    private String fPartName;
+    private String fpartName;
 
     @Transient
     @ApiParam("数量")
@@ -172,6 +173,20 @@ public class WmsMoveDetails extends BaseBean {
     @ApiParam("创建时间")
     private String createDateTime;
 
+    @Version
+    @Column(name = "LOCK_VERSION")
+    @ApiParam(value = "乐观锁", example = "1")
+    public  Integer lockVersion;
+   /* @JSONField(name="fPartNo")
+    public String getfPartNo() {
+        return fPartNo;
+    }
+
+    @JSONField(name="fPartName")
+    public String getfPartName() {
+        return fPartName;
+    }*/
+
     public WmsMoveDetails(){}
 
     public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){
@@ -203,8 +218,8 @@ public class WmsMoveDetails extends BaseBean {
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
         this.workCenterCode = workCenterCode;
-        this.fPartNo = fPartNo;
-        this.fPartName = fPartName;
+        this.fpartNo = fPartNo;
+        this.fpartName = fPartName;
         this.unit = unit;
         this.qty = qty;
         this.createDateTime = createDateTime;
@@ -217,7 +232,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;
@@ -241,5 +256,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

@@ -144,10 +144,39 @@ public class WmsMoveMaster extends BaseBean {
     @ApiParam(value = "设备编号")
     public String fixId;
 
+//    @Version
+//    @Column(name = "LOCK_VERSION")
+//    @ApiParam(value = "乐观锁", example = "1")
+//    public  Integer lockVersion;
+
     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 +195,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

@@ -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;
@@ -23,7 +25,7 @@ import javax.persistence.*;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_MOVE_SN", indexes = {
+@Table(name = "WMS_MOVE_SN", indexes = {
         @Index(columnList = "PART_NO"),
         @Index(columnList = "ORDER_NO"),
         @Index(columnList = "SN"),
@@ -33,79 +35,80 @@ import javax.persistence.*;
 public class WmsMoveSn extends BaseBean {
 
     private static final long serialVersionUID = 1490715681910614399L;
-    @Column(name="ORDER_NO")
+    @Column(name = "ORDER_NO")
     @ApiParam("单号")
     public String orderNo;
 
-    @Column(name="ITEM")
+    @Column(name = "ITEM")
     @ApiParam("行号")
     public Integer item;
 
-    @Column(name="PART_NO")
+    @Column(name = "PART_NO")
     @ApiParam("物料编码")
     public String partNo;
 
-    @Column(name="PART_NAME_RDD")
+    @Column(name = "PART_NAME_RDD")
     @ApiParam("物料名称")
     public String partNameRdd;
 
-    @Column(name="UNIT")
+    @Column(name = "UNIT")
     @ApiParam(value = "单位")
     public String unit;
 
-    @Column(name="SN")
+    @Column(name = "SN")
     @ApiParam("条码")
     public String sn;
 
-    @Column(name="CSN")
+    @Column(name = "CSN")
     @ApiParam("客户条码")
     public String csn;
 
     /**
      * 状态:1=创建,10=待处理,20=已处理
      */
-    @Column(name="ITEM_STATUS")
+    @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")
+    @Column(name = "REMARK")
     @ApiParam("备注")
     public String remark;
 
-    @Column(name="LOT_NO")
+    @Column(name = "LOT_NO")
     @ApiParam("批次编号")
     public String lotNo;
 
-    @Column(name="PACKAGE_NO")
+    @Column(name = "PACKAGE_NO")
     @ApiParam("容器编号")
     public String packAgeNo;
 
-    @Column(name="SRC_QTY")
+    @Column(name = "SRC_QTY")
     @ColumnDefault("0")
     @ApiParam(value = "源数量", example = "0")
     public Double srcQty;
 
-    @Column(name="SRC_WH_NO")
+    @Column(name = "SRC_WH_NO")
     @ApiParam("源仓库代码")
     public String srcWhNo;
 
-    @Column(name="SRC_ZONE_NO")
+    @Column(name = "SRC_ZONE_NO")
     @ApiParam("源存储区代码")
     public String srcZoneNo;
 
-    @Column(name="SRC_LOCATE_NO")
+    @Column(name = "SRC_LOCATE_NO")
     @ApiParam("源库位代码")
     public String srcLocateNo;
 
-    @Column(name="DEST_WH_NO")
+    @Column(name = "DEST_WH_NO")
     @ApiParam("目标仓库代码")
     public String destWhNo;
 
-    @Column(name="DEST_ZONE_NO")
+    @Column(name = "DEST_ZONE_NO")
     @ApiParam("目标存储区代码")
     public String destZoneNo;
 
-    @Column(name="DEST_LOCATE_NO")
+    @Column(name = "DEST_LOCATE_NO")
     @ApiParam("目标库位代码")
     public String destLocateNo;
 
@@ -117,49 +120,53 @@ public class WmsMoveSn extends BaseBean {
     @Transient
     private Long finishedCounts;
 
-    @Column(name="DEST_QTY")
+    @Column(name = "DEST_QTY")
     @ColumnDefault("0")
     @ApiParam(value = "目标数量", example = "0")
     public Double destQty;
 
-    @Column(name="QTY")
+    @Column(name = "QTY")
     @ColumnDefault("0")
     @ApiParam(value = "数量", example = "0")
     public Double qty;
 
-    @Column(name="SRC_QC_STATUS")
+    @Column(name = "SRC_QC_STATUS")
     @ApiParam(value = "源质量状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description")
     public Integer srcQcStatus;
 
-    @Column(name="SRC_SN_STATUS")
+    @Column(name = "SRC_SN_STATUS")
     @ApiParam(value = "源条码状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description")
     public Integer srcSnStatus;
 
-    @Column(name="DEST_QC_STATUS")
+    @Column(name = "DEST_QC_STATUS")
     @ApiParam(value = "目的质量状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description")
     public Integer descQcStatus;
 
-    @Column(name="DEST_SN_STATUS")
+    @Column(name = "DEST_SN_STATUS")
     @ApiParam(value = "目的条码状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description")
     public Integer destSnStatus;
 
-    @Column(name="DATE_CODE")
+    @Column(name = "DATE_CODE")
     @ApiParam("生产日期")
     public String dateCode;
 
-    @Column(name="FIX_LOT_NO")
+    @Column(name = "FIX_LOT_NO")
     @ApiParam("特殊批次")
     public String fixLotNo;
 
-    @Column(name="VENDOR_NO")
+    @Column(name = "VENDOR_NO")
     @ApiParam("供应商编号")
     private String vendorNo;
 
     @Transient
     @ApiParam("业务类型编码")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
     private Integer busiTypeCode;
 
-
     @Transient
     @ApiParam(value = "交易类型代码")
     private String transTypeCode;
@@ -176,9 +183,15 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("交易类型名称")
     private String transTypeName;
 
-    public WmsMoveSn(){}
+    @Version
+    @Column(name = "LOCK_VERSION")
+    @ApiParam(value = "乐观锁", example = "1")
+    public  Integer lockVersion;
+
+    public WmsMoveSn() {
+    }
 
-    public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){
+    public WmsMoveSn(String partNo, Long finishedCounts, Long waitingCounts) {
         this.partNo = partNo;
         this.waitingCounts = waitingCounts;
         this.finishedCounts = finishedCounts;
@@ -192,7 +205,7 @@ public class WmsMoveSn extends BaseBean {
         return finishedCounts == null ? 0L : this.finishedCounts;
     }
 
-    public WmsMoveSn(String partNo, String partNameRdd, Double destQty,Integer 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;
@@ -200,43 +213,47 @@ public class WmsMoveSn extends BaseBean {
         this.transTypeCode = transTypeCode;
         this.refSrc = refSrc;
     }
-    public WmsMoveSn(String partNo, String partNameRdd, Double destQty,String transTypeCode, String refSrc) {
+
+    public WmsMoveSn(String partNo, String partNameRdd, Double destQty, String transTypeCode, String refSrc) {
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
         this.destQty = destQty;
         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){
-            this.organizeCode=organizeCode;
-            this.orderNo=orderNo;
-            this.item=item;
-            this.partNo=partNo;
-            this.partNameRdd=partNameRdd;
-            this.transTypeCode=transTypeCode;
-            this.transTypeName=transTypeName;
-            this.itemStatus=itemStatus;
-            this.unit=unit;
-            this.srcLocateNo=srcLocateNo;
-            this.destLocateNo=destLocateNo;
-            this.srcQty=srcQty;
-            this.srcQty=srcQty;
-            this.destQty=destQty;
-            this.srcQcStatus=srcQcStatus;
-            this.descQcStatus=descQcStatus;
-            this.srcSnStatus=srcSnStatus;
-            this.destSnStatus=destSnStatus;
-            this.lotNo=lotNo;
-            this.dateCode=dateCode;
-            this.refSrc = refSrc;
-            this.destZoneNo = destZoneNo;
-            this.destWhNo =destWhNo;
-            this.busiTypeCode = busiTypeCode;
-            this.sn = sn;
-            this.createUser = createUser;
-            this.createDatetime = createDatetime;
-}
+
+    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 modifyDatetime, String modifyUser) {
+        this.organizeCode = organizeCode;
+        this.orderNo = orderNo;
+        this.item = item;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.transTypeCode = transTypeCode;
+        this.transTypeName = transTypeName;
+        this.itemStatus = itemStatus;
+        this.unit = unit;
+        this.srcLocateNo = srcLocateNo;
+        this.destLocateNo = destLocateNo;
+        this.srcQty = srcQty;
+        this.srcQty = srcQty;
+        this.destQty = destQty;
+        this.srcQcStatus = srcQcStatus;
+        this.descQcStatus = descQcStatus;
+        this.srcSnStatus = srcSnStatus;
+        this.destSnStatus = destSnStatus;
+        this.lotNo = lotNo;
+        this.dateCode = dateCode;
+        this.refSrc = refSrc;
+        this.destZoneNo = destZoneNo;
+        this.destWhNo = destWhNo;
+        this.busiTypeCode = busiTypeCode;
+        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/WmsPOMasterDetails.java

@@ -166,11 +166,12 @@ public class WmsPOMasterDetails extends BaseBean {
 
     public WmsPOMasterDetails(){}
 
-    public WmsPOMasterDetails(String orderNo,String containerNo,String partNo,Integer item,String organizeCode){
+    public WmsPOMasterDetails(String orderNo,String containerNo,String partNo,Integer item,String organizeCode,String erpAreaNo){
         this.orderNo = orderNo;
         this.containerNo = containerNo;
         this.partNo = partNo;
         this.item = item;
         this.organizeCode = organizeCode;
+        this.erpAreaNo = erpAreaNo;
     }
 }

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

@@ -92,7 +92,7 @@ public class WmsPart extends BaseBean {
 
     @ColumnDefault("2")
     @Column(name = "IQC")
-    @ApiParam(value = "收货检验否", example = "1")
+    @ApiParam(value = "是否免检", example = "1")
     private Integer iqc;
 
     @Column(name = "MIN")
@@ -143,6 +143,10 @@ public class WmsPart extends BaseBean {
     @ApiParam("结算供应商")
     private String outCloseVendor;
 
+    @Column(name = "QUALITY_DAYS")
+    @ApiParam("保质期天数")
+    private Integer qualityDays;
+
     @Transient
     @ApiParam("总数量")
     private Double qty;

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/WmsShipping.java

@@ -13,6 +13,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : 产品发运信息
@@ -26,94 +27,99 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_DOC_SHIPPING")
+@Table(name = "WMS_DOC_SHIPPING")
 @Api("产品发运信息")
 public class WmsShipping extends BaseBean {
 
     private static final long serialVersionUID = 5760351204320621363L;
-    @Column(name="ORDER_NO")
+    @Column(name = "ORDER_NO")
     @ApiParam("发运单号")
     public String orderNo;
 
-    @Column(name="PART_NO")
+    @Column(name = "PART_NO")
     @ApiParam("物料编码")
     public String partNo;
 
-    @Column(name="PART_NAME_RDD")
+    @Column(name = "PART_NAME_RDD")
     @ApiParam("物料名称")
     public String partNameRdd;
 
-    @Column(name="QTY")
+    @Column(name = "QTY")
     @ColumnDefault("0")
     @ApiParam(value = "需求数量", example = "0")
     public Double qty;
 
-    @Column(name="UNIT")
+    @Column(name = "UNIT")
     @ApiParam("单位")
     public String unit;
 
-    @Column(name="SN")
+    @Column(name = "SN")
     @ApiParam("条码")
     public String sn;
 
     /**
      * 状态:10=新建,20=已处理,30=处理出错
      */
-    @Column(name="ORDER_STATUS")
+    @Column(name = "ORDER_STATUS")
     @ApiParam(value = "状态", example = "10")
     public Integer orderStatus;
 
-    @Column(name="REMARK")
+    @Transient
+    @ApiParam(value = "状态")
+    public List<Integer> orderStatusList;
+
+    @Column(name = "REMARK")
     @ApiParam("备注")
     public String remark;
 
-    @Column(name="SRC")
+    @Column(name = "SRC")
     @ApiParam("单据来源")
     public String src;
 
-    @Column(name="CUST_NO")
+    @Column(name = "CUST_NO")
     @ApiParam("客户编码")
     public String custNo;
 
-    @Column(name="SHIPPING_FLAG")
+    @Column(name = "SHIPPING_FLAG")
     @ApiParam("特殊发货标志")
     public String shippingFlag;
 
-    @Column(name="SHIPPING_TIME")
+    @Column(name = "SHIPPING_TIME")
     @ApiParam("发运时间")
     public String shippingTime;
 
     @Transient
-    @ApiParam(value ="客户简称")
+    @ApiParam(value = "客户简称")
     private String custName;
 
     @Transient
     @ApiParam(value = "发往地简称")
     private String flagName;
 
-    @Column(name="AREA_NO")
+    @Column(name = "AREA_NO")
     @ApiParam("ERP库存地")
     public String areaNo;
 
-    @Column(name="CAR_NO")
+    @Column(name = "CAR_NO")
     @ApiParam("车号")
     public String carNo;
 
-    @Column(name="ERROR_MESSAGE")
+    @Column(name = "ERROR_MESSAGE")
     @ApiParam("错误信息")
     public String errorMessage;
 
-    @Column(name="IS_LOCK")
-    @ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定" )
+    @Column(name = "IS_LOCK")
+    @ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定")
     public Integer isLock;
 
-    @Column(name="ERP_SYNC_FLAG")
-    @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败" )
+    @Column(name = "ERP_SYNC_FLAG")
+    @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败")
     public Integer erpSyncFlag;
 
-    public WmsShipping(){}
+    public WmsShipping() {
+    }
 
-    public WmsShipping(Long id,Double qty, String carNo, String partNo, String partNameRdd, String custNo, String unit,String areaNo) {
+    public WmsShipping(Long id, Double qty, String carNo, String partNo, String partNameRdd, String custNo, String unit, String areaNo) {
         this.id = id;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;

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/bean/WmsTaskInfo.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;
@@ -56,6 +58,7 @@ public class WmsTaskInfo extends BaseBean {
      */
     @Column(name = "TASK_STATUS")
     @ApiParam(value = "任务状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TASK_INFO_STATUS.class,refForeignKey = "value",value = "description")
     public Integer taskStatus;
 
     @Column(name = "TRANS_TYPE_CODE")
@@ -68,10 +71,12 @@ public class WmsTaskInfo extends BaseBean {
 
     @Column(name = "IS_ONE_STEP")
     @ApiParam("是否一步法操作")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     public Integer isOneStep;
 
     @ApiParam("作业类型名称")
     @Transient
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OP_TYPE_CODE.class,refForeignKey = "value",value = "description")
     public String opTypeName;
 
     @ApiParam("作业任务明细")
@@ -80,6 +85,7 @@ public class WmsTaskInfo extends BaseBean {
 
     @Column(name = "IS_CHECK_SN")
     @ApiParam("是否校验条码")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     public Integer isCheckSn;
 
     @Transient

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

@@ -95,6 +95,11 @@ public class WmsZones extends BaseBean {
         this.zoneNo = zoneNo;
     }
 
+    public WmsZones(String zoneNo,String areaNo){
+        this.zoneNo = zoneNo;
+        this.areaNo = areaNo;
+    }
+
     public WmsZones(){}
 
 }

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

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.wms.bean.snapshot;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_CHECK_POINT")
+public class WmsCheckPoint extends BaseBean {
+
+    private static final long serialVersionUID = 5589497687871639189L;
+
+    @Column(name="SNAPSHOT_TIME")
+    @ApiParam("快照时间")
+    public String snapshotTime;
+}

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

@@ -0,0 +1,268 @@
+package cn.estsh.i3plus.pojo.wms.bean.snapshot;
+
+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;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 库存移动单明细信息
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_MOVE_DETAILS_SNAPSHOT", indexes = {
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "SNAPSHOT_TIME")
+})
+@Api("库存移动单明细信息")
+public class WmsMoveDetailsSnapshot extends BaseBean {
+
+    private static final long serialVersionUID = -4095410692227226944L;
+
+    @Column(name="SNAPSHOT_TIME")
+    @ApiParam("快照时间")
+    public String snapshotTime;
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name="ITEM")
+    @ApiParam(value = "行号", example = "0")
+    public Integer item;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name="VENDOR_NO")
+    @ApiParam("供应商编号")
+    public String vendorNo;
+
+    @Column(name="CUST_NO")
+    @ApiParam("客户编号")
+    public String custNo;
+
+    @Column(name="TRANS_QTY")
+    @ApiParam(value = "处理数量", example = "0")
+    public Double transQty;
+
+    public Double getTransQty(){
+        return this.transQty == null ? 0 : this.transQty.doubleValue();
+    }
+
+    @Column(name="REJECT_QTY")
+    @ApiParam(value = "不合格处理数量", example = "0")
+    public Double rejectQty;
+
+    public Double getRejectQty(){
+        return this.rejectQty == null ? 0 : this.rejectQty.doubleValue();
+    }
+
+    @Column(name="UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    @Column(name="SRC_WH_NO")
+    @ApiParam("源仓库代码")
+    public String srcWhNo;
+
+    @Column(name="SRC_ZONE_NO")
+    @ApiParam("源存储区代码")
+    public String srcZoneNo;
+
+    @Column(name="SRC_LOCATE_NO")
+    @ApiParam("源库位代码")
+    public String srcLocateNo;
+
+    @Column(name="DEST_WH_NO")
+    @ApiParam("目标仓库代码")
+    public String destWhNo;
+
+    @Column(name="DEST_ZONE_NO")
+    @ApiParam("目标存储区代码")
+    public String destZoneNo;
+
+    @Column(name="DEST_LOCATE_NO")
+    @ApiParam("目标库位代码")
+    public String destLocateNo;
+
+    /**
+     * 状态:1=创建,10=待处理,20=已处理
+     */
+    @Column(name="ITEM_STATUS")
+    @ApiParam(value = "状态", example = "0")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
+    public Integer itemStatus;
+
+    @Column(name="REF_ITEM")
+    @ApiParam("关联单据行号")
+    public String refItem;
+
+    /**
+     * ASN,PO,SO
+     */
+    @Column(name="REF_TYPE")
+    @ApiParam("关联单据类型")
+    public String refType;
+
+    @Column(name="REF_SRC")
+    @ApiParam("关联单号")
+    public String refSrc;
+
+    @ApiParam(value = "待出库数量", example = "0")
+    @Transient
+    private Long waitingCounts;
+
+    @ApiParam(value = "已出库数量", example = "0")
+    @Transient
+    private Long finishedCounts;
+
+    @Transient
+    @ApiParam("交易类型")
+    private String transTypeCode;
+
+    @Transient
+    @ApiParam("erp库存地")
+    private String ZoneNo;
+
+    @Transient
+    @ApiParam("条码")
+    private String sn;
+
+    @Transient
+    @ApiParam("交易类型名称")
+    private String transTypeName;
+
+    @Transient
+    @ApiParam("业务类型编码")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
+    private Integer busiTypeCode;
+
+    @Transient
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @Transient
+    @ApiParam("父物料编码")
+    private String fpartNo;
+
+    @Transient
+    @ApiParam("父物料名称")
+    private String fpartName;
+
+    @Transient
+    @ApiParam("数量")
+    private Double qty;
+
+    @Transient
+    @ApiParam("创建时间")
+    private String createDateTime;
+
+    @Version
+    @Column(name = "LOCK_VERSION")
+    @ApiParam(value = "乐观锁", example = "1")
+    public transient Integer lockVersion;
+   /* @JSONField(name="fPartNo")
+    public String getfPartNo() {
+        return fPartNo;
+    }
+
+    @JSONField(name="fPartName")
+    public String getfPartName() {
+        return fPartName;
+    }*/
+
+    public WmsMoveDetailsSnapshot(){}
+
+    public WmsMoveDetailsSnapshot(String partNo, Long waitingCounts , Long finishedCounts){
+        this.partNo = partNo;
+        this.waitingCounts = waitingCounts;
+        this.finishedCounts = finishedCounts;
+    }
+
+    public WmsMoveDetailsSnapshot(String partNo, double transQty){
+        this.partNo = partNo;
+        this.transQty = transQty;
+    }
+
+    public WmsMoveDetailsSnapshot(String orderNo){
+        this.orderNo = orderNo;
+    }
+
+    public Long getWaitingCounts() {
+        return waitingCounts == null ? 0L : this.waitingCounts;
+    }
+
+    public Long getFinishedCounts() {
+        return finishedCounts == null ? 0L : this.finishedCounts;
+    }
+
+    public WmsMoveDetailsSnapshot(String organizeCode, String partNo, String partNameRdd, String workCenterCode, String fPartNo, String fPartName, String unit, Double qty,
+                                  String createDateTime, String sn, String srcZoneNo){
+        this.organizeCode = organizeCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.workCenterCode = workCenterCode;
+        this.fpartNo = fPartNo;
+        this.fpartName = fPartName;
+        this.unit = unit;
+        this.qty = qty;
+        this.createDateTime = createDateTime;
+        this.sn = sn;
+        this.srcZoneNo = srcZoneNo;
+
+    }
+
+    public WmsMoveDetailsSnapshot(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, Integer busiTypeCode,
+                                  String createUser, String createDatetime, String modifyUser, String modifyDatetime){
+        this.organizeCode = organizeCode;
+        this.partNo = partNo;
+        this.orderNo = orderNo;
+        this.item = item;
+        this.partNameRdd = partNameRdd;
+        this.transTypeCode = transTypeCode;
+        this.transTypeName = transTypeName;
+        this.itemStatus = itemStatus;
+        this.unit = unit;
+        this.srcWhNo = srcWhNo;
+        this.destWhNo = destWhNo;
+        this.srcZoneNo = srcZoneNo;
+        this.destZoneNo = destZoneNo;
+        this.srcLocateNo = srcLocateNo;
+        this.destLocateNo = destLocateNo;
+        this.transQty = transQty;
+        this.rejectQty = rejectQty;
+        this.refSrc = refSrc;
+        this.vendorNo = vendorNo;
+        this.custNo = custNo;
+        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/snapshot/WmsMoveMasterSnapshot.java

@@ -0,0 +1,209 @@
+package cn.estsh.i3plus.pojo.wms.bean.snapshot;
+
+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;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 库存移动单主表信息
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_MOVE_MASTER_SNAPSHOT", indexes = {
+        @Index(columnList = "TRANS_TYPE_CODE"),
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "SNAPSHOT_TIME")
+})
+@Api("库存移动单主表信息")
+public class WmsMoveMasterSnapshot extends BaseBean {
+
+    private static final long serialVersionUID = 3569874772643448726L;
+
+    @Column(name="SNAPSHOT_TIME")
+    @ApiParam("快照时间")
+    public String snapshotTime;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    /**
+     * 状态:1=创建,10=待处理,20=已处理
+     */
+    @Column(name = "ORDER_STATUS")
+    @ApiParam(value = "状态", example = "0")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
+    public Integer orderStatus;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    public String remark;
+
+    @Column(name = "TRANS_TYPE_CODE")
+    @ApiParam(value = "交易类型代码")
+    private String transTypeCode;
+
+    @Lob
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam(value = "错误信息")
+    private String errorMessage;
+
+    @Column(name="IS_URGENT")
+    @ApiParam(value = "是否紧急", example = "0")
+    public Integer isUrgent;
+
+    @Column(name = "CAR_NO")
+    @ApiParam(value = "车牌号")
+    private String carNo;
+
+    @Column(name = "BUSI_TYPE_CODE")
+    @ApiParam(value = "业务类型编码")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
+    private Integer busiTypeCode;
+
+    @Column(name = "REF_ORDER_NO")
+    @ApiParam("关联移动单号")
+    public String refOrderNo;
+
+    @Transient
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Transient
+    @ApiParam("状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
+    private Integer itemStatus;
+
+    @Transient
+    @ApiParam("erp库存地")
+    private String ZoneNo;
+
+    @Transient
+    @ApiParam("关联单号")
+    private String refSrc;
+
+    @Transient
+    @ApiParam("目标仓库")
+    private String destWhNo;
+
+    @Transient
+    @ApiParam("存储区")
+    private String destZoneNo;
+
+    @Transient
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Transient
+    @ApiParam("条码")
+    private String sn;
+
+    @Transient
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Transient
+    @ApiParam("单位")
+    private String unit;
+
+    @Transient
+    @ApiParam("源仓库")
+    private String srcWhNo;
+
+    @Transient
+    @ApiParam("源存储区代码")
+    private String srcZoneNo;
+
+    @Transient
+    @ApiParam("处理数量")
+    private Double transQty;
+
+    @Transient
+    @ApiParam("不合格处理数量")
+    private Double rejectQty;
+
+    @Transient
+    @ApiParam("库位")
+    private String destLocateNo;
+
+    @Transient
+    @ApiParam("交易类型名称")
+    private String transTypeName;
+
+    @Column(name="FIX_ID")
+    @ApiParam(value = "设备编号")
+    public String fixId;
+
+    @Version
+    @Column(name = "LOCK_VERSION")
+    @ApiParam(value = "乐观锁", example = "1")
+    public transient Integer lockVersion;
+
+    public WmsMoveMasterSnapshot(){};
+
+    public WmsMoveMasterSnapshot(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 WmsMoveMasterSnapshot(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 createDatetime, String createUser, String modifyUser, String modifyDatetime) {
+        this.id = id;
+        this.orderNo = orderNo;
+        this.organizeCode = organizeCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.transTypeCode = transTypeCode;
+        this.transTypeName = transTypeName;
+        this.itemStatus = itemStatus;
+        this.unit = unit;
+        this.srcWhNo = srcWhNo;
+        this.srcZoneNo = srcZoneNo;
+        this.destWhNo = destWhNo;
+        this.destZoneNo = destZoneNo;
+        this.transQty = transQty;
+        this.rejectQty = rejectQty;
+        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/snapshot/WmsMoveSnSnapshot.java

@@ -0,0 +1,265 @@
+package cn.estsh.i3plus.pojo.wms.bean.snapshot;
+
+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;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 库存移动单条码信息
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_MOVE_SN_SNAPSHOT", indexes = {
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "SN"),
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "SNAPSHOT_TIME")
+})
+@Api("库存移动单条码信息")
+public class WmsMoveSnSnapshot extends BaseBean {
+
+    private static final long serialVersionUID = 2588101374261238353L;
+
+    @Column(name="SNAPSHOT_TIME")
+    @ApiParam("快照时间")
+    public String snapshotTime;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name = "ITEM")
+    @ApiParam("行号")
+    public Integer item;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name = "UNIT")
+    @ApiParam(value = "单位")
+    public String unit;
+
+    @Column(name = "SN")
+    @ApiParam("条码")
+    public String sn;
+
+    @Column(name = "CSN")
+    @ApiParam("客户条码")
+    public String csn;
+
+    /**
+     * 状态:1=创建,10=待处理,20=已处理
+     */
+    @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")
+    @ApiParam("备注")
+    public String remark;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("批次编号")
+    public String lotNo;
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam("容器编号")
+    public String packAgeNo;
+
+    @Column(name = "SRC_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "源数量", example = "0")
+    public Double srcQty;
+
+    @Column(name = "SRC_WH_NO")
+    @ApiParam("源仓库代码")
+    public String srcWhNo;
+
+    @Column(name = "SRC_ZONE_NO")
+    @ApiParam("源存储区代码")
+    public String srcZoneNo;
+
+    @Column(name = "SRC_LOCATE_NO")
+    @ApiParam("源库位代码")
+    public String srcLocateNo;
+
+    @Column(name = "DEST_WH_NO")
+    @ApiParam("目标仓库代码")
+    public String destWhNo;
+
+    @Column(name = "DEST_ZONE_NO")
+    @ApiParam("目标存储区代码")
+    public String destZoneNo;
+
+    @Column(name = "DEST_LOCATE_NO")
+    @ApiParam("目标库位代码")
+    public String destLocateNo;
+
+    @ApiParam("待上架箱数")
+    @Transient
+    private Long waitingCounts;
+
+    @ApiParam("已上架箱数")
+    @Transient
+    private Long finishedCounts;
+
+    @Column(name = "DEST_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "目标数量", example = "0")
+    public Double destQty;
+
+    @Column(name = "QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "数量", example = "0")
+    public Double qty;
+
+    @Column(name = "SRC_QC_STATUS")
+    @ApiParam(value = "源质量状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description")
+    public Integer srcQcStatus;
+
+    @Column(name = "SRC_SN_STATUS")
+    @ApiParam(value = "源条码状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description")
+    public Integer srcSnStatus;
+
+    @Column(name = "DEST_QC_STATUS")
+    @ApiParam(value = "目的质量状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description")
+    public Integer descQcStatus;
+
+    @Column(name = "DEST_SN_STATUS")
+    @ApiParam(value = "目的条码状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description")
+    public Integer destSnStatus;
+
+    @Column(name = "DATE_CODE")
+    @ApiParam("生产日期")
+    public String dateCode;
+
+    @Column(name = "FIX_LOT_NO")
+    @ApiParam("特殊批次")
+    public String fixLotNo;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商编号")
+    private String vendorNo;
+
+    @Transient
+    @ApiParam("业务类型编码")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer busiTypeCode;
+
+    @Transient
+    @ApiParam(value = "交易类型代码")
+    private String transTypeCode;
+
+    @Transient
+    @ApiParam("关联单号")
+    public String refSrc;
+
+    @Transient
+    @ApiParam("erp库存地")
+    private String ZoneNo;
+
+    @Transient
+    @ApiParam("交易类型名称")
+    private String transTypeName;
+
+    @Version
+    @Column(name = "LOCK_VERSION")
+    @ApiParam(value = "乐观锁", example = "1")
+    public transient Integer lockVersion;
+
+    public WmsMoveSnSnapshot() {
+    }
+
+    public WmsMoveSnSnapshot(String partNo, Long finishedCounts, Long waitingCounts) {
+        this.partNo = partNo;
+        this.waitingCounts = waitingCounts;
+        this.finishedCounts = finishedCounts;
+    }
+
+    public Long getWaitingCounts() {
+        return waitingCounts == null ? 0L : this.waitingCounts;
+    }
+
+    public Long getFinishedCounts() {
+        return finishedCounts == null ? 0L : this.finishedCounts;
+    }
+
+    public WmsMoveSnSnapshot(String partNo, String partNameRdd, Double destQty, Integer busiTypeCode, String transTypeCode, String refSrc) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.destQty = destQty;
+        this.busiTypeCode = busiTypeCode;
+        this.transTypeCode = transTypeCode;
+        this.refSrc = refSrc;
+    }
+
+    public WmsMoveSnSnapshot(String partNo, String partNameRdd, Double destQty, String transTypeCode, String refSrc) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.destQty = destQty;
+        this.transTypeCode = transTypeCode;
+        this.refSrc = refSrc;
+    }
+
+    public WmsMoveSnSnapshot(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 modifyDatetime, String modifyUser) {
+        this.organizeCode = organizeCode;
+        this.orderNo = orderNo;
+        this.item = item;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.transTypeCode = transTypeCode;
+        this.transTypeName = transTypeName;
+        this.itemStatus = itemStatus;
+        this.unit = unit;
+        this.srcLocateNo = srcLocateNo;
+        this.destLocateNo = destLocateNo;
+        this.srcQty = srcQty;
+        this.srcQty = srcQty;
+        this.destQty = destQty;
+        this.srcQcStatus = srcQcStatus;
+        this.descQcStatus = descQcStatus;
+        this.srcSnStatus = srcSnStatus;
+        this.destSnStatus = destSnStatus;
+        this.lotNo = lotNo;
+        this.dateCode = dateCode;
+        this.refSrc = refSrc;
+        this.destZoneNo = destZoneNo;
+        this.destWhNo = destWhNo;
+        this.busiTypeCode = busiTypeCode;
+        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/snapshot/WmsStockQuanSnapshot.java

@@ -0,0 +1,292 @@
+package cn.estsh.i3plus.pojo.wms.bean.snapshot;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.wms.bean.WmsLocate;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.util.List;
+
+/**
+ * @Description : 库存信息
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2018-11-02 11:06
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "WMS_STOCK_QUAN_SNAPSHOT", indexes = {
+        @Index(columnList = "WH_NO"),
+        @Index(columnList = "ZONE_NO"),
+        @Index(columnList = "LOCATE_NO"),
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "SNAPSHOT_TIME")
+})
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value = "库存信息", description = "库存信息")
+public class WmsStockQuanSnapshot extends BaseBean {
+
+    private static final long serialVersionUID = 8335719859185712904L;
+
+    @Column(name="SNAPSHOT_TIME")
+    @ApiParam("快照时间")
+    public String snapshotTime;
+
+    @Column(name = "WH_NO")
+    @ApiParam(value = "仓库代码")
+    private String whNo;
+
+    @Column(name = "ZONE_NO")
+    @ApiParam(value = "存储区编号")
+    private String zoneNo;
+
+    @Column(name = "LOCATE_NO")
+    @ApiParam(value = "库位代码")
+    private String locateNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编号")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam(value = "物料名称")
+    private String partNameRdd;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    @Column(name = "CUST_NO")
+    @ApiParam(value = "客户编码")
+    private String custNo;
+
+    @Transient
+    @ApiParam(value = "项目代码")
+    private String prodCfgTypeCode;
+
+    @Transient
+    @ApiParam(value = "含0库存显示")
+    private Boolean includeZeroStock = false;
+
+    @Transient
+    @ColumnDefault("0")
+    @ApiParam(value = "库存数量总和")
+    private Double sumQty;
+
+    @Transient
+    @ApiParam(value = "库位信息")
+    private WmsLocate wmsLocate;
+
+
+    @Column(name = "QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "可用数量", example = "0")
+    public Double qty;
+
+    @Column(name = "FAIL_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "不合格数量", example = "0")
+    private Double failQty;
+
+    @Column(name = "HOLD_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "隔离数量", example = "0")
+    private Double holdQty;
+
+    @Column(name = "QC_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "质检中数量", example = "0")
+    private Double qcQty;
+
+    @Column(name = "RIN_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "待入库数量", example = "0")
+    private Double rinQty;
+
+    @Column(name = "FREEZE_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "冻结数量", example = "0")
+    private Double freezeQty;
+
+    @Column(name = "CONSIGN_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "寄售数量", example = "0")
+    private Double consignQty;
+
+    @Column(name = "LOCK_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "锁定数量", example = "0")
+    private Double lockQty;
+
+    @Column(name = "SCRAP_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "报废数量", example = "0")
+    private Double scrapQty;
+
+    @Transient
+    @ApiParam(value = "总数量")
+    private Double totalQty;
+
+    @Transient
+    @ApiParam(value = "项目名称")
+    private String prodCfgTypeName;
+
+    @Transient
+    @ApiParam(value = "箱数", example = "-1")
+    private Integer boxQty;
+
+    @Transient
+    @ApiParam(value = "零件数", example = "-1")
+    private Double partQty;
+
+    @Transient
+    @ApiParam(value = "ERP库存地")
+    private String areaNo;
+
+    @Transient
+    @ApiParam(value = "存储区集合")
+    private List<String> zoneList;
+
+    @Transient
+    @ApiParam(value = "移动单条码集合")
+    private List<WmsMoveSnSnapshot> wmsMoveSnList;
+
+
+    public String getAreaNo() {
+        return areaNo;
+    }
+
+    public Double getQtyVal() {
+        return this.qty == null ? 0 : this.qty;
+    }
+
+    public Double getFailQtyVal() {
+        return this.failQty == null ? 0 : this.failQty;
+    }
+
+    public Double getHoldQtyVal() {
+        return this.holdQty == null ? 0 : this.holdQty;
+    }
+
+    public Double getQcQtyVal() {
+        return this.qcQty == null ? 0 : this.qcQty;
+    }
+
+    public Double getRinQtyVal() {
+        return this.rinQty == null ? 0 : this.rinQty;
+    }
+
+    public Double getFreezeQtyVal() {
+        return this.freezeQty == null ? 0 : this.freezeQty;
+    }
+
+    public Double getConsignQtyVal() {
+        return this.consignQty == null ? 0 : this.consignQty;
+    }
+
+    public Double getLockQtyVal() {
+        return this.lockQty == null ? 0 : this.lockQty;
+    }
+
+    public Double getScrapQtyVal() {
+        return this.scrapQty == null ? 0 : this.scrapQty;
+    }
+
+    public Double getTotalVal() {
+        return this.totalQty == null ? 0 : this.totalQty;
+    }
+
+    public Double getPartQtyVal() {
+        return this.partQty == null ? 0 : this.partQty;
+    }
+
+    public Integer getBoxQtyVal() {
+        return this.boxQty == null ? 0 : this.boxQty;
+    }
+
+    public WmsStockQuanSnapshot() {
+    }
+
+    public WmsStockQuanSnapshot(String whNo, String zoneNo, String unit, String partNo, String partName,
+                                Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty,
+                                Double consignQty, Double lockQty, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) {
+        this.whNo = whNo;
+        this.zoneNo = zoneNo;
+        this.partNo = partNo;
+        this.partNameRdd = partName;
+        this.unit = unit;
+        this.qty = qty;
+        this.failQty = failQty;
+        this.holdQty = holdQty;
+        this.qcQty = qcQty;
+        this.rinQty = rinQty;
+        this.freezeQty = freezeQty;
+        this.consignQty = consignQty;
+        this.lockQty = lockQty;
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.prodCfgTypeName = prodCfgTypeName;
+        this.scrapQty = scrapQty;
+    }
+
+    public WmsStockQuanSnapshot(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) {
+        this.qty = qty;
+        this.failQty = failQty;
+        this.holdQty = holdQty;
+        this.qcQty = qcQty;
+        this.rinQty = rinQty;
+        this.freezeQty = freezeQty;
+        this.consignQty = consignQty;
+        this.lockQty = lockQty;
+        this.scrapQty = scrapQty;
+    }
+
+    public WmsStockQuanSnapshot(String locateNo, Integer boxQty, Double partQty, String partNo, String partNameRdd, String unit,
+                                Double sumQty, Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) {
+        this.locateNo = locateNo;
+        this.boxQty = boxQty;
+        this.partQty = partQty;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.unit = unit;
+        this.sumQty = sumQty;
+        this.qty = qty;
+        this.failQty = failQty;
+        this.holdQty = holdQty;
+        this.qcQty = qcQty;
+        this.rinQty = rinQty;
+        this.freezeQty = freezeQty;
+        this.consignQty = consignQty;
+        this.lockQty = lockQty;
+        this.scrapQty = scrapQty;
+    }
+
+    public WmsStockQuanSnapshot(String whNo, String zoneNo, String locateNo, Integer boxQty, Double partQty, String partNo, String partNameRdd, String unit,
+                                Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) {
+        this.whNo = whNo;
+        this.zoneNo = zoneNo;
+        this.locateNo = locateNo;
+        this.boxQty = boxQty;
+        this.partQty = partQty;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.unit = unit;
+        this.qty = qty;
+        this.failQty = failQty;
+        this.holdQty = holdQty;
+        this.qcQty = qcQty;
+        this.rinQty = rinQty;
+        this.freezeQty = freezeQty;
+        this.consignQty = consignQty;
+        this.lockQty = lockQty;
+        this.scrapQty = scrapQty;
+    }
+}

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

@@ -0,0 +1,268 @@
+package cn.estsh.i3plus.pojo.wms.bean.snapshot;
+
+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;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.*;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description : 库存条码信息
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2018-11-17 14:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "WMS_STOCK_SN_SNAPSHOT", indexes = {
+        @Index(columnList = "PACKAGE_NO"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "REF_SRC"),
+        @Index(columnList = "SN"),
+        @Index(columnList = "SN_2D"),
+        @Index(columnList = "WH_NO"),
+        @Index(columnList = "ZONE_NO"),
+        @Index(columnList = "LOCATE_NO"),
+        @Index(columnList = "LOT_NO"),
+        @Index(columnList = "FIX_LOT_NO"),
+        @Index(columnList = "DATE_CODE"),
+        @Index(columnList = "VENDOR_NO"),
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "SNAPSHOT_TIME")
+        })
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value = "库存条码信息", description = "库存条码信息")
+public class WmsStockSnSnapshot extends BaseBean {
+
+    private static final long serialVersionUID = 8641922373097608315L;
+
+    @Column(name="SNAPSHOT_TIME")
+    @ApiParam("快照时间")
+    public String snapshotTime;
+
+    @Column(name = "WH_NO")
+    @ApiParam(value = "仓库代码")
+    private String whNo;
+
+    @Column(name = "ZONE_NO")
+    @ApiParam(value = "存储区编号")
+    private String zoneNo;
+
+    @Column(name = "LOCATE_NO")
+    @ApiParam(value = "库位代码")
+    private String locateNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编号")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam(value = "物料名称")
+    private String partNameRdd;
+
+    @Column(name = "LOT_NO", nullable = false)
+    @ApiParam("收货日期（批次编码）")
+    public String lotNo = "";
+
+    @Column(name = "DATE_CODE", nullable = false)
+    @ApiParam(value = "生产日期")
+    public String dateCode = "";
+
+    @Column(name = "LEFT_CODE", nullable = false)
+    @ApiParam(value = "有效期")
+    private String leftCode = "";
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编码")
+    public String vendorNo;
+
+    @Column(name = "FIX_LOT_NO", nullable = false)
+    @ApiParam(value = "特殊批次")
+    private String fixLotNo = "";
+
+    @Column(name = "CUST_NO")
+    @ApiParam(value = "客户编码")
+    private String custNo;
+
+    @Column(name = "SHIPPING_FLAG")
+    @ApiParam(value = "发往地")
+    private String shippingFlag;
+
+    @Column(name = "SN")
+    @ApiParam(value = "条码")
+    private String sn;
+
+    @Column(name = "SN_2D")
+    @ApiParam(value = "二维码")
+    private String sn2d;
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam(value = "包装编号")
+    private String packageNo;
+
+    @Column(name = "UNIT")
+    @ApiParam(value = "单位")
+    private String unit;
+
+    @Column(name = "QTY")
+    @ApiParam(value = "数量", example = "0")
+    private Double qty = 0d;
+
+    /**
+     * 质量状态:10=合格,20=不合格,30=隔离
+     */
+    @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")
+    @ApiParam(value = "打印时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date pdate;
+    /**
+     * 1=ASN,10=PO,20=SO
+     */
+    @Column(name = "REF_TYPE")
+    @ApiParam(value = "关联单据类型")
+    private String refType;
+
+    @Column(name = "REF_SRC")
+    @ApiParam(value = "关联单号")
+    private String refSrc;
+
+    @Column(name = "CUST_SN")
+    @ApiParam(value = "客户条码")
+    private String custSn;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "工作中心代码")
+    private String workCenterCode;
+
+    @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 = "仓库名称")
+    @Transient
+    public String whNameRdd;
+
+    @ApiParam(value = "存储区名称")
+    @Transient
+    public String zoneNameRdd;
+
+    @ApiParam(value = "库位名称")
+    @Transient
+    public String locateNameRdd;
+
+    @ApiParam(value = "物料类型描述")
+    @Transient
+    public String partTypeDesc;
+
+    @ApiParam(value = "客户名称")
+    @Transient
+    public String custNameRdd;
+
+    @ApiParam(value = "供应商名称")
+    @Transient
+    public String vendorNameRdd;
+
+    @ApiParam(value = "二维码内容")
+    @Transient
+    public String barCode;
+
+    @ApiParam(value = "散件质检输入不良数量")
+    @Transient
+    public Double inputNCQty;
+
+    @ApiParam(value = "前端散件表格是否编辑")
+    @Transient
+    public Boolean isSet = false;
+
+    @ApiParam(value = "加减库容标志")
+    @Transient
+    public Boolean isAdd;
+
+    @ApiParam(value = "项目名称")
+    @Transient
+    public String prodCfgTypeName;
+
+    @ApiParam(value = "标签编号")
+    @Transient
+    public String labelNo;
+
+    @Transient
+    @ApiParam(value = "工厂名称")
+    public String organizeName;
+
+    @Transient
+    @ApiParam(value = "物料数量总和")
+    public Double sumPartQty;
+
+    @Transient
+    @ApiParam(value = "条码数量总和")
+    public Long snCount;
+
+    @Transient
+    @ApiParam(value = "物料编码集合")
+    public List<String> partNoList;
+
+    @Transient
+    @ApiParam(value = "ERP库存地集合")
+    public List<String> erpZoneNoList;
+
+    @Transient
+    @ApiParam(value = "ERP库存地")
+    public String erpZoneNo;
+
+    @Transient
+    @ApiParam(value = "目标数量")
+    public Double destQty;
+
+    public WmsStockSnSnapshot(){}
+
+    public WmsStockSnSnapshot(String partNo){
+        this.partNo = partNo;
+    }
+
+    public Integer getSnType() { return snType == null ? 0 : snType.intValue();}
+
+    public Double getQty() {
+        return qty == null ? 0L : qty.doubleValue();
+    }
+
+    public Double getInputNCQty(){return inputNCQty == null ? 0L : this.inputNCQty.doubleValue();}
+
+    public WmsStockSnSnapshot(Long snCount, Double sumPartQty, String locateNo) {
+        this.snCount = snCount;
+        this.sumPartQty = sumPartQty;
+        this.locateNo = locateNo;
+    }
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SwebProcurementPlanOrderRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.SwebProcurementPlanOrder;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-09-09 14:49
+ * @Modify:
+ **/
+@Repository
+public interface SwebProcurementPlanOrderRepository extends BaseRepository<SwebProcurementPlanOrder, Long> {
+}

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

@@ -45,19 +45,18 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
 
         DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", hqlStr);
-        if(StringUtils.isNotBlank(bean.getCreateDateTimeStart())&&StringUtils.isNotBlank(bean.getCreateDateTimeEnd())){
-            DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd(),"createDatetime",hqlStr,true);
+        if (StringUtils.isNotBlank(bean.getCreateDateTimeStart()) && StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true);
         }
 
         return hqlStr;
     }
 
     /**
-     *
      * @param wmsFix
      * @return
      */
-    public static DdlPackBean packHqlWmsFix(WmsFix wmsFix){
+    public static DdlPackBean packHqlWmsFix(WmsFix wmsFix) {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
@@ -77,9 +76,10 @@ public class WmsHqlPack {
 
     /**
      * 单位换算 分页查询
+     *
      * @return
      */
-    public static DdlPackBean packHqlWmsUnitConvertByPager(WmsUnitConvert wmsUnitConvert){
+    public static DdlPackBean packHqlWmsUnitConvertByPager(WmsUnitConvert wmsUnitConvert) {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
@@ -175,11 +175,12 @@ public class WmsHqlPack {
 
     /**
      * 移库单号集合查询条件封装
+     *
      * @param orderNoList
      * @param organizeCode
      * @return
      */
-    public static DdlPackBean packWmsDocMovementMasterByOrderNos(List<String> orderNoList,String organizeCode) {
+    public static DdlPackBean packWmsDocMovementMasterByOrderNos(List<String> orderNoList, String organizeCode) {
         DdlPackBean packBean = new DdlPackBean();
         DdlPreparedPack.getInPack(orderNoList, "orderNo", packBean);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
@@ -616,6 +617,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsShipping.getSn(), "sn", result);
         //发运状态
         DdlPreparedPack.getNumEqualPack(wmsShipping.getOrderStatus(), "orderStatus", result);
+        //发运状态集合
+        DdlPreparedPack.getInPackList(wmsShipping.getOrderStatusList(), "orderStatus", result);
         //特殊发货标志
         DdlPreparedPack.getStringEqualPack(wmsShipping.getShippingFlag(), "shippingFlag", result);
         //单据来源
@@ -1305,6 +1308,10 @@ public class WmsHqlPack {
 
         //查询参数封装
         DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getLocateNo(), "locateNo", result);
+        DdlPreparedPack.getInPackArray(wmsCSOrderDetails.getZoneNos(), "zoneNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getSn(), "sn", result);
 
         getStringBuilderPack(wmsCSOrderDetails, result);
 
@@ -1323,6 +1330,9 @@ public class WmsHqlPack {
         //查询参数封装
         DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getLocateNo(), "locateNo", result);
+        DdlPreparedPack.getInPackArray(wmsCSFactTrans.getZoneNos(), "zoneNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getSn(), "sn", result);
 
         getStringBuilderPack(wmsCSFactTrans, result);
 
@@ -2063,11 +2073,11 @@ public class WmsHqlPack {
 
         DdlPreparedPack.getStringEqualPack(wmsCSRange.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSRange.getPartNo(), "partNo", result);
-        DdlPreparedPack.getNumEqualPack(wmsCSRange.getLocateNo(), "locateNo", result);
-        DdlPreparedPack.getStringLikerPack(wmsCSRange.getZoneNo(), "zoneNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSRange.getLocateNo(), "locateNo", result);
+        DdlPreparedPack.getInPackArray(wmsCSRange.getZoneNos(), "zoneNo", result);
 
         DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{
-                DdlPreparedPack.getOrderColConvertType("item",CommonEnumUtil.BASIS_TYPE.INT.getValue())}, result);
+                DdlPreparedPack.getOrderColConvertType("item", CommonEnumUtil.BASIS_TYPE.INT.getValue())}, result);
         getStringBuilderPack(wmsCSRange, result);
 
         return result;
@@ -2240,19 +2250,19 @@ public class WmsHqlPack {
 
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result);
         // 库位不为空
-        DdlPreparedPack.getStringNotNullPack( "locateNo", result);
-        DdlPreparedPack.getStringNoEqualPack("","locateNo", result);
+        DdlPreparedPack.getStringNotNullPack("locateNo", result);
+        DdlPreparedPack.getStringNoEqualPack("", "locateNo", result);
         // 排除创建及出库状态条码
-        if(wmsStockSn.getSnStatus() != null){
+        if (wmsStockSn.getSnStatus() != null) {
             DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
         }
-        DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(),"snStatus",result);
-        DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(),"snStatus",result);
+        DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(), "snStatus", result);
+        DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(), "snStatus", result);
 
-        DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(),"snType",result);
+        DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result);
 
         //数量大于0
-        DdlPreparedPack.getNumberBiggerPack(0,"qty",result);
+        DdlPreparedPack.getNumberBiggerPack(0, "qty", result);
         DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
@@ -2282,13 +2292,13 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(actionLog.getIsValid(), "isValid", packBean);
         DdlPreparedPack.getNumEqualPack(actionLog.getIsDeleted(), "isDeleted", packBean);
 
-        if((actionLog.getStartTimeStart() != null&&actionLog.getStartTimeStart() !="")
-                || (actionLog.getStartTimeEnd() != null&&actionLog.getStartTimeEnd() != "")){
+        if ((actionLog.getStartTimeStart() != null && actionLog.getStartTimeStart() != "")
+                || (actionLog.getStartTimeEnd() != null && actionLog.getStartTimeEnd() != "")) {
             DdlPreparedPack.timeBuilder(actionLog.getStartTimeStart(), actionLog.getStartTimeEnd(), "startTime", packBean, true);
         }
 
-        if((actionLog.getEndTimeStart() != null&&actionLog.getEndTimeStart() != "")
-                || (actionLog.getEndTimeEnd() != null&&actionLog.getEndTimeEnd() != "")){
+        if ((actionLog.getEndTimeStart() != null && actionLog.getEndTimeStart() != "")
+                || (actionLog.getEndTimeEnd() != null && actionLog.getEndTimeEnd() != "")) {
             DdlPreparedPack.timeBuilder(actionLog.getEndTimeStart(), actionLog.getEndTimeEnd(), "endTime", packBean, true);
         }
 
@@ -2332,9 +2342,10 @@ public class WmsHqlPack {
 
     /**
      * 单位换算 分页查询
+     *
      * @return
      */
-    public static DdlPackBean packHqlWmsStockInitializeByPager(WmsStockInitialize wmsStockInitialize){
+    public static DdlPackBean packHqlWmsStockInitializeByPager(WmsStockInitialize wmsStockInitialize) {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装