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

5 years ago · 0e84990f3c
parent 20f6961daf 34e4d837af
commit 0e84990f3c
54 changed files with 260 additions and 41 deletions
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/modules/i3plus-pojo-andon/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
@ -53,11 +53,6 @@ public class ProductOrder extends BaseOrder {
    @ApiParam(value ="指定工艺路线")
    private String specifyRouting;

-    @Column(name="RESYNCHRONIZE")
-    @ApiParam(value ="是否同步")
-    @FieldAnnotation(defaultValue = "true")
-    private Boolean resynchronize;
-
    @Column(name="RECALC_COUNT")
    @ApiParam(value ="是否重新计算数量")
    @FieldAnnotation(defaultValue = "true")
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
@ -615,7 +615,8 @@ public class BlockSoftSwitchEnumUtil {
    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
    public enum DATABASE_OPERATE_TYPE{
        READ(1,"读取"),
-        WRITE(2,"写入");
+        WRITE(2,"写入"),
+        BATCH_WRITE(3,"批量写入");

        private int value;
        private String description;
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@ -837,7 +837,7 @@ public class MesEnumUtil {
        public static String valueOfDescription(String val) {
            String tmp = null;
            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
+                if (values()[i].value.equals(val)) {
                    tmp = values()[i].description;
                }
            }
@ -3600,8 +3600,8 @@ public class MesEnumUtil {
        PCN_MENU(170, "PCN_MENU", ""),
        PCN_MODULE(180, "PCN_MODULE", ""),
        PCN_LOGOUT(190, "PCN_LOGOUT", ""),
-        UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL");
-
+        UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"),
+        PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", "");

        private int value;
        private String code;
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
@ -131,8 +131,8 @@ public class MesPcnEnumUtil {
        PCN_MENU(170, "PCN_MENU", ""),
        PCN_MODULE(180, "PCN_MODULE", ""),
        PCN_LOGOUT(190, "PCN_LOGOUT", ""),
-        UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL");
-
+        UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"),
+        PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", "");

        private int value;
        private String code;
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@ -1077,7 +1077,7 @@ public class WmsEnumUtil {
    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
    public enum CARRIAGE_STATUS {
        CREATE(10, "创建"),
-        PUBLISH(20, "发布"),
+        PUBLISH(20, "已发布"),
        RECEIVE(30, "承运商接收"),
        ARRIVE(40, "车辆到达"),
        INSTALL(50, "装车完成"),
@ -3030,8 +3030,8 @@ public class WmsEnumUtil {


    public enum WMS_PART_TYPE_STR {
-        RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"), CONTAINER_PRODUCT("40", "容器");
-
+        RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"), CONTAINER_PRODUCT("40", "容器"),
+        UTENSIL("50", "器具");
        private String value;
        private String description;

@ -3057,6 +3057,16 @@ public class WmsEnumUtil {
            }
            return tmp;
        }
+
+        public static String descriptionOfValue(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(val)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
    }


--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java
@ -77,4 +77,12 @@ public class MesCustOrder extends BaseBean {
    @Transient
    @ApiParam(value = "订单日期查询用，查询结束日期", example = "2019-12-31 23:59:59")
    public String orderTimeEnd;
+
+    @Transient
+    @ApiParam("订单类型名称")
+    private String orderTypeName;
+
+    @Transient
+    @ApiParam("状态名称")
+    private String statusName;
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java
@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;

 /**
 * @Author: Wynne.Lu
@ -66,4 +67,8 @@ public class MesDataObject extends BaseBean {
    @Column(name = "SELF_ADDITION_VALUE")
    @ApiParam("自增列值")
    private Long selfAdditionValue;
+
+    @Transient
+    @ApiParam("操作类型名称")
+    private String operateTypeName;
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java
@ -48,4 +48,8 @@ public class MesEquNotifyObjectCfg extends BaseBean {
    @ApiParam("对象类型")
    private Integer notifyObjectType;

+    @Transient
+    @ApiParam("对象类型名称")
+    private String notifyObjectTypeName;
+
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java
@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;

 /**
 * @Description :设备作业通知配置
@ -48,4 +49,16 @@ public class MesEquTaskNotifyCfg extends BaseBean {
    @ApiParam("通知方式")
    private Integer notifyPattern;

+    @Transient
+    @ApiParam("作业类型名称")
+    private String taskTypeName;
+
+    @Transient
+    @ApiParam("通知类型名称")
+    private String notifyTypeName;
+
+    @Transient
+    @ApiParam("通知方式名称")
+    private String notifyPatternName;
+
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.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:
@ -71,6 +72,10 @@ public class MesKpsnRule extends BaseBean {
    @ApiParam("供应商代码")
    private String supplierCode;

+    @Transient
+    @ApiParam("绑定规则名称")
+    private String bandRuleName;
+
    public int getLengthVal() {
        return this.length == null ? 0 : this.length;
    }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java
@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;

 /**
 * @Author: Wynne.Lu
@ -55,4 +56,8 @@ public class MesObjectCfg extends BaseBean {
    @ApiParam("是否存储")
    private Integer isSave;

+    @Transient
+    @ApiParam("是否存储")
+    private String isSaveName;
+
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java
@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;

 /**
 * @Description :包装规格
@ -73,6 +74,22 @@ public class MesPackSpec extends BaseBean {
    @ApiParam("是否混包4")
    private Integer isMixed4;

+    @Transient
+    @ApiParam("是否混包名称")
+    private String isMixedName;
+
+    @Transient
+    @ApiParam("是否混包2名称")
+    private String isMixedName2;
+
+    @Transient
+    @ApiParam("是否混包3名称")
+    private String isMixedName3;
+
+    @Transient
+    @ApiParam("是否混包4名称")
+    private String isMixedName4;
+

    public double getQtyVal() {
        return this.qty == null ? 0.0d : this.qty;
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java
@ -88,4 +88,16 @@ public class MesPart extends BaseBean {
    @Column(name = "PRODUCT_MATCH_TYPE")
    @ApiParam("产品编码匹配类型")
    private Integer productMatchType;
+
+    @Transient
+    @ApiParam("过程编码匹配类型名称")
+    private String processMatchTypeName;
+
+    @Transient
+    @ApiParam("包装编码匹配类型")
+    private String packageMatchTypeName;
+
+    @Transient
+    @ApiParam("产品编码匹配类型")
+    private String productMatchTypeName;
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java
@ -40,7 +40,7 @@ public class MesPcn extends BaseBean {
    private String areaCode;

    @Column(name = "AREA_NAME")
-    @ApiParam("区域")
+    @ApiParam("区域名称")
    private String areaName;

    @Column(name = "WORK_CENTER_CODE")
@ -48,7 +48,7 @@ public class MesPcn extends BaseBean {
    private String workCenterCode;

    @Column(name = "WORK_CENTER_NAME")
-    @ApiParam("工作中心")
+    @ApiParam("工作中心名称")
    private String workCenterName;

    @Column(name = "PCN_VERSION")
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java
@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;

 /**
 * @Description:
@ -79,6 +80,18 @@ public class MesPcnSyncCfg extends BaseBean {
    @ApiParam(value = "同步的时候是否区分工厂")
    private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();

+    @Transient
+    @ApiParam("同步方式")
+    private String syncPatternName;
+
+    @Transient
+    @ApiParam("同步类型名称")
+    private String syncTypeName;
+
+    @Transient
+    @ApiParam(value = "同步的时候是否区分工厂")
+    private String isIgnoreOrgName;
+
    public int getIsIgnoreOrgVal() {
        return this.isIgnoreOrg == null ? 0 : this.isIgnoreOrg;
    }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java
@ -99,6 +99,14 @@ public class MesPlanOrder extends BaseBean {
    public String areaCode;

    @Transient
+    @ApiParam("状态名称")
+    private String statusName;
+
+    @Transient
+    @ApiParam("计划类型")
+    private String planTypeName;
+
+    @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59")
    public String startTimeStart;
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.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:
@ -43,4 +44,12 @@ public class MesProductEncodeCfg extends BaseBean {
    @Column(name = "RULE_CODE")
    @ApiParam("编码规则代码")
    private String ruleCode;
+
+    @Transient
+    @ApiParam("编码类型名称")
+    private String codeTypeName;
+
+    @Transient
+    @ApiParam("匹配类型名称")
+    private String matchTypeName;
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.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:
@ -64,4 +65,8 @@ public class MesQcCheckStandard extends BaseBean {
    @ApiParam("检测项类型")
    private String checkItemType;

+    @Transient
+    @ApiParam("检测类型名称")
+    private String checkTypeName;
+
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.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 :工序工作单元
@ -43,4 +44,12 @@ public class MesRouteProcessCell extends BaseBean {
    @ApiParam("工作中心")
    private String workCenterCode;

+    @Transient
+    @ApiParam("流程代码名称")
+    private String routeCodeName;
+
+    @Transient
+    @ApiParam("工序代码名称")
+    private String processCodeName;
+
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java
@ -88,6 +88,22 @@ public class MesStationBom extends BaseBean {
    @ApiParam(value = "绑定数量")
    private Double boundQty;

+    @Transient
+    @ApiParam(value = "是否可重复名称")
+    private String isRepeatName;
+
+    @Transient
+    @ApiParam(value = "是否检查名称")
+    private String isCheckName;
+
+    @Transient
+    @ApiParam(value = "是否投料配置名称")
+    private String isFeedName;
+
+    @Transient
+    @ApiParam(value = "是否绑定关键件名称")
+    private String isBindKeyName;
+
    public double getQtyVal() {
        return this.qty == null ? 0.0d : this.qty;
    }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java
@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;

 /**
 * @Author: Wynne.Lu
@ -51,4 +52,8 @@ public class MesWcCheck extends BaseBean {
    @ApiParam("检查标准")
    private String standard;

+    @Transient
+    @ApiParam("检查类型名称")
+    private String checkTypeName;
+
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java
@ -68,4 +68,9 @@ public class MesWorkCell extends BaseBean {
    @ApiParam(value = "父节点", access = "父节点", example = "-1")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long parentId;
+
+    @Transient
+    @ApiParam("工位类型名称")
+    private String workCellTypeName;
+
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.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 :工作单元参数
@ -43,4 +44,12 @@ public class MesWorkCellParam extends BaseBean {
    @Column(name = "PARAM_MODEL")
    @ApiParam("参数模式")
    private Integer paramModel;
+
+    @Transient
+    @ApiParam("参数类型名称")
+    private String paramTypeName;
+
+    @Transient
+    @ApiParam("参数模式名称")
+    private String paramModelName;
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.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 :工作单元参数配置
@ -50,4 +51,8 @@ public class MesWorkCellParamCfg extends BaseBean {
    @Column(name = "IS_CHECK")
    @ApiParam("是否必须校验")
    private Integer isCheck;
+
+    @Transient
+    @ApiParam("是否必须校验名称")
+    private String isCheckName;
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDatasourceModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDatasourceModel.java
@ -68,6 +68,9 @@ public class MesDatasourceModel implements Serializable {
    @ApiParam("数据库名称")
    private String dsDbName;

+    @ApiParam("数据源类型名称")
+    private String dsTypeName;
+
    public MesDatasourceModel() {

    }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java
@ -58,10 +58,10 @@ public class MesEquTaskPlanModel implements Serializable {
    @ApiParam("修改日期")
    public String modifyDatetime;

-    @ApiParam("作业类型")
+    @ApiParam("作业类型名称")
    private String taskTypeName;

-    @ApiParam("设备类别")
+    @ApiParam("设备类别名称")
    private String equipmentCategoryName;


--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java
@ -33,4 +33,10 @@ public class WmsStockFifoModel {

    @ApiParam(value = "物料对应的存储区集合")
    Map<String,List<String>> partToZonesMap;
+
+    @ApiParam(value = "波次配料物料清单")
+    boolean collectPicking = false;
+
+    @ApiParam("默认规则")
+    private String defaultRule;
 }
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java
@ -70,6 +70,12 @@ public class SysLocaleResource  extends BaseBean {
    @ApiParam(value ="产品类型", example = "0",access = "softTyp DOC: http://doc.estsh.com/docs/i3plus_api/i3plus_api-impp")
    @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class, refForeignKey = "value", value = "description",required = false)
    private Integer softType;
+    public int getSoftTypeVal(){
+        if(softType==null){
+            return CommonEnumUtil.SOFT_TYPE.IMPP.getValue();
+        }
+        return softType.intValue();
+    }

    //系统自带需要有初始化表，只能修改value，无法删除。
    @Column(name="is_system")
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java
@ -13,10 +13,12 @@ import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.List;

 /**
 * @Description : 适配器出入参
@ -53,6 +55,10 @@ public class BsSuitCaseParam extends BaseBean {
    @ApiParam(value = "参数名称)")
    private String paramName;

+    @Column(name = "PARENT_PARAM_Id")
+    @ApiParam(value = "上级参数id")
+    private String parentParamId;
+
    @Column(name = "PARENT_PARAM_NAME")
    @ApiParam(value = "上级参数名称)")
    private String parentParamName;
@ -80,7 +86,18 @@ public class BsSuitCaseParam extends BaseBean {

    @Transient
    @ApiParam(value = "参数值")
-    private String paramValue;
+    private Object paramValue;
+
+    public String getParamValueStr() {
+        if (paramValue == null) {
+            return null;
+        }
+        return paramValue.toString();
+    }
+
+    @Transient
+    @ApiParam(value = "子级参数")
+    private List<BsSuitCaseParam> bsSuitCaseParamList;

 }

--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java
@ -7,10 +7,8 @@ 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.Index;
-import javax.persistence.Table;
+
+import javax.persistence.*;

 /**
 * @Description : 适配记录参数
@ -38,6 +36,7 @@ public class BsSuitRecordParam extends BaseBean {
    @ApiParam(value = "参数名称")
    private String paramName;

+    @Lob
    @Column(name = "PARAM_VAL")
    @ApiParam(value = "参数值")
    private String paramVal;
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
@ -338,6 +338,7 @@ public class SoftSwitchHqlPack {
        DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
        DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean);
        DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);
+        DdlPreparedPack.timeBuilder(bsSuitRecord.getSuitStartTime(), "suitStartTime", ddlPackBean, false, true);

        ddlPackBean.setOrderByStr(bsSuitRecord.orderBy());

--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;

 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 import javax.persistence.Transient;

@ -28,7 +29,11 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_DOC_CS_DETAILS")
+@Table(name = "WMS_DOC_CS_DETAILS", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "VENDOR_NO"),
+        @Index(columnList = "SN")
+})
@Api("盘点单冻结信息")
 public class WmsCSOrderDetails extends BaseBean {
    private static final long serialVersionUID = 1054153436116196360L;
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java
@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.wms.bean;

 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@ -132,4 +133,9 @@ public class WmsDocFgDetail extends BaseBean {
    @Column(name="COMMIT_DATE")
    @ApiParam("提交日期")
    public String commitDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value = "BOM生效日期")
+    @Column(name = "EFF_START_TIME")
+    private String effStartTime;
 }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
@ -272,4 +272,13 @@ public class WmsDocMovementDetails extends BaseBean {
        this.destLocateNo = destLocateNo;
    }

+    public WmsDocMovementDetails (String partNo) {
+        this.partNo = partNo;
+    }
+
+    public WmsDocMovementDetails (String partNo,String orderNo) {
+        this.partNo = partNo;
+        this.orderNo = orderNo;
+    }
+
 }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java
@ -114,6 +114,10 @@ public class WmsRoutingRule extends BaseBean {
    @ApiParam(value = "目的库位")
    private String destLocateNo;

+    @Column(name = "DEST_MOVE_TYPE")
+    @ApiParam(value = "目的库位")
+    private String destMoveType;
+
    public WmsRoutingRule(){}

 }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java
@ -61,4 +61,7 @@ public class WmsTmsShipDto extends BaseDto implements Serializable {

    @ApiParam("回执单地址")
    private String pathUrl;
+
+    @ApiParam("关联单号")
+    private String refOrderNo;
 }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@ -1858,6 +1858,7 @@ public class WmsHqlPack {
        DdlPackBean result = new DdlPackBean();

        DdlPreparedPack.getStringEqualPack(wmsConfig.getConfigCode(), "configCode", result);
+        DdlPreparedPack.getStringLikerPack(wmsConfig.getName(), "name", result);
        DdlPreparedPack.getNumEqualPack(wmsConfig.getConfigType(), "configType", result);
        DdlPreparedPack.getStringEqualPack(wmsConfig.getConfigValue(), "configValue", result);
        DdlPreparedPack.getNumEqualPack(wmsConfig.getConfigValueType(), "configValueType", result);
--- a/modules/i3plus-pojo-workflow/pom.xml
+++ b/modules/i3plus-pojo-workflow/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/pom.xml
+++ b/pom.xml
@ -15,7 +15,7 @@
    <groupId>i3plus.pojo</groupId>
    <artifactId>i3plus-pojo</artifactId>
    <packaging>pom</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>    <modules>
+    <version>1.0-DEV-SNAPSHOT</version>    <modules>
        <module>modules/i3plus-pojo-base</module>
        <module>modules/i3plus-pojo-platform</module>
        <module>modules/i3plus-pojo-model</module>