Merge branch 'dev' into test

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

@@ -1158,7 +1158,7 @@ public class BlockFormEnumUtil {
 
         private Double getPropertyVirtualDoubleAdd(Object ... objs){
             if(objs != null && objs.length > 0){
-                Double result = new Double(0);
+                Double result = Double.valueOf(0);
                 for (Object o : objs) {
                     try {
                         if(o != null){
@@ -1175,7 +1175,7 @@ public class BlockFormEnumUtil {
 
         private Double getPropertyVirtualDoubleLess(Object ... objs){
             if(objs != null && objs.length > 0){
-                Double result = new Double(0);
+                Double result = Double.valueOf(0);
                 for (Object o : objs) {
                     try {
                         if(o != null){
@@ -1192,7 +1192,7 @@ public class BlockFormEnumUtil {
 
         private Double getPropertyVirtualDoubleMake(Object ... objs){
             if(objs != null && objs.length > 0){
-                Double result = new Double(0);
+                Double result = Double.valueOf(0);
                 for (Object o : objs) {
                     try {
                         if(o != null){
@@ -1209,7 +1209,7 @@ public class BlockFormEnumUtil {
 
         private Double getPropertyVirtualDoubleDivision(Object ... objs){
             if(objs != null && objs.length > 0){
-                Double result = new Double(0);
+                Double result = Double.valueOf(0);
                 for (Object o : objs) {
                     try {
                         if(o != null){
@@ -1235,7 +1235,8 @@ public class BlockFormEnumUtil {
         SQL(10, "SQL", "SQL脚本"),
         CLASS_METHOD(20, "ClassMethod", "类方法"),
         SYSTEM_JAVA(30, "SystemClassMethod", "系统类方法"),
-        SCRIPT(40, "Script", "脚本");
+        SCRIPT(40, "Script", "脚本"),
+        URL(50, "URL", "网址");
 
         private int value;
         private String code;
@@ -1668,7 +1669,8 @@ public class BlockFormEnumUtil {
         DIALOG(10, "DIALOG", "弹出窗口"),
         NEW_WINDOW(20, "NEW_WINDOW", "新开窗口"),
         SQL(30, "SQL", "执行SQL"),
-        CLASS_METHOD(40, "CLASS_METHOD", "执行类方法");
+        CLASS_METHOD(40, "CLASS_METHOD", "执行类方法"),
+        URL(50, "URL", "网址");
 
         private int value;
         private String name;
@@ -1928,8 +1930,8 @@ public class BlockFormEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ELEMENT_TREE_DIRECTION {
-        horizontal(1, "horizontal", "横向"),
-        vertical(2, "vertical", "竖向");
+        HORIZONTAL(1, "horizontal", "横向"),
+        VERTICAL(2, "vertical", "竖向");
 
         private int value;
         private String code;

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

@@ -867,4 +867,53 @@ public class BlockSoftSwitchEnumUtil {
             return null;
         }
     }
+
+    /**
+     * 长数据关联数据类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REF_DATA_TYPE {
+        SUIT_MESSAGE(10, "适配信息"),
+        REQUEST_ORGIN_PARAM(20,  "请求原始参数"),
+        ORIGINAL_MESSAGE(30,  "原始报文"),
+        CONVERTED_MESSAGE(40,  "转换报文");
+
+        private int value;
+        private String description;
+
+        private REF_DATA_TYPE (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;
+        }
+
+        public static REF_DATA_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;
+        }
+
+    }
+
 }

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

@@ -11,6 +11,41 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  **/
 
 public class MesEnumUtil {
+    /**
+     * 作业程序组件类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_MODULE_TYPE {
+        MONITOR_MODULE(10, "监听组件"),
+        REVEAL_MODULE(10, "展示组件"),
+        BUTTON_MODULE(30, "按钮组件");
+
+        private int value;
+        private String description;
+
+        WORK_MODULE_TYPE(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;
+        }
+    }
 
     /**
      * 排序方式
@@ -4847,4 +4882,117 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * 配方类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PART_FORMULA_TYPE {
+        DEVICE_SEMAPHORE(10, "设备信号");
+
+        private int value;
+        private String description;
+
+        PART_FORMULA_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static PART_FORMULA_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 	作业校验模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CHECK_MODEL {
+        NO_CHECK(10, "不校验"),
+        CHECK(20, "校验设备就绪信号");
+
+        private int value;
+        private String description;
+
+        CHECK_MODEL(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;
+        }
+    }
+
+    /**
+     * 	PLC类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PLC_TYPE {
+        STANDARD(10, "标准"),
+        EQU_OPERATION_SIGNLE(20, "设备作业信号");
+
+        private int value;
+        private String description;
+
+        PLC_TYPE(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;
+        }
+    }
+
 }

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

@@ -13,6 +13,42 @@ import org.apache.commons.lang3.StringUtils;
 public class MesPcnEnumUtil {
 
     /**
+     * 作业程序组件类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_MODULE_TYPE {
+        MONITOR_MODULE(10, "监听组件"),
+        REVEAL_MODULE(10, "展示组件"),
+        BUTTON_MODULE(30, "按钮组件");
+
+        private int value;
+        private String description;
+
+        WORK_MODULE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * 监听任务明细-采集数据方式
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -2023,7 +2059,7 @@ public class MesPcnEnumUtil {
     }
 
     /**
-     * MesPartCategory实体对应的categoryType值  条码表条码质量状态
+     * MesPartCategory实体对应的categoryType值
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PART_CATEGORY_TYPE {
@@ -2323,8 +2359,7 @@ public class MesPcnEnumUtil {
         PACKAGE_SCAN(35, "打包扫描"),
         INSTOCKED(40, "入库"),
         SHIPING(50, "发运"),
-        CLOSE(90, "关闭"),
-        ;
+        CLOSE(90, "关闭");
 
         private int value;
         private String description;
@@ -3242,7 +3277,7 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SHIPPING_ACTUAL_STATUS {
         CREATE(10, "创建"),
-        CANCEL(20, "已发运");
+        SHIPPED(20, "已发运");
 
         private int value;
         private String description;
@@ -3368,7 +3403,7 @@ public class MesPcnEnumUtil {
         public int getValue() {
             return value;
         }
-        
+
         public String getCode() {
             return code;
         }

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

@@ -6192,4 +6192,64 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
+    /**
+     * 数据格式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DATA_FORMAT {
+        STRING_FORMAT(1, "String", "字符串格式"),
+        INTEGER_FORMAT(2, "Integer", "整数格式"),
+        DOUBLE_FORMAT(3, "Double", "高精度浮点格式"),
+        DATE_FORMAT(4, "Date", "日期格式"),
+        FLOAT_FORMAT(5, "Float", "浮点格式"),
+        BOOL_FORMAT(6, "Boolean", "布尔格式"),
+        LONG_FORMAT(7, "LONG", "长整数格式");
+
+        private int value;
+        private String code;
+        private String description;
+
+        DATA_FORMAT(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }

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

@@ -46,6 +46,10 @@ public class BfButton extends BaseBean {
         }
     }
 
+    @Column(name = "IS_REQUIRED_DATA")
+    @ApiParam(value = "是必填数据")
+    private Integer isRequiredData;
+
     // 关联表单功能表id
     @Column(name = "METHOD_ID")
     @ApiParam(value = "表单功能id")

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

@@ -10,7 +10,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
 import java.util.List;
@@ -89,6 +88,10 @@ public class BfMenu extends BaseBean {
     @ApiParam(value ="功能名称")
     private String methodNameRdd;
 
+    @Column(name="SOFT_TYPE")
+    @ApiParam(value ="所属模块")
+    private Integer softType;
+
     @Column(name = "MENU_STATUS")
     @ApiParam(value = "菜单状态")
     private Integer menuStatus;
@@ -96,8 +99,4 @@ public class BfMenu extends BaseBean {
     @Transient
     @ApiParam(value = "菜单子集")
     private List<BfMenu> bfMenuList;
-
-    @Transient
-    @ApiParam(value = "菜单父级")
-    private List<BfMenu> parentBfMenuList;
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.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 :按钮功能关系
@@ -61,4 +62,10 @@ public class BfRefButtonMethod extends BaseBean {
     @ApiParam(value ="按钮位置关联名称")
     private String buttonPositionRefNameRdd;
 
+    /**
+     * 关联按钮
+     */
+    @Transient
+    private BfButton bfbutton;
+
 }

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

@@ -39,12 +39,12 @@ public final class FormHqlPack {
      * @param params 参数
      * @return hql
      */
-    public static String packHqlIds(String columnName, Long[] params) {
-        StringBuffer result =  new StringBuffer();
+    public static DdlPackBean packHqlIds(String columnName, Long[] params) {
+        DdlPackBean result =  DdlPackBean.getDdlPackBean();
 
         // 参数数组 [1,2,3] -> "1,2,3"
-        HqlPack.getInPack(StringUtils.join(params, ","), columnName, result);
-        return result.toString();
+        DdlPreparedPack.getInPack(StringUtils.join(params, ","), columnName, result);
+        return result;
     }
 
     /**
@@ -69,11 +69,11 @@ public final class FormHqlPack {
      * @param isDeleted 数据状态
      * @return hql
      */
-    public static String packHqlIdsAndIsDeleted(String columnName, Long[] params, Integer isDeleted) {
-        StringBuffer result =  new StringBuffer(FormHqlPack.packHqlIds(columnName, params));
+    public static DdlPackBean packHqlIdsAndIsDeleted(String columnName, Long[] params, Integer isDeleted) {
+        DdlPackBean result = FormHqlPack.packHqlIds(columnName, params);
 
-        HqlPack.getNumEqualPack(isDeleted, "isDeleted", result);
-        return result.toString();
+        DdlPreparedPack.getNumEqualPack(isDeleted, "isDeleted", result);
+        return result;
     }
 
     /**
@@ -81,13 +81,13 @@ public final class FormHqlPack {
      * @param bfLayout 表单布局
      * @return hql
      */
-    public static String packHqlBfLayout(BfLayout bfLayout) {
-        StringBuffer result =  new StringBuffer();
+    public static DdlPackBean packHqlBfLayout(BfLayout bfLayout) {
+        DdlPackBean result =  DdlPackBean.getDdlPackBean(bfLayout);
 
-        HqlPack.getStringLikerPack(bfLayout.getLayoutName(), "layoutName", result);
-        HqlPack.getNumEqualPack(bfLayout.getIsDeleted(), "isDeleted", result);
+        DdlPreparedPack.getStringLikerPack(bfLayout.getLayoutName(), "layoutName", result);
+        DdlPreparedPack.getNumEqualPack(bfLayout.getIsDeleted(), "isDeleted", result);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -95,14 +95,13 @@ public final class FormHqlPack {
      * @param bfLayoutRow 表单布局
      * @return hql
      */
-    public static String packHqlBfLayoutRow(BfLayoutRow bfLayoutRow) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlBfLayoutRow(BfLayoutRow bfLayoutRow) {
+        DdlPackBean result =DdlPackBean.getDdlPackBean(bfLayoutRow);
 
-        HqlPack.getNumEqualPack(bfLayoutRow.getLayoutId(), "layoutId", result);
-        HqlPack.getNumEqualPack(bfLayoutRow.getIsDeleted(), "isDeleted", result);
+        DdlPreparedPack.getNumEqualPack(bfLayoutRow.getLayoutId(), "layoutId", result);
+        DdlPreparedPack.getNumEqualPack(bfLayoutRow.getIsDeleted(), "isDeleted", result);
 
-        result.append(bfLayoutRow.orderBy());
-        return result.toString();
+        return result;
     }
 
     /**
@@ -110,14 +109,13 @@ public final class FormHqlPack {
      * @param bfLayoutColumn 表单布局行
      * @return hql
      */
-    public static String packHqlBfLayoutColumn(BfLayoutColumn bfLayoutColumn) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlBfLayoutColumn(BfLayoutColumn bfLayoutColumn) {
+        DdlPackBean result = DdlPackBean.getDdlPackBean(bfLayoutColumn);
 
-        HqlPack.getNumEqualPack(bfLayoutColumn.getLayoutRowId(), "layoutRowId", result);
-        HqlPack.getNumEqualPack(bfLayoutColumn.getIsDeleted(), "isDeleted", result);
+        DdlPreparedPack.getNumEqualPack(bfLayoutColumn.getLayoutRowId(), "layoutRowId", result);
+        DdlPreparedPack.getNumEqualPack(bfLayoutColumn.getIsDeleted(), "isDeleted", result);
 
-        result.append(bfLayoutColumn.orderBy());
-        return result.toString();
+        return result;
     }
 
     /**
@@ -126,13 +124,13 @@ public final class FormHqlPack {
      * @return hql
      */
     public static DdlPackBean packHqlBfMenu(BfMenu bfMenu) {
-        DdlPackBean result =  new DdlPackBean();
+        DdlPackBean result =  DdlPackBean.getDdlPackBean(bfMenu);
 
         DdlPreparedPack.getStringLikerPack(bfMenu.getMenuName(), "menuName", result);
         DdlPreparedPack.getNumEqualPack(bfMenu.getParentId(), "parentId", result);
         DdlPreparedPack.getNumEqualPack(bfMenu.getMenuStatus(), "menuStatus", result);
         DdlPreparedPack.getNumEqualPack(bfMenu.getIsDeleted(), "isDeleted", result);
-        result.setOrderByStr(bfMenu.orderBy());
+        DdlPreparedPack.getNumEqualPack(bfMenu.getSoftType(), "softType", result);
 
         return result;
     }
@@ -143,12 +141,11 @@ public final class FormHqlPack {
      * @return hql
      */
     public static DdlPackBean packHqlBfMethod(BfMethod bfMethod) {
-        DdlPackBean result = new DdlPackBean();
+        DdlPackBean result =  DdlPackBean.getDdlPackBean(bfMethod);
 
         DdlPreparedPack.getStringLikerPack(bfMethod.getMethodName(), "methodName", result);
         DdlPreparedPack.getNumEqualPack(bfMethod.getLayoutId(), "layoutId", result);
         DdlPreparedPack.getNumEqualPack(bfMethod.getIsDeleted(), "isDeleted", result);
-        result.setOrderByStr(bfMethod.orderBy());
 
         return result;
     }
@@ -159,12 +156,11 @@ public final class FormHqlPack {
      * @return hql
      */
     public static DdlPackBean packHqlBfMethodDetail(BfMethodDetail bfMethodDetail) {
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfMethodDetail);
 
         DdlPreparedPack.getStringLikerPack(bfMethodDetail.getMethodDetailName(), "methodDetailName", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bfMethodDetail.getMethodId(), "layoutId", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bfMethodDetail.getIsDeleted(), "isDeleted", ddlPackBean);
-        ddlPackBean.setOrderByStr(bfMethodDetail.orderBy());
 
         return ddlPackBean;
     }
@@ -175,14 +171,13 @@ public final class FormHqlPack {
      * @return hql
      */
     public static DdlPackBean packHqlBfIntercept(BfIntercept bfIntercept) {
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfIntercept);
 
         DdlPreparedPack.getStringLikerPack(bfIntercept.getInterceptName(), "interceptName", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bfIntercept.getExecuteMode(), "executeMode", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bfIntercept.getExecuteContent(),"executeContent",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bfIntercept.getInterceptStatus(), "interceptStatus", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bfIntercept.getIsDeleted(), "isDeleted", ddlPackBean);
-        ddlPackBean.setOrderByStr(bfIntercept.orderBy());
 
         return ddlPackBean;
     }
@@ -193,7 +188,7 @@ public final class FormHqlPack {
      * @return 查询条件
      */
     public static DdlPackBean packHqlBfButton(BfButton bfButton){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfButton);
 
         DdlPreparedPack.getStringLikerPack(bfButton.getButtonName(), "buttonName", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bfButton.getTriggerMode(), "triggerMode", ddlPackBean);
@@ -209,7 +204,7 @@ public final class FormHqlPack {
      * @return 查询条件
      */
     public static DdlPackBean packHqlBfRefMethodRoleByRoleIds(Long[] roleIds){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getInPackArray(roleIds, "roleId", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean);
@@ -223,14 +218,13 @@ public final class FormHqlPack {
      * @return DdlPackBean
      */
     public static DdlPackBean packHqlBfRefButtonMethod(BfRefButtonMethod bfRefButtonMethod) {
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfRefButtonMethod);
 
         DdlPreparedPack.getNumEqualPack(bfRefButtonMethod.getButtonId(), "buttonId", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bfRefButtonMethod.getButtonPositionType(), "buttonPositionType", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bfRefButtonMethod.getButtonPositionRefId(), "buttonPositionRefId", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bfRefButtonMethod.getButtonNameRdd(), "buttonNameRdd", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bfRefButtonMethod.getButtonPositionRefNameRdd(), "buttonPositionRefNameRdd", ddlPackBean);
-        ddlPackBean.setOrderByStr(bfRefButtonMethod.orderBy());
 
         return ddlPackBean;
     }
@@ -241,11 +235,10 @@ public final class FormHqlPack {
      * @return DdlPackBean
      */
     public static DdlPackBean packHqlBfRefMethodRole(BfRefMethodRole bfRefMethodRole) {
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfRefMethodRole);
 
         DdlPreparedPack.getNumEqualPack(bfRefMethodRole.getMethodId(), "methodId", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bfRefMethodRole.getRoleId(), "roleId", ddlPackBean);
-        ddlPackBean.setOrderByStr(bfRefMethodRole.orderBy());
 
         return ddlPackBean;
     }
@@ -256,7 +249,7 @@ public final class FormHqlPack {
      * @return DdlPackBean
      */
     public static DdlPackBean packHqlBfInterceptDetail(BfInterceptDetail bfInterceptDetail) {
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptId(), "interceptId", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptTargetId(), "interceptTargetId", ddlPackBean);
@@ -275,7 +268,7 @@ public final class FormHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBfRefButtonMethodByRefIds(Long[] ids) {
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getInPackArray(ids, "buttonPositionRefId", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean);
@@ -290,7 +283,7 @@ public final class FormHqlPack {
      * @return
      */
     public static DdlPackBean findBfMenuByMethodIdsAndStatus(Long[] methodIds, int status) {
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getInPackArray(methodIds, "methodId", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(status, "menuStatus", ddlPackBean);
@@ -305,7 +298,7 @@ public final class FormHqlPack {
      * @return DdlPackBean
      */
     public static DdlPackBean packHqlBfElement(BfElement bfElement){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getStringLikerPack(bfElement.getElementName(), "elementName", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bfElement.getElementCode(), "elementCode", ddlPackBean);
@@ -322,7 +315,7 @@ public final class FormHqlPack {
      * @return DdlPackBean
      */
     public static DdlPackBean packHqlBfDataSource(BfDataSource source){
-        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(source);
 
         DdlPreparedPack.getStringLikerPack(source.getSourceHost(), "sourceHost", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(source.getSourceName(), "sourceName", ddlPackBean);
@@ -341,7 +334,7 @@ public final class FormHqlPack {
      * @return hql
      */
     public static DdlPackBean packHqlBfMenuTree(BfMenu bfMenu) {
-        DdlPackBean result =  new DdlPackBean();
+        DdlPackBean result =  DdlPackBean.getDdlPackBean(bfMenu);
 
         DdlPreparedPack.getNegativeNumEqualPack(bfMenu.getId(), "parentId", result);
         DdlPreparedPack.getNumEqualPack(
@@ -363,7 +356,7 @@ public final class FormHqlPack {
      * @return DdlPackBean
      */
     public static DdlPackBean packHqlBfElementConstraint(BfElementConstraint bfElementConstraint){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfElementConstraint);
 
         DdlPreparedPack.getStringLikerPack(bfElementConstraint.getConstraintName(), "constraintName", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bfElementConstraint.getElementId(), "elementId", ddlPackBean);
@@ -378,7 +371,7 @@ public final class FormHqlPack {
      * @return DdlPackBean
      */
     public static DdlPackBean packHqlBfElementConstraintOnly(BfElementConstraint bfElementConstraint){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfElementConstraint);
 
         DdlPreparedPack.getNumNOEqualPack(bfElementConstraint.getId(), "id", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bfElementConstraint.getConstraintName(), "constraintName", ddlPackBean);
@@ -393,7 +386,7 @@ public final class FormHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBfDataObject(BfDataObject bfDataObject){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfDataObject);
 
         DdlPreparedPack.getStringLikerPack(bfDataObject.getObjectName(), "objectName", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bfDataObject.getObjectClassName(), "objectClassName", ddlPackBean);
@@ -408,7 +401,7 @@ public final class FormHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBfCascade(BfCascade bfCascade){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfCascade);
 
         DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeName(), "objectName", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeDescription(), "objectClassName", ddlPackBean);

modules/i3plus-pojo-mes-pcn/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-mes-pcn</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-DEV-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

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

@@ -58,6 +58,26 @@ public class IfProductOffLine extends BaseBean  implements Serializable {
     @ApiParam("特殊批次")
     private String fixLotNo;
 
+    @Column(name = "ITEM_PART_NO")
+    @ApiParam("原材料物料号")
+    private String itemPartNo;
+
+    @Column(name = "ITEM_PART_NAME")
+    @ApiParam("原材料物料名称")
+    private String itemPartName;
+
+    @Column(name = "ITEM_QTY")
+    @ApiParam("原材料用量")
+    private String itemQty;
+
+    @Column(name = "ITEM_UNIT")
+    @ApiParam("原材料单位")
+    private String itemUnit;
+
+    @Column(name = "SUPPLIER_CODE")
+    @ApiParam("供应商代码")
+    private String supplierCode;
+
     @Column(name = "ACTION_USER")
     @ApiParam("操作人")
     private String actionUser;
@@ -85,4 +105,20 @@ public class IfProductOffLine extends BaseBean  implements Serializable {
     @Column(name = "IF_CODE")
     @ApiParam("接口代码")
     private String ifCode;
+
+    @Column(name = "PRODUCE_CATEGORY_CODE")
+    @ApiParam("产品位置")
+    private String produceCategoryCode;
+
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+
+    @Column(name = "JIT_LOT_NO")
+    @ApiParam("JIT队列批次")
+    private String jitLotNo;
+
+    @Column(name = "VIN_CODE")
+    @ApiParam("vin")
+    private String vinCode;
 }

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

@@ -13,7 +13,6 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Description :JIT发运数据同步
@@ -30,61 +29,78 @@ import java.util.Date;
 @Table(name = "if_queue_shipping")
 @Api("JIT发运数据同步")
 public class IfQueueShipping extends BaseBean implements Serializable {
-    private static final long serialVersionUID = -8961182851667690154L;
-    @Column(name = "JIT_NO")
-    @ApiParam("JIT队列编号")
-    private String jitNo;
-
-    @Column(name = "VIN_CODE")
-    @ApiParam("vin")
-    private String vinCode;
-
-    @Column(name = "CUST_FLAG_NO")
-    @ApiParam("客户标识号")
-    private String custFlagNo;
-
-    @Column(name = "PART_NO")
-    @ApiParam("物料号")
-    private String partNo;
-
-    @Column(name = "PART_NAME")
-    @ApiParam("物料名称")
-    private String partName;
-
-    @Column(name = "PRODUCT_SN")
-    @ApiParam("产品条码")
-    private String productSn;
-
-    @Column(name = "QTY")
-    @ApiParam("数量")
-    private Double qty;
-
-    @Column(name = "SUPPLIER_CODE")
-    @ApiParam("操作人")
-    private String supplierCode;
-
-    @Column(name = "ACTION_DATE_TIME")
-    @ApiParam("操作时间")
-    private Date actionDateTime;
-
-    @Column(name = "WORK_CENTER_CODE")
-    @ApiParam("产线")
-    private String workCenterCode;
-
-    @Column(name = "SYNC_STATUS")
-    @ApiParam("同步状态")
-    private Integer syncStatus;
-
-    @Column(name = "ERROR_MESSAGE")
-    @ApiParam("异常消息")
-    private String errorMessage;
-
-    @Column(name = "ACTION_CODE")
-    @ApiParam("动作代码")
-    private String actionCode;
-
-    @Column(name = "IF_CODE")
-    @ApiParam("接口代码")
-    private String ifCode;
+	private static final long serialVersionUID = -8961182851667690154L;
+	@Column(name = "JIT_NO")
+	@ApiParam("JIT队列编号")
+	private String jitNo;
+
+	@Column(name = "VIN_CODE")
+	@ApiParam("vin")
+	private String vinCode;
+
+	@Column(name = "CUST_FLAG_NO")
+	@ApiParam("客户标识号")
+	private String custFlagNo;
+
+	@Column(name = "PART_NO")
+	@ApiParam("物料号")
+	private String partNo;
+
+	@Column(name = "PART_NAME")
+	@ApiParam("物料名称")
+	private String partName;
+
+	@Column(name = "PRODUCT_SN")
+	@ApiParam("产品条码")
+	private String productSn;
+
+	@Column(name = "QTY")
+	@ApiParam("数量")
+	private Double qty;
+
+	@Column(name = "SUPPLIER_CODE")
+	@ApiParam("供应商代码")
+	private String supplierCode;
+
+	@Column(name = "ACTION_USER")
+	@ApiParam("操作人")
+	private String actionUser;
+
+	@Column(name = "ACTION_DATE_TIME")
+	@ApiParam("操作时间")
+	private String actionDateTime;
+
+	@Column(name = "WORK_CENTER_CODE")
+	@ApiParam("产线")
+	private String workCenterCode;
+
+	@Column(name = "PRODUCE_CATEGORY_CODE")
+	@ApiParam("产品位置")
+	private String produceCategoryCode;
+
+
+	@Column(name = "QUEUE_GROUP_NO")
+	@ApiParam("分组队列编号")
+	private String queueGroupNo;
+
+	@Column(name = "JIT_LOT_NO")
+	@ApiParam("JIT队列批次")
+	private String jitLotNo;
+
+	@Column(name = "SYNC_STATUS")
+	@ApiParam("同步状态")
+	private Integer syncStatus;
+
+	@Column(name = "ERROR_MESSAGE")
+	@ApiParam("异常消息")
+	private String errorMessage;
+
+	@Column(name = "ACTION_CODE")
+	@ApiParam("动作代码")
+	private String actionCode;
+
+	@Column(name = "IF_CODE")
+	@ApiParam("接口代码")
+	private String ifCode;
 
 }

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

@@ -0,0 +1,91 @@
+package cn.estsh.i3plus.pojo.mes.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;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/4/18 21:05
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "IF_RAW_PART_DATA")
+@Api("原料上线数据")
+public class IfRawPartData  extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -2733956307324895596L;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "PART_TYPE")
+    @ApiParam("原料类型")
+    private String partType;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("原料条码")
+    private String serialNumber;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    private String unit;
+
+    @Column(name = "SRC_LOT_NO")
+    @ApiParam("收货批次")
+    private String srcLotNo;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("生产批次")
+    private String lotNo;
+
+    @Column(name = "FIX_LOT_NO")
+    @ApiParam("特殊批次")
+    private String fixLotNo;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+    @Column(name = "SUPPLIER_CODE")
+    @ApiParam("供应商代码")
+    private String supplierCode;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常消息")
+    private String errorMessage;
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    private String ifCode;
+
+    @Column(name = "ORGANIZATION_CODE")
+    @ApiParam("工厂代码")
+    private String organizationCode;
+}

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

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.mes.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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 4:49 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD")
+@Api("MES_看板")
+public class MesBoard extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3932883110518753734L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "BOARD_NAME")
+    @ApiParam("看板名称")
+    private String boardName;
+
+    @Column(name = "BOARD_TYPE")
+    @ApiParam("看板类型")
+    private String boardType;
+
+    @Column(name = "REFRESH_INTERVAL")
+    @ApiParam("刷新时间")
+    private Integer refreshInterval;
+
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String memo;
+}

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

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.mes.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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 5:07 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_EQU_DETAIL")
+@Api("MES_看板设备明细")
+public class MesBoardEquDetail extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 2187463105092165451L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "EQU_CODE")
+    @ApiParam("设备代码")
+    private String equCode;
+
+    @Column(name = "EQU_NAME")
+    @ApiParam("设备名称")
+    private String equName;
+
+    @Column(name = "X")
+    @ApiParam("横坐标")
+    private Double x;
+
+    @Column(name = "Y")
+    @ApiParam("纵坐标")
+    private Double y;
+}

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

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.mes.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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 5:01 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_EQU_STATUS")
+@Api("MES_看板设备状态")
+public class MesBoardEquStatus extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -8426698586967483537L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "EQU_CODE")
+    @ApiParam("设备代码")
+    private String equCOde;
+
+    @Column(name = "EQU_STATUS_CODE")
+    @ApiParam("状态代码")
+    private Integer equStatusCode;
+
+    @Column(name = "EQU_STATUS_DESC")
+    @ApiParam("状态描述")
+    private String equStatusDesc;
+
+    @Column(name = "COLOR")
+    @ApiParam("颜色")
+    private String color;
+}

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

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.mes.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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 5:19 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_MONITOR_OBJECT")
+@Api("MES_看板监控对象")
+public class MesBoardMonitorObject extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 4136991652901768961L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "OBJECT_TYPE")
+    @ApiParam("对象类型")
+    private String objectType;
+
+    @Column(name = "OBJECT_VALUE")
+    @ApiParam("对象值")
+    private String objectValue;
+
+    @Column(name = "OBJECT_VALUE_DESC")
+    @ApiParam("对象值描述")
+    private String objectValueDesc;
+}

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

@@ -0,0 +1,40 @@
+package cn.estsh.i3plus.pojo.mes.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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 4:53 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_PICTURE")
+@Api("MES_看板图片")
+public class MesBoardPicture extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 5784111763887252647L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "PICTURE_URL")
+    @ApiParam("图片路径")
+    private String pictureUrl;
+}

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

@@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.mes.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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 6:49 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_PLAN_CAPACITY")
+@Api("MES_看板时段计划产量")
+public class MesBoardPlanCapacity extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 7355311263972875850L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "PLAN_DATE")
+    @ApiParam("计划日期")
+    private String planDate;
+
+    @Column(name = "SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name = "PLAN_PEOPLE_NUM")
+    @ApiParam("计划人数")
+    private Integer planPeopleNum;
+
+    @Column(name = "ACTUAL_PEOPLE_NUM")
+    @ApiParam("实际人数")
+    private Integer actualPeopleNum;
+
+    @Column(name = "PLAN_CAPACITY")
+    @ApiParam("计划产量")
+    private Integer planCapacity;
+}

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

@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.mes.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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 5:16 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_SHIFT")
+@Api("MES_看板班次")
+public class MesBoardShift extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3681747818263404086L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name = "SHIFT_NAME")
+    @ApiParam("班次名称")
+    private String shiftName;
+}

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

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.mes.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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 5:13 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_SHIFT_SECTION")
+@Api("MES_看板班次时段")
+public class MesBoardShiftSection extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -957301986885952078L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name = "START_TIME")
+    @ApiParam("开始时段")
+    private String startTime;
+
+    @Column(name = "END_TIME")
+    @ApiParam("结束时段")
+    private String endTime;
+
+    @Column(name = "IS_SPANDAY")
+    @ApiParam("是否跨天")
+    private Integer isSpanday;
+}

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

@@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.mes.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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 5:24 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_SHIFT_SECTION_CAPACITY")
+@Api("MES_看板时段计划产量")
+public class MesBoardShiftSectionCapacity extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -1184108324734484237L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "PLAN_DATE")
+    @ApiParam("计划日期")
+    private String planDate;
+
+    @Column(name = "SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name = "START_TIME")
+    @ApiParam("开始时段")
+    private String startTime;
+
+    @Column(name = "END_TIME")
+    @ApiParam("结束时段")
+    private String endTime;
+
+    @Column(name = "PLAN_CAPACITY")
+    @ApiParam("计划产量")
+    private Integer planCapacity;
+}

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

@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.mes.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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 4:43 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_TYPE")
+@Api("MES_看板类型")
+public class MesBoardType extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3652595133806144706L;
+
+    @Column(name = "BOARD_TYPE")
+    @ApiParam("看板类型")
+    private String boardType;
+
+    @Column(name = "BOARD_TYPE_NAME")
+    @ApiParam("看板类型名称")
+    private String boardTypeName;
+
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String memo;
+}

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

@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.mes.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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 4:47 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_TYPE_BASE_CFG")
+@Api("MES_看板类型基础配置")
+public class MesBoardTypeBaseCfg extends BaseBean implements Serializable  {
+
+    private static final long serialVersionUID = 5405378688706555644L;
+
+    @Column(name = "BOARD_TYPE")
+    @ApiParam("看板类型")
+    private String boardType;
+
+    @Column(name = "WINDOW_NO")
+    @ApiParam("界面编号")
+    private String windowNo;
+
+    @Column(name = "SEQ")
+    @ApiParam("顺序")
+    private Integer seq;
+}

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

@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.mes.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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\10 0010 11:56
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EQU_FAULT_CAUSE")
+@Api("MES_设备故障原因")
+public class MesEquFaultCause extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1229825283741375978L;
+    @Column(name = "FC_CODE")
+    @ApiParam("故障原因代码")
+    private String fcCode;
+
+    @Column(name = "FC_NAME")
+    @ApiParam("故障原因描述")
+    private String fcName;
+
+    @Column(name = "EQUIPMENT_CODE")
+    @ApiParam("设备代码")
+    private String equipmentCode;
+}

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

@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.mes.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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\10 0010 11:53
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EQU_FAULT_METHOD")
+@Api("MES_设备故障处理措施")
+public class MesEquFaultMethod extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -1366849727309967125L;
+    @Column(name = "FM_CODE")
+    @ApiParam("故障方法代码")
+    private String fmCode;
+
+    @Column(name = "FM_NAME")
+    @ApiParam("故障方法描述")
+    private String fmName;
+
+    @Column(name = "EQUIPMENT_CODE")
+    @ApiParam("设备代码")
+    private String equipmentCode;
+}

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

@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.mes.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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\10 0010 11:42
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EQU_FAULT_PHENOMENON")
+@Api("MES_设备故障现象")
+public class MesEquFaultPhenomenon extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 4373435091738791300L;
+    @Column(name = "FP_CODE")
+    @ApiParam("故障现象代码")
+    private String fpCode;
+
+    @Column(name = "FP_NAME")
+    @ApiParam("故障现象描述")
+    private String fpName;
+
+    @Column(name = "EQUIPMENT_CODE")
+    @ApiParam("设备代码")
+    private String equipmentCode;
+}

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

@@ -81,6 +81,10 @@ public class MesEquipment extends BaseBean implements Serializable {
     @ApiParam("连接类型")
     private Integer connectType;
 
+    @Column(name = "CHECK_MODEL")
+    @ApiParam("作业校验模式")
+    private Integer checkModel;
+
     @Column(name = "MEMO")
     @ApiParam("备注")
     private String memo;

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

@@ -26,7 +26,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_FAULT_CAUSE")
-@Api("mes设备故障原因表")
+@Api("mes故障原因表")
 public class MesFaultCause extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = 1229825197241375978L;
@@ -38,7 +38,8 @@ public class MesFaultCause extends BaseBean implements Serializable {
     @ApiParam("故障原因描述")
     private String fcName;
 
-    @Column(name = "PARENT_FC_CODE")
-    @ApiParam("父阶原因代码")
-    private String parentFcCode;
+    // 对应(类型信息MesTypeCfg）中的BUSINESS_TYPE_CODE字段
+    @Column(name = "FC_TYPE")
+    @ApiParam("故障原因类型编码")
+    private String fcType;
 }

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

@@ -26,7 +26,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_FAULT_METHOD")
-@Api("mes设备故障方法表")
+@Api("MES_故障处理措施")
 public class MesFaultMethod extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = -1366849757709967125L;
@@ -38,7 +38,8 @@ public class MesFaultMethod extends BaseBean implements Serializable {
     @ApiParam("故障方法描述")
     private String fmName;
 
-    @Column(name = "PARENT_FM_CODE")
-    @ApiParam("父阶故障代码")
-    private String parentFmCode;
+    // 对应(类型信息MesTypeCfg）中的BUSINESS_TYPE_CODE字段
+    @Column(name = "FM_TYPE")
+    @ApiParam("故障措施类型编码")
+    private String fmType;
 }

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

@@ -26,7 +26,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_FAULT_PHENOMENON")
-@Api("mes设备故障现象表")
+@Api("mes故障现象表")
 public class MesFaultPhenomenon extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = 4373435095236791300L;
@@ -38,15 +38,8 @@ public class MesFaultPhenomenon extends BaseBean implements Serializable {
     @ApiParam("故障现象描述")
     private String fpName;
 
-    @Column(name = "PARENT_FP_CODE")
-    @ApiParam("父阶现象代码")
-    private String parentFpCode;
-
-    @Column(name = "EQUIPMENT_CODE")
-    @ApiParam("设备代码")
-    private String equipmentCode;
-
+    // 对应(类型信息MesTypeCfg）中的BUSINESS_TYPE_CODE字段
     @Column(name = "FP_TYPE")
-    @ApiParam("故障现象类型")
-    private Integer fpType;
+    @ApiParam("故障现象类型编码")
+    private String fpType;
 }

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

@@ -88,8 +88,8 @@ public class MesPart extends BaseBean implements Serializable {
     @ApiParam("产品编码匹配类型")
     private Integer productMatchType;
 
-    @Column(name = "产品生产类型")
-    @ApiParam("产品类型名称")
+    @Column(name = "PPT_CODE")
+    @ApiParam("产品类型代码")
     private String pptCode;
 
     @Column(name = "PART_TRAIT")

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

@@ -54,6 +54,10 @@ public class MesPlc extends BaseBean implements Serializable {
     @ApiParam("通道")
     private String channel;
 
+    @Column(name = "DEVICE")
+    @ApiParam("终端")
+    private String device;
+
     @Column(name = "TAG_NAME")
     @ApiParam("标签名称")
     private String tagName;
@@ -70,14 +74,26 @@ public class MesPlc extends BaseBean implements Serializable {
     @ApiParam("分组名称")
     private String groupName;
 
-    @Column(name = "DEVICE")
-    @ApiParam("驱动")
-    private String device;
+    @Column(name = "ANALYSIS_RULE")
+    @ApiParam("解析规则")
+    private String analysisRule;
+
+    @Column(name = "IS_ANALYSIS")
+    @ApiParam("是否解析")
+    private String isAnalysis;
+
+    @Column(name = "PLC_CFG")
+    @ApiParam("PLC配置")
+    private String plcCfg;
 
     @Column(name = "EQUIPMENT_CODE")
     @ApiParam("设备代码")
     private String equipmentCode;
 
+    @Column(name = "TOOLING_CODE ")
+    @ApiParam("工装代码")
+    private String toolingCode;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("生产线")
     private String workCenterCode;
@@ -86,18 +102,6 @@ public class MesPlc extends BaseBean implements Serializable {
     @ApiParam("工位")
     private String workCellCode;
 
-    @Column(name = "PLC_CFG")
-    @ApiParam("PLC的值的设定")
-    private String plcCfg;
-
-    @Column(name = "ANALYSIS_RULE")
-    @ApiParam("解析规则")
-    private String analysisRule;
-
-    @Column(name = "IS_ANALYSIS")
-    @ApiParam("是否解析")
-    private String isAnalysis;
-
     @Column(name = "FEED_VALUE")
     @ApiParam("反馈值")
     private String feedValue;
@@ -114,6 +118,10 @@ public class MesPlc extends BaseBean implements Serializable {
     @ApiParam("空间索引")
     private Integer nameSpaceIndex = 2;
 
+    @Column(name = "PLC_TYPE")
+    @ApiParam("PLC类型")
+    private Integer plcType;
+
     @Column(name = "USER_NAME")
     @ApiParam("用户名")
     private String userName;
@@ -130,10 +138,6 @@ public class MesPlc extends BaseBean implements Serializable {
     @ApiParam("OPC值")
     private List<ProductDataModel> opcValue;
 
-    @Column(name = "TOOLING_CODE ")
-    @ApiParam("工装代码")
-    private String toolingCode;
-
 
     @Transient
     @ApiParam("标签数据")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.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;
 import java.io.Serializable;
 
 /**
@@ -37,4 +38,16 @@ public class MesProcess extends BaseBean implements Serializable {
     @Column(name = "PROCESS_NAME")
     @ApiParam("工序名称")
     private String processName;
+
+    @Transient
+    @ApiParam("生产线代码")
+    private String workCenterCode;
+
+    @Transient
+    @ApiParam("工位代码")
+    private String workCellCode;
+
+    @Transient
+    @ApiParam("流程代码")
+    private String routeCode;
 }

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

@@ -43,6 +43,10 @@ public class MesQueueShipping extends BaseBean implements Serializable {
     @ApiParam("vin")
     private String vinCode;
 
+    @Column(name = "CAR_NO")
+    @ApiParam("车号")
+    private String carNo;
+
     @Column(name = "CUST_FLAG_NO")
     @ApiParam("客户标识号")
     private String custFlagNo;
@@ -63,4 +67,12 @@ public class MesQueueShipping extends BaseBean implements Serializable {
     @ApiParam("客户产线代码")
     private String custPlantCode;
 
+    @Column(name = "JIT_LOT_NO")
+    @ApiParam("JIT队列批次")
+    private String jitLotNo;
+
+    @Column(name = "JIT_ACTUAL_NO")
+    @ApiParam("客户JIT队列编号")
+    private String jitActualNo;
+
 }

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

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -47,4 +44,8 @@ public class MesRoute extends BaseBean implements Serializable {
     @Column(name = "ROUTE_TYPE")
     @ApiParam("流程类型 10-扫描类型 20-监控类型")
     private Integer routeType;
+
+    @Transient
+    @ApiParam("生产线")
+    private String workCenterCode;
 }

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.mes.model.StepResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -88,4 +89,8 @@ public class MesStateMachineStatus extends BaseBean implements Serializable {
     @Transient
     @ApiParam("前端显示颜色")
     private String color;
+
+    @Transient
+    @ApiParam("状态执行情况")
+    private StepResult stepResult;
 }

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

@@ -31,11 +31,11 @@ import java.io.Serializable;
 })
 @Api("工作单元组件参数配置")
 public class MesWorkCellModuleParam extends BaseBean implements Serializable {
-    private static final long serialVersionUID = 4836155960343256982L;
+	private static final long serialVersionUID = 4836155960343256982L;
 
-    @Column(name = "WORK_CENTER_CODE")
-    @ApiParam("产线")
-    private String workCenterCode;
+	@Column(name = "WORK_CENTER_CODE")
+	@ApiParam("产线")
+	private String workCenterCode;
 
 	@Column(name = "WORK_CELL_CODE")
 	@ApiParam("工作单元代码")

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

@@ -0,0 +1,32 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @author wangjie
+ * @date 2020/4/9 18:00
+ * @desc
+ */
+@Data
+public class BypassModel {
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @ApiParam("Bypass编码")
+    private String bypassCode;
+
+    @ApiParam("检测项")
+    private String businessValue;
+
+    @ApiParam("是否确认，1=已确认，2=未确认")
+    private String isVerify;
+
+    @ApiParam("生产数据ID")
+    private Long productDataId;
+
+}

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

@@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.mes.model;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.mes.annotation.ElasticSearch;
 import cn.estsh.i3plus.pojo.mes.annotation.Json4Es;
-//import com.sun.tools.javac.util.List;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.Data;

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

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+* @Description : 生产配方模板
+* @Reference :
+* @author: jessica.chen
+* @date: 2020/4/16 17:10
+* @Modify:
+*/
+
+@Data
+@Api(value="生产配方模板",description = "生产配方模板")
+public class MesPartFormulaModel extends BaseBean {
+
+    private static final long serialVersionUID = 2167743108452607620L;
+
+    @ApiParam(value = "组号")
+    @AnnoOutputColumn
+    private String groupNo;
+
+    @ApiParam(value = "组内名称")
+    @AnnoOutputColumn
+    private String groupName;
+
+    @ApiParam(value = "原材料物料号")
+    @AnnoOutputColumn(required = false)
+    private String partNo;
+
+    @ApiParam(value = "编号")
+    @AnnoOutputColumn
+    private String orderNo;
+
+    @ApiParam(value = "下标值")
+    @AnnoOutputColumn
+    private Integer index;
+
+}

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

@@ -1,74 +0,0 @@
-package cn.estsh.i3plus.pojo.mes.model;
-
-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;
-import java.io.Serializable;
-
-/**
- * @Description :MES_JIT发运队列
- * @Reference :
- * @Author : qianhausheng
- * @CreateDate : 2020-03-06 10:16 上午
- * @Modify:
- **/
-@Data
-@Entity
-@DynamicInsert
-@DynamicUpdate
-@EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_QUEUE_SHIPPING")
-@Api("MES_JIT发运队列")
-public class MesQueueShipping extends BaseBean implements Serializable {
-
-    private static final long serialVersionUID = 655875369308414110L;
-
-    @Column(name = "JIT_NO")
-    @ApiParam("队列编号")
-    private String jitNo;
-
-    @Column(name = "PROD_CFG_CODE")
-    @ApiParam("配置代码")
-    private String prodCfgCode;
-
-    @Column(name = "VIN_CODE")
-    @ApiParam("vin")
-    private String vinCode;
-
-    @Column(name = "CUST_FLAG_NO")
-    @ApiParam("客户标识号")
-    private String custFlagNo;
-
-    @Column(name = "SEQ")
-    @ApiParam("排序号")
-    private Double seq;
-
-    @Column(name = "STATUS")
-    @ApiParam("状态")
-    private Integer status;
-
-    @Column(name = "CUST_CODE")
-    @ApiParam("客户代码")
-    private String custCode;
-
-    @Column(name = "CUST_PLANT_CODE")
-    @ApiParam("客户产线代码")
-    private String custPlantCode;
-
-    @Column(name = "JIT_LOT_NO")
-    @ApiParam("JIT队列批次")
-    private String jitLotNo;
-
-    @Column(name = "JIT_ACTUAL_NO")
-    @ApiParam("客户JIT队列编号")
-    private String jitActualNo;
-
-}

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

@@ -1,73 +0,0 @@
-package cn.estsh.i3plus.pojo.mes.model;
-
-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;
-import java.io.Serializable;
-
-/**
- * @Description :MES_JIT发运队列明细
- * @Reference :
- * @Author : qianhausheng
- * @CreateDate : 2020-03-06 10:16 上午
- * @Modify:
- **/
-@Data
-@Entity
-@DynamicInsert
-@DynamicUpdate
-@EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_QUEUE_SHIPPING_DETAIL")
-@Api("MES_JIT发运队列明细")
-public class MesQueueShippingDetail extends BaseBean implements Serializable {
-
-    private static final long serialVersionUID = 1442091799346314190L;
-
-    @Column(name = "JIT_NO")
-    @ApiParam("队列编号")
-    private String jitNo;
-
-    @Column(name = "PROD_CFG_CODE")
-    @ApiParam("配置代码")
-    private String prodCfgCode;
-
-    @Column(name = "PART_NO")
-    @ApiParam("物料号")
-    private String partNo;
-
-    @Column(name = "PART_NAME_RDD")
-    @ApiParam("物料名称")
-    private String partNameRdd;
-
-    @Column(name = "status")
-    @ApiParam("状态")
-    private Integer status;
-
-    @Column(name="SERIAL_NUMBER")
-    @ApiParam("过程条码")
-    private String serialNumber;
-
-    @Column(name = "QUEUE_GROUP_NO")
-    @ApiParam("分组队列编号")
-    private String queueGroupNo;
-
-    @Column(name = "GROUP_NO")
-    @ApiParam("组内编号")
-    private Integer groupNo;
-
-    @Column(name = "GROUP_SEQ")
-    @ApiParam("分组序号")
-    private String groupSeq;
-
-    @Column(name = "qty")
-    @ApiParam("数量")
-    private Double qty;
-}

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

@@ -17,7 +17,7 @@ import lombok.Data;
 public class MesWorkOrderModel {
 
     @ApiParam("工单号")
-    @AnnoOutputColumn(required = false)
+    @AnnoOutputColumn
     private String orderNo;
 
     @ApiParam("物料号")

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

@@ -0,0 +1,36 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate: 2019\10\24 22:04
+ * @Modify:
+ **/
+@Data
+public class PartDismantleModel {
+
+    @ApiParam("子物料编码")
+    private String itemPartNo;
+
+    @ApiParam("子物料名称")
+    private String itemPartName;
+
+    @ApiParam("拆解数")
+    private BigDecimal dismantleQty;
+
+    @ApiParam("合格数")
+    private BigDecimal okQty;
+
+    @ApiParam("缺失数")
+    private BigDecimal missQty;
+
+    @ApiParam("报废数")
+    private BigDecimal scrapQty;
+
+}

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

@@ -21,17 +21,20 @@ public class QueueJitActualModule {
     private String queueGroupNo;
     @ApiParam("组内编号")
     private Integer groupNo;
+    @ApiParam("JIT排序号")
+    private String jitSeq;
 
     public QueueJitActualModule() {
 
     }
 
-    public QueueJitActualModule(Long id, String vinCode, Double seq, String queueGroupNo, Integer groupNo) {
+    public QueueJitActualModule(Long id, String vinCode, Double seq, String queueGroupNo, Integer groupNo, String jitSeq) {
         this.id = id;
         this.vinCode = vinCode;
         this.seq = seq;
         this.queueGroupNo = queueGroupNo;
         this.groupNo = groupNo;
+        this.jitSeq = jitSeq;
     }
 
 }

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

@@ -79,6 +79,14 @@ public class QueueOrderModel implements Serializable {
     @ApiParam("产品类型名称")
     private String pptCode;
 
+    @ApiParam("JIT队列批次")
+    private String jitLotNo;
+    @ApiParam("vin")
+    private String vinCode;
+
+    @ApiParam("客户JIT队列编号")
+    private String jitActualNo;
+
     public QueueOrderModel() {
     }
 
@@ -162,7 +170,7 @@ public class QueueOrderModel implements Serializable {
         this.orderNo = orderNo;
     }
 
-    public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted) {
+    public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo) {
         this.id = id;
         this.queDetailSeq = queDetailSeq;
         this.pgCode = pgCode;
@@ -170,6 +178,7 @@ public class QueueOrderModel implements Serializable {
         this.groupNo = groupNo;
         this.prodCfgCode = prodCfgCode;
         this.isGroupPrinted = isGroupPrinted;
+        this.jitActualNo = jitActualNo;
     }
 
     public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
@@ -234,4 +243,12 @@ public class QueueOrderModel implements Serializable {
         this.partNameRdd = partNameRdd;
         this.organizeCode = organizeCode;
     }
+
+    public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode) {
+        this.id = id;
+        this.queueGroupNo = queueGroupNo;
+        this.jitLotNo = jitLotNo;
+        this.vinCode = vinCode;
+        this.organizeCode = organizeCode;
+    }
 }

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

@@ -16,27 +16,27 @@ import java.io.Serializable;
 @Data
 @Api("JIT发运队列列表Model")
 public class QueueShippingModel implements Serializable {
-    private Long id;
+	private Long id;
 
-    @ApiParam("显示颜色")
-    private String color;
+	@ApiParam("显示颜色")
+	private String color;
 
-    @ApiParam("队列编号")
-    private String jisActualNo;
+	@ApiParam("队列编号")
+	private String jisActualNo;
 
-    @ApiParam("产品位置代码")
-    private String produceCtgyCode;
+	@ApiParam("产品位置代码")
+	private String produceCtgyCode;
 
-    @ApiParam("产品位置")
-    private String prodCfgName;
+	@ApiParam("产品位置")
+	private String prodCfgName;
 
-    @ApiParam("起始vin")
-    private String vin;
+	@ApiParam("起始vin")
+	private String vin;
 
-    @ApiParam("结束vin")
-    private String endVin;
+	@ApiParam("结束vin")
+	private String endVin;
 
-    @ApiParam("料架号")
-    private String queueGroupNo;
+	@ApiParam("料架号")
+	private String queueGroupNo;
 
 }

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

@@ -97,7 +97,7 @@ public class StepPrintSnModel extends MesProduceSn {
     @ApiParam("车型代码")
     private String carModuleCode;
     @ApiParam("上一个序列号")
-    private Double lastQueDetailSeq;
+    private String lastQueDetailSeq;
     @ApiParam("包装数量")
     private Integer pgCodeNum;
 

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

@@ -18,12 +18,20 @@ public class StepResult<T> {
 
     private String msg;
 
+    private boolean needStop;
+
     private StationRequestBean stationRequestBean;
 
     public static StepResult getNonComplete() {
         return new StepResult(false, "");
     }
 
+    public static StepResult getNonCompleteStop() {
+        StepResult result = new StepResult(false, "");
+        result.setNeedStop(true);
+        return result;
+    }
+
     public static StepResult getNonComplete(StationRequestBean requestBean) {
         return new StepResult(false, "");
     }
@@ -36,6 +44,12 @@ public class StepResult<T> {
         return new StepResult(false, reqBean);
     }
 
+    public static <T> StepResult getNonCompleteReqBeanStop(StationRequestBean reqBean) {
+        StepResult stepResult = new StepResult(false, reqBean);
+        stepResult.setNeedStop(true);
+        return stepResult;
+    }
+
     public static <T> StepResult getNonCompleteData(T data) {
         return new StepResult(false, data, "");
     }
@@ -44,6 +58,12 @@ public class StepResult<T> {
         return new StepResult(false, msg);
     }
 
+    public static StepResult getNonCompleteStop(String msg) {
+        StepResult stepResult = new StepResult(false, msg);
+        stepResult.setNeedStop(true);
+        return stepResult;
+    }
+
     public static StepResult getSuccessComplete(String msg) {
         return new StepResult(true, msg);
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardRepository.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBoard;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 8:53 下午
+ * @Modify:
+ */
+@Repository
+public interface MesBoardRepository extends BaseRepository<MesBoard, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultCauseRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquFaultCause;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\10 0010 13:08
+ * @Modify:
+ **/
+public interface MesEquFaultCauseRepository extends BaseRepository<MesEquFaultCause, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultMethodRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquFaultMethod;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\10 0010 13:07
+ * @Modify:
+ **/
+public interface MesEquFaultMethodRepository extends BaseRepository<MesEquFaultMethod, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultPhenomenonRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquFaultPhenomenon;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\10 0010 13:05
+ * @Modify:
+ **/
+public interface MesEquFaultPhenomenonRepository extends BaseRepository<MesEquFaultPhenomenon, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStepGroupRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesStepGroup;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesStepGroupRepository extends BaseRepository<MesStepGroup, Long> {
+}

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

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.mes.bean.*;
 import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper;
@@ -1324,8 +1325,50 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesFaultMethod.getFmName())) {
             DdlPreparedPack.getStringLikerPack(mesFaultMethod.getFmName(), "fmName", packBean);
         }
-        if (!StringUtils.isEmpty(mesFaultMethod.getParentFmCode())) {
-            DdlPreparedPack.getStringLikerPack(mesFaultMethod.getParentFmCode(), "parentFmCode", packBean);
+        if (!StringUtils.isEmpty(mesFaultMethod.getFmType())) {
+            DdlPreparedPack.getStringLikerPack(mesFaultMethod.getFmType(), "fmType", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES 设备故障处理措施查询条件封装
+     *
+     * @param mesEquFaultMethod
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesEquFaultMethod(MesEquFaultMethod mesEquFaultMethod, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquFaultMethod, organizeCode);
+        if (!StringUtils.isEmpty(mesEquFaultMethod.getFmCode())) {
+            DdlPreparedPack.getStringLikerPack(mesEquFaultMethod.getFmCode(), "fmCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquFaultMethod.getFmName())) {
+            DdlPreparedPack.getStringLikerPack(mesEquFaultMethod.getFmName(), "fmName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquFaultMethod.getEquipmentCode())) {
+            DdlPreparedPack.getStringLikerPack(mesEquFaultMethod.getEquipmentCode(), "equipmentCode", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES 设备故障原因查询条件封装
+     *
+     * @param mesEquFaultCause
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesEquFaultCause(MesEquFaultCause mesEquFaultCause, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquFaultCause, organizeCode);
+        if (!StringUtils.isEmpty(mesEquFaultCause.getFcCode())) {
+            DdlPreparedPack.getStringLikerPack(mesEquFaultCause.getFcCode(), "fcCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquFaultCause.getFcName())) {
+            DdlPreparedPack.getStringLikerPack(mesEquFaultCause.getFcName(), "fcName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquFaultCause.getEquipmentCode())) {
+            DdlPreparedPack.getStringLikerPack(mesEquFaultCause.getEquipmentCode(), "equipmentCode", packBean);
         }
         return packBean;
     }
@@ -1345,8 +1388,8 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesFaultCause.getFcName())) {
             DdlPreparedPack.getStringLikerPack(mesFaultCause.getFcName(), "fcName", packBean);
         }
-        if (!StringUtils.isEmpty(mesFaultCause.getParentFcCode())) {
-            DdlPreparedPack.getStringLikerPack(mesFaultCause.getParentFcCode(), "parentFcCode", packBean);
+        if (!StringUtils.isEmpty(mesFaultCause.getFcType())) {
+            DdlPreparedPack.getStringLikerPack(mesFaultCause.getFcType(), "fcType", packBean);
         }
         return packBean;
     }
@@ -1366,8 +1409,29 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpName())) {
             DdlPreparedPack.getStringLikerPack(mesFaultPhenomenon.getFpName(), "fpName", packBean);
         }
-        if (!StringUtils.isEmpty(mesFaultPhenomenon.getParentFpCode())) {
-            DdlPreparedPack.getStringLikerPack(mesFaultPhenomenon.getParentFpCode(), "parentFpCode", packBean);
+        if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpType())) {
+            DdlPreparedPack.getStringLikerPack(mesFaultPhenomenon.getFpType(), "fpType", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES 设备故障现象查询条件封装
+     *
+     * @param mesEquFaultPhenomenon
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesEquFaultPhenomenon(MesEquFaultPhenomenon mesEquFaultPhenomenon, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquFaultPhenomenon, organizeCode);
+        if (!StringUtils.isEmpty(mesEquFaultPhenomenon.getFpCode())) {
+            DdlPreparedPack.getStringLikerPack(mesEquFaultPhenomenon.getFpCode(), "fpCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquFaultPhenomenon.getFpName())) {
+            DdlPreparedPack.getStringLikerPack(mesEquFaultPhenomenon.getFpName(), "fpName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquFaultPhenomenon.getEquipmentCode())) {
+            DdlPreparedPack.getStringLikerPack(mesEquFaultPhenomenon.getEquipmentCode(), "equipmentCode", packBean);
         }
         return packBean;
     }
@@ -2400,4 +2464,34 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    public static DdlPackBean getMesPartFormula(MesPartFormula mesPartFormula) {
+        DdlPackBean packBean = getAllBaseData(mesPartFormula.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(mesPartFormula.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getNumEqualPack(mesPartFormula.getFormulaType(), "formulaType", packBean);
+        DdlPreparedPack.getStringLikerPack(mesPartFormula.getFormulaContent(), "formulaContent", packBean);
+        DdlPreparedPack.getNumEqualPack(mesPartFormula.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
+
+    /**
+     * 看板
+     *
+     * @param board
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesBoard(MesBoard board, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(board, organizeCode);
+        if (!StringUtils.isEmpty(board.getBoardCode())) {
+            DdlPreparedPack.getStringLikerPack(board.getBoardCode(), "boardCode", packBean);
+        }
+        if (!StringUtils.isEmpty(board.getBoardName())) {
+            DdlPreparedPack.getStringLikerPack(board.getBoardName(), "boardName", packBean);
+        }
+        if (!StringUtils.isEmpty(board.getBoardType())) {
+            DdlPreparedPack.getStringLikerPack(board.getBoardType(), "boardType", packBean);
+        }
+        return packBean;
+    }
 }

modules/i3plus-pojo-model/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-model</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-DEV-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java

@@ -36,6 +36,6 @@ public class FormOperateDataModel {
     private String sourceName;
 
     @ApiModelProperty("操作数据集合")
-    private List<Map<String,String>> operateDataList;
+    private List<Map<String,Object>> operateDataList;
 
 }

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

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.model.mes;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/8/21 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("mes导入结果model")
+public class ExcelImportModel<T> implements Serializable {
+
+    @ApiParam("结果")
+    private boolean result;
+
+    @ApiParam("成功行数量")
+    private int successRowNum;
+
+    @ApiParam("失败行数量")
+    private int failRowNum;
+
+    @ApiParam("错误信息集合")
+    private List<ImportErrorModel> ImportErrorModels;
+
+    @ApiParam("错误的行号")
+    private String errorRows;
+
+    @ApiParam("导入数据集合")
+    private List<T> excelList;
+
+    @ApiParam("导入进度")
+    private String importSpeed;
+
+}

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

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.model.mes;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/8/21 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("mes导入异常结果model")
+public class ImportErrorModel implements Serializable {
+
+    @ApiParam("错误的行号")
+    private int rowNum;
+
+    @ApiParam("错误数量")
+    private int errorNum;
+
+    @ApiParam("错误列号")
+    private String cellNum;
+
+    @ApiParam("错误描述")
+    private String errorInfo;
+
+}

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

@@ -0,0 +1,40 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+
+import cn.estsh.i3plus.pojo.model.mes.ImportErrorModel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @Author: siliter.yuan
+ * @CreateDate: 2020/4/21 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("导入结果model")
+public class ExcelImportModel implements Serializable {
+
+    @ApiParam("结果")
+    private boolean result;
+
+    @ApiParam("成功行数量")
+    private int successRowNum;
+
+    @ApiParam("工作薄名称")
+    private String sheetName;
+
+    @ApiParam("导入数据集合")
+    private List<ConcurrentHashMap<String, Object>> excelList;
+
+    @ApiParam("错误信息集合")
+    private List<ImportErrorModel> ImportErrorModels;
+}

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

@@ -339,6 +339,7 @@ public class CoreHqlPack {
         }
         DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result);
         DdlPreparedPack.getStringLikerPack(dictionary.getParentCodeRdd(), "parentCodeRdd", result);
+        DdlPreparedPack.getStringLikerPack(dictionary.getDictionaryValue(), "dictionaryValue", result);
         DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result);
 
         // 添加默认排序
@@ -754,7 +755,7 @@ public class CoreHqlPack {
         DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result);
         DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNo(),"orderNo",result);
         if (orderNoRule.getSerialNo() != null) {
-            DdlPreparedPack.getStringLikerPack(String.valueOf(orderNoRule.getSerialNo()), "serialNo", result);
+            DdlPreparedPack.getNumEqualPack(String.valueOf(orderNoRule.getSerialNo()), "serialNo", result);
         }
 
         // 添加默认排序
@@ -995,10 +996,11 @@ public class CoreHqlPack {
 
         DdlPreparedPack.getStringEqualPack(sysDictionary.getName(), "name", packBean);
         DdlPreparedPack.getStringEqualPack(sysDictionary.getDictionaryCode(), "dictionaryCode", packBean);
-        DdlPreparedPack.getStringEqualPack(sysDictionary.getParentCodeRdd(), "parentCodeRdd", packBean);
+        DdlPreparedPack.getStringEqualPack(sysDictionary.getParentNameRdd(), "parentNameRdd", packBean);
         DdlPreparedPack.getNumEqualPack(sysDictionary.getParentId(),"parentId",packBean);
         DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionarySoftType(), "dictionarySoftType", packBean);
         DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryGroup(),"dictionaryGroup",packBean);
+        DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryValue(),"dictionaryValue",packBean);
 
         return packBean;
     }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.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;
 import java.io.Serializable;
 
 /**
@@ -41,4 +42,12 @@ public class PtlAreaRoute extends BaseBean implements Serializable {
     @Column(name = "ROUTE_TYPE")
     @ApiParam("流程类型")
     private Integer routeType;
+
+    @Transient
+    @ApiParam("区域代码")
+    private String areaName;
+
+    @Transient
+    @ApiParam("流程名称")
+    private String routeName;
 }

modules/i3plus-pojo-softswitch/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-softswitch</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-DEV-SNAPSHOT</version>
 
     <dependencies>
 

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

@@ -0,0 +1,47 @@
+package cn.estsh.i3plus.pojo.softswitch.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
+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.Lob;
+import javax.persistence.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-04-15 16:56
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "BS_LONG_DATA")
+@Api(value = "长数据", description = "长数据")
+public class BsLongData extends BaseBean {
+
+    @Column(name = "REF_ID")
+    @ApiParam(value = "关联id")
+    private Long refId;
+
+    @Column(name = "REF_DATA_TYPE")
+    @ApiParam(value = "数据类型")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.REF_DATA_TYPE.class)
+    private Integer refDataType;
+
+    @Lob
+    @Column(name = "DATA")
+    @ApiParam(value = "数据")
+    private String data;
+}

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

@@ -69,13 +69,11 @@ public class BsSuitDataDetail extends BaseBean {
     private String getDateTime;
 
     // 移动至记录数据表
-    @Lob
     @Column(name = "ORGIN_DATA")
     @ApiParam(value = "原始报文数据")
     private String orginData;
 
     // 移动至记录数据表
-    @Lob
     @Column(name = "TRANS_DATA")
     @ApiParam(value = "转换后的报文数据")
     private String transData;

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.softswitch.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -49,6 +51,7 @@ public class BsSuitRecord extends BaseBean {
 
     @Column(name = "CASE_TYPE_ID")
     @ApiParam(value = "套件类型id(枚举)")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.CASE_TYPE.class)
     private Integer caseTypeId;
 
     @Column(name = "SUIT_CASE_DETAIL_ID")
@@ -90,7 +93,6 @@ public class BsSuitRecord extends BaseBean {
     @ApiParam(value = "认证结果")
     private Integer suitSslKeyResult;
 
-    // 移动至记录数据表
     @Column(name = "SUIT_SSL_KEY_RESULT_MESSAGE")
     @ApiParam(value = "认证信息")
     private String suitSslKeyResultMessage;
@@ -113,9 +115,8 @@ public class BsSuitRecord extends BaseBean {
     private Long executeTime;
 
     // 移动至记录数据表
-    @Lob
     @Column(name = "SUIT_MESSAGE")
-    @ApiParam(value = "适配信息")
+    @ApiParam(value = "适配信息 longDataId")
     private String suitMessage;
 
     @Column(name = "PROCESS_STATE")

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.softswitch.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsLongData;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-04-15 17:15
+ * @Modify:
+ **/
+@Repository
+public interface BsLongDataRepository extends BaseRepository<BsLongData,Long> {
+}

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

@@ -327,8 +327,8 @@ public class SoftSwitchHqlPack {
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitResult(),"suitResult",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getProcessState(), "processState", ddlPackBean);
-        DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);
         DdlPreparedPack.timeBuilder(bsSuitRecord.getSuitStartTime(), "suitStartTime", ddlPackBean, false, true);
+        DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);
 
         ddlPackBean.setOrderByStr(bsSuitRecord.orderBy());
 
@@ -345,16 +345,32 @@ public class SoftSwitchHqlPack {
         DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitTypeNameRdd(),"suitTypeNameRdd",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getCaseTypeId(), "caseTypeId", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getProcessState(),"processState",ddlPackBean);
         DdlPreparedPack.timeBuilder(bsSuitDataDetail.getGetDateTime(), "getDateTime", ddlPackBean, false, true);
         DdlPreparedPack.timeBuilder(bsSuitDataDetail.getProcessTime(), "processTime", ddlPackBean, false, true);
+        DdlPreparedPack.timeBuilder(bsSuitDataDetail.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);
 
         ddlPackBean.setOrderByStr(bsSuitDataDetail.orderBy());
 
         return ddlPackBean;
     }
 
+
+    /**
+     * 适配记录查询条件封装
+     * @return
+     */
+    public static DdlPackBean packHqlBsSuitRequestRecord(BsSuitRequestRecord bsSuitRequestRecord){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bsSuitRequestRecord);
+
+        DdlPreparedPack.getNumEqualPack(bsSuitRequestRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
+        DdlPreparedPack.timeBuilder(bsSuitRequestRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);
+
+        return ddlPackBean;
+    }
+
     /**
      * 适配文件条件封装
      * @param bsSuitFile 查询条件
@@ -374,17 +390,6 @@ public class SoftSwitchHqlPack {
         return ddlPackBean;
     }
 
-    public static DdlPackBean packHqlSuitRecordBySuitCaseCodeAndProcessState(String suitCaseCode, Integer processState){
-        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
-
-        DdlPreparedPack.getStringEqualPack(suitCaseCode,"suitCaseCode",ddlPackBean);
-        DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean);
-
-        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean);
-
-        return ddlPackBean;
-    }
-
     public static DdlPackBean packHqlSuitDataDetailBySuitCaseCodeAndProcessState(String suitCaseCode, Integer processState){
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
@@ -396,26 +401,6 @@ public class SoftSwitchHqlPack {
         return ddlPackBean;
     }
 
-    public static DdlPackBean packHqlSuitRecordBySuitRecordIdAndProcessState(Long[] suitRecordIds, Integer processState){
-        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
-
-        DdlPreparedPack.getInPackArray(suitRecordIds,"id",ddlPackBean);
-        DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean);
-
-        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean);
-
-        return ddlPackBean;
-    }
-    public static DdlPackBean packHqlSuitDataDetailBySuitRecordIdAndProcessState(Long[] suitRecordIds, Integer processState){
-        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
-
-        DdlPreparedPack.getInPackArray(suitRecordIds,"suitRecordId",ddlPackBean);
-        DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean);
-
-        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean);
-
-        return ddlPackBean;
-    }
 
     public static DdlPackBean packHqlBsSuitRecordParam(BsSuitRecordParam bsSuitRecordParam){
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();

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

@@ -305,4 +305,10 @@ public class WmsPart extends BaseBean {
         this.qty = cqty;
         this.partType = partType;
     }
+
+    public WmsPart(String partGroup, Double cqty, String createDateTime) {
+        this.partGroup = partGroup;
+        this.qty = cqty;
+        this.createDatetime = createDateTime;
+    }
 }

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

@@ -0,0 +1,75 @@
+package cn.estsh.i3plus.pojo.wms.bean.template;
+
+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;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description : 导入模板信息
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-04-16 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="BAS_IMPORT_TEMPLATE")
+@Api("导入模板信息")
+public class BasImportTemplate extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592889L;
+    @Column(name="TEMPLATE_CODE")
+    @ApiParam("模板代码")
+    private String templateCode;
+
+    @Column(name="TEMPLATE_NAME")
+    @ApiParam("模板名称")
+    private String templateName;
+
+    @Column(name="TEMPLATE_DESC")
+    @ApiParam("模板描述")
+    private String templateDesc;
+
+    @Column(name="GROUP_NAME")
+    @ApiParam("分组名称")
+    private String groupName;
+
+    /**
+     * 10-单表，20-多表
+     */
+    @Column(name="IMPORT_TYPE")
+    @ApiParam(value = "导入类型", example = "0")
+    private Integer importType;
+
+    /**
+     *  10-全覆盖，20-差异更新，30-重复不导入
+     */
+    @Column(name="UPDATE_TYPE")
+    @ApiParam(value = "更新类型", example = "0")
+    private Integer updateType;
+
+    @Column(name="SCRIPT_NO")
+    @ApiParam("脚本编号")
+    private String scriptNo;
+
+    @Column(name="START_ROW")
+    @ApiParam(value = "起始行", example = "0")
+    private Integer startRow;
+
+    @Transient
+    @ApiParam("模板明细列表")
+    private List<BasImportTemplateDetails> templateDetailsList;
+}

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

@@ -0,0 +1,117 @@
+package cn.estsh.i3plus.pojo.wms.bean.template;
+
+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 : siliter.yuan
+ * @CreateDate : 2020-04-16 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="BAS_IMPORT_TEMPLATE_DETAILS")
+@Api("导入模板明细信息")
+public class BasImportTemplateDetails extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592999L;
+    @Column(name="TEMPLATE_CODE")
+    @ApiParam("模板代码")
+    private String templateCode;
+
+    @Column(name="TABLE_NAME")
+    @ApiParam("表名称")
+    private String tableName;
+
+    @Column(name="FIELD_CODE")
+    @ApiParam("字段英文名称")
+    private String fieldCode;
+
+    @Column(name="FIELD_ALIAS")
+    @ApiParam("字段别名")
+    private String fieldAlias;
+
+    @Column(name="LABEL_CODE")
+    @ApiParam("标签代码")
+    private String labelCode;
+
+    @Column(name="LABEL_NAME")
+    @ApiParam("标签名称")
+    private String labelName;
+
+    @Column(name="DEFAULT_VALUE")
+    @ApiParam("默认值")
+    private String defaultValue;
+
+    /**
+     * 数据格式 文本、整数、小数、日期
+     */
+    @Column(name="DATA_FORAMT")
+    @ApiParam("数据格式")
+    private String dataFormat;
+
+    /**
+     *  1-是，2-否
+     */
+    @Column(name="IS_REQUIRE")
+    @ApiParam(value = "是否必填", example = "0")
+    private Integer isRequire;
+
+    @Column(name="DECIMAIL_SPLIT")
+    @ApiParam("小数点分隔符")
+    private String decimalSplit;
+
+    @Column(name="THOUSANDS_SPLIT")
+    @ApiParam("千分位分隔符")
+    private String thousandsSplit;
+
+    // YYYY-MM-DD/DD-MM-YY/YYYY-MM-DD HH:mm:ss
+    @Column(name="DATE_FORMAT")
+    @ApiParam("日期格式")
+    private String dateFormat;
+
+    @Column(name="REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+    @Column(name="SEQ")
+    @ApiParam(value = "序号", example = "0")
+    private Integer seq;
+
+    @Column(name="MAX_LENGTH")
+    @ApiParam(value = "最大长度", example = "0")
+    private Integer maxLength;
+
+    @Column(name="RELATION_TABLE")
+    @ApiParam("关联表名")
+    private String relationTable;
+
+    @Column(name="RELATION_FIELD")
+    @ApiParam("关联字段")
+    private String relationField;
+
+    /**
+     * 是否主键 1-是，2-否
+     */
+    @Column(name="IS_PK")
+    @ApiParam(value = "是否主键", example = "0")
+    private Integer isPk;
+
+    @Column(name="SHEET_NAME")
+    @ApiParam("工作薄名称")
+    private String sheetName;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java

@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/**
+ * @description 数据库实例字段模型
+ * @author siliter.yuan
+ * @date 2020/04/16
+ */
+@Data
+@Api("数据库实例字段模型")
+public class BasBeanFieldModel {
+
+    @ApiParam("表名")
+    private String tableName;
+
+    @ApiParam("表描述")
+    private String tableDesc;
+
+    @ApiParam("字段英文名称")
+    private String fieldEnName;
+
+    @ApiParam("字段类型")
+    public String fieldType;
+
+    @ApiParam("字段描述")
+    private String fieldDesc;
+
+    @ApiParam("实例类名")
+    public String entityName;
+
+    @ApiParam("实例字段名称")
+    public String propertyName;
+}

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplateDetails;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 导入模板明细数据操作仓库
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-04-16 10:00
+ * @Modify:
+ **/
+@Repository
+public interface BasImportTemplateDetailsRepository extends BaseRepository<BasImportTemplateDetails, Long> {
+    
+}

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplate;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 导入模板数据操作仓库
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-04-16 10:00
+ * @Modify:
+ **/
+@Repository
+public interface BasImportTemplateRepository extends BaseRepository<BasImportTemplate, Long> {
+    
+}

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

@@ -11,6 +11,8 @@ import cn.estsh.i3plus.pojo.wms.bean.*;
 import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsFieldInfo;
 import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsSearchElementFunction;
 import cn.estsh.i3plus.pojo.wms.bean.plugin.BasPlugin;
+import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplate;
+import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplateDetails;
 import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper;
 import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
 import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence;
@@ -3082,4 +3084,30 @@ public class WmsHqlPack {
 
         return result;
     }
+
+    /**
+     * 导入模板信息分页查询条件
+     * @param template
+     * @return
+     */
+    public static DdlPackBean packHqlBasImportTemplate(BasImportTemplate template) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringLikerPack(template.getTemplateName(), "templateName", result);
+        DdlPreparedPack.getStringEqualPack(template.getTemplateCode(), "templateCode", result);
+        DdlPreparedPack.getStringEqualPack(template.getGroupName(), "groupName", result);
+        getStringBuilderPack(template, result);
+        return result;
+    }
+
+    /**
+     * 导入模板明细信息分页查询条件
+     * @param details
+     * @return
+     */
+    public static DdlPackBean packHqlBasImportTemplateDetails(BasImportTemplateDetails details) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(details.getTemplateCode(), "templateCode", result);
+        getStringBuilderPack(details, result);
+        return result;
+    }
 }