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

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java

@@ -439,11 +439,10 @@ public class AndonHqlPack {
      */
     public static DdlPackBean packHqlAndonConfig(AndonConfig andonConfig){
         DdlPackBean result = new DdlPackBean();
-
         DdlPreparedPack.getStringEqualPack(andonConfig.getConfigCode(), "configCode", result);
-
+        DdlPreparedPack.getNumEqualPack(andonConfig.getConfigGroup(), "configGroup", result);
+        DdlPreparedPack.getNumEqualPack(andonConfig.getConfigType(), "configType", result);
         getStringBuilderPack(andonConfig, result);
-
         return result;
     }
 

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java

@@ -90,7 +90,7 @@ public class WorkPlan extends BaseAPS {
     @Column(name="LOCK_BEGIN")
     @ApiParam(value ="锁定开始时间")
     @FieldAnnotation(modify = false)
-    @RippleAnnotation(dependence = {"PostRelations.PostWork.WorkPlan.produceBegin", "produceBegin"}, method = "calcPositiveLock")
+    @RippleAnnotation(dependence = {"Work.PostRelations.PostWork.WorkPlan.produceBegin", "produceBegin"}, method = "calcPositiveLock")
     private Date lockBegin;
 
     @Column(name="LOCK_END")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java

@@ -229,6 +229,15 @@ public class BeanInfo {
         return null;
     }
 
+    public static List<Class<? extends BaseBean>> getChildClasses(Class<? extends BaseBean> cls) {
+        List<Class<? extends BaseBean>> beanClasses = new ArrayList<>();
+        List<BeanInfo> beanInfos = getBeanInfo(cls).childsBeanInfos;
+        for (BeanInfo beanInfo : beanInfos) {
+            beanClasses.add(beanInfo.getBeanClass());
+        }
+        return beanClasses;
+    }
+
     public static FIELD_TYPE getFieldType(Class<?> cls) {
         FIELD_TYPE type = null;
         if (cls == Boolean.class || cls == boolean.class) {

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

@@ -667,7 +667,7 @@ public class AndonEnumUtil {
         QUALITY("QUALITY_ALARM", 111020006, "质量"),
         EQUIP("EQUMENT_ALARM", 111020007, "设备"),
         PROCESS("ROUTING_ALARM", 111020008, "工艺"),
-        CHECK("OTHER_ALARM", 111020009, "其他"),
+        CHECK("OTHER_ALARM", 111020009, "自处理"),
         FIX_ERROR("FIX_ERROR", 111020010, "自动报警");
 
         private String value;

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

@@ -141,9 +141,13 @@ public class LacEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STACK_STATUS{
-        RUNNING(1,"运行中"),
-        PAUSE(2,"暂停"),
-        FINISH(3,"完成");
+        INIT(10,"初始化"),
+        WAIT(20,"等待中"),
+        RUNNING(30,"运行中"),
+        PAUSE(40,"手动暂停"),
+        FINISH(100,"执行完成"),
+        RUN_ERROR(101,"运行异常"),
+        RUN_STOP(102,"手动结束");
 
         private int value;
         private String description;

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

@@ -9,9 +9,85 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  * @CreateDate : 2018-10-23 15:53
  * @Modify:
  **/
+
 public class MesEnumUtil {
 
     /**
+     * MesDatasource 数据源类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_DB_SOURCE_TYPE {
+
+        SOURCE_MARIA_DB("SOURCE_MARIA_DB", "MariaDB"),
+        SOURCE_SQL_SERVER("SOURCE_SQL_SERVER", "SQL Server"),
+        SOURCE_ORACLE("SOURCE_ORACLE", "Oracle"),
+        SOURCE_POSTGRE_SQL("SOURCE_POSTGRE_SQL", "PostgreSql");
+
+        private String value;
+        private String description;
+
+        MES_DB_SOURCE_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * MesRepair 数据对象操作类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_DADA_OPRATE_TYPE {
+
+        INSERT(10, "insert"),
+        SELECT(20, "select"),
+        UPDATE(30, "update");
+
+        private int value;
+        private String description;
+
+        MES_DADA_OPRATE_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;
+        }
+    }
+
+    /**
      * MesRepair 处理措施
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -1900,4 +1900,37 @@ public class MesPcnEnumUtil {
     }
 
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ONLINE_SEND_TYPE {
+
+        PLC("PLC", "PLC"),
+        DB("DB", "DB");
+
+        private String value;
+        private String description;
+
+        ONLINE_SEND_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String 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-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java

@@ -83,7 +83,7 @@ public class LacCommandStackRecord extends BaseBean {
 
     @Column(name="STACK_SPEND")
     @ApiParam(value ="执行耗时")
-    private Integer stackSpend;
+    private Long stackSpend;
 
     @Column(name="STACK_STATUS")
     @ApiParam(value ="执行状态")
@@ -94,6 +94,10 @@ public class LacCommandStackRecord extends BaseBean {
     private String executionDescription;
 
     @Transient
+    @ApiParam(value ="指令集模板")
+    private LacCommandStackTemplate template;
+
+    @Transient
     @ApiParam(value ="步骤列表")
     private List<LacCommandStackStep> stepList;
 

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java

@@ -79,4 +79,12 @@ public class LacCommandStackStep extends BaseBean {
     @Transient
     @ApiParam(value ="步骤任务列表")
     private List<LacCommandStackStepTask> stepTaskList;
+
+
+    public LacCommandStackStep() {
+    }
+
+    public LacCommandStackStep(Long templateId) {
+        this.templateId = templateId;
+    }
 }

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java

@@ -73,6 +73,10 @@ public class LacCommandStackStepTask extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long stepId;
 
+    /**
+     * 不建议使用
+     */
+    @Deprecated
     @Column(name="TASK_INSTANCE_ID")
     @ApiParam(value ="任务实例ID")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -102,7 +106,19 @@ public class LacCommandStackStepTask extends BaseBean {
     @Column(name="IS_CRUX")
     @ApiParam(value ="是否关键")
     private Integer isCrux;
+
     @Transient
     @ApiParam(value ="适配任务")
     private LacSuitTask lacSuitTask;
+
+    @Transient
+    @ApiParam(value ="适配任务记录")
+    private LacLogTask logTask;
+
+    public LacCommandStackStepTask() {
+    }
+
+    public LacCommandStackStepTask(Long templateId) {
+        this.templateId = templateId;
+    }
 }

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java

@@ -10,10 +10,8 @@ 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.util.List;
 
 /**
  * @Description :
@@ -32,6 +30,12 @@ import javax.persistence.Table;
 public class LacLogTask extends BaseBean {
 
     private static final long serialVersionUID = 674009105885048131L;
+
+    @Column(name="COMMAND_STACK_RECORD_ID")
+    @ApiParam(value ="指令集记录ID" , example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long commandStackRecordId;
+
     @Column(name="commandStackId")
     @ApiParam(value ="指令集ID" , example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -50,6 +54,10 @@ public class LacLogTask extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long commandStackTypeId;
 
+    @Column(name="COMMAND_STACK_TYPE_NAME_RDD")
+    @ApiParam(value ="指令集类型名称")
+    private String commandStackTypeNameRdd;
+
     @Column(name="STEP_ID")
     @ApiParam(value ="步骤ID" , example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -61,7 +69,7 @@ public class LacLogTask extends BaseBean {
 
     @Column(name="STEP_SEQUENCE")
     @ApiParam(value ="步骤顺序")
-    private String stepSequence;
+    private Integer stepSequence;
 
     @Column(name="TASK_ID")
     @ApiParam(value ="任务ID" , example = "-1")
@@ -72,16 +80,25 @@ public class LacLogTask extends BaseBean {
     @ApiParam(value ="任务名称")
     private String taskNameRdd;
 
-    @Column(name="TASK_NAME_TYPE")
+    @Column(name="TASK_TYPE_ID")
     @ApiParam(value ="任务类型")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long taskNameType;
+    private Long taskTypeId;
+
+    @Column(name="TASK_TYPE_NAME_RDD")
+    @ApiParam(value ="任务类型")
+    private String taskTypeNameRdd;
 
     @Column(name="adapterId")
     @ApiParam(value ="适配器ID" , example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long adapterId;
 
+    @Column(name="TASK_DETAIL_ID")
+    @ApiParam(value ="任务执行记录明细" , example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long taskDetailId;
+
     @Lob
     @Column(name="INPUT_PARAMETER")
     @ApiParam(value ="任务入参")
@@ -97,10 +114,17 @@ public class LacLogTask extends BaseBean {
 
     @Column(name="TASK_SPEND")
     @ApiParam(value ="任务耗时")
-    private Integer taskSpend;
+    private Long taskSpend;
 
     @Column(name="TASK_STATUS")
     @ApiParam(value ="任务状态")
     private Integer taskStatus;
 
+    @Column(name="EXECUTION_DESCRIPTION")
+    @ApiParam(value ="执行说明")
+    private String executionDescription;
+
+    @Transient
+    @ApiParam(value ="步骤列表")
+    private List<LacLogTaskDetail> detailList;
 }

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java

@@ -33,6 +33,12 @@ public class LacLogTaskDetail extends BaseBean {
 
 
     private static final long serialVersionUID = -4918694502072594064L;
+
+    @Column(name="COMMAND_STACK_RECORD_ID")
+    @ApiParam(value ="指令集记录ID" , example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long commandStackRecordId;
+
     @Column(name="commandStackId")
     @ApiParam(value ="指令集ID" , example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -48,11 +54,21 @@ public class LacLogTaskDetail extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long stepId;
 
+    @Column(name="LOG_TASK_ID")
+    @ApiParam(value ="任务实例ID" , example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long logTaskId;
+
     @Column(name="TASK_ID")
     @ApiParam(value ="任务ID" , example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long taskId;
 
+    @Column(name="TASK_TYPE_ID")
+    @ApiParam(value ="任务类型")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long taskTypeId;
+
     @Column(name="TASK_NAME_TYPE")
     @ApiParam(value ="任务类型")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -71,6 +87,10 @@ public class LacLogTaskDetail extends BaseBean {
     @ApiParam(value ="任务结束时间")
     private String taskEndTime;
 
+    @Column(name="TASK_SPEND")
+    @ApiParam(value ="任务耗时")
+    private Long taskSpend;
+
     @Lob
     @Column(name="INPUT_PARAMETER")
     @ApiParam(value ="任务入参")
@@ -91,4 +111,9 @@ public class LacLogTaskDetail extends BaseBean {
     @ApiParam(value ="任务出参处理后")
     private String outputParameterBody;
 
+    @Lob
+    @Column(name="ERROR_MESSAGE")
+    @ApiParam(value ="任务执行异常信息")
+    private String errorMessage;
+
 }

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java

@@ -1,15 +1,12 @@
 package cn.estsh.i3plus.pojo.lac.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
@@ -76,6 +73,10 @@ public class LacSuitCase extends BaseBean {
     @ApiParam(value ="硬件类型")
     private Integer hardwareType;
 
+    @Column(name="SOFTWARE_SUIT_CODE")
+    @ApiParam(value ="软适配代码")
+    private String softwareSuitCode;
+
     @Column(name="RETURN_METHOD")
     @ApiParam(value ="返回类型")
     private Integer returnMethod;

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java

@@ -119,6 +119,8 @@ public class LacSuitTask extends BaseBean {
     @ApiParam(value ="任务描述")
     private String taskDescription;
 
+    /********************************** 虚拟字段 **********************************/
+
     @Transient
     @ApiParam(value ="适配套件")
     private LacSuitCase lacSuitCase;
@@ -128,10 +130,6 @@ public class LacSuitTask extends BaseBean {
     private Long taskInstanceId;
 
     @Transient
-    @ApiParam(value ="适配参数")
-    private List<LacSuitTaskParam> lacSuitTaskParamList;
-
-    @Transient
     @ApiParam(value ="适配原始参数")
     private Object orginParam;
 
@@ -148,6 +146,10 @@ public class LacSuitTask extends BaseBean {
     private Object transMessage;
 
     @Transient
+    @ApiParam(value ="适配参数")
+    private List<LacSuitTaskParam> lacSuitTaskParamList;
+
+    @Transient
     @ApiParam(value ="入参适配")
     private List<LacSuitTaskParamAdapter> inputParamAdapterList;
 

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java

@@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.lac.bean.*;
 
+import java.util.List;
+
 /**
  * @Description :
  * @Reference :
@@ -32,6 +34,75 @@ public class LacHqlPack {
     public static DdlPackBean packHqlLacLogTask(LacLogTask bean) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
+        DdlPreparedPack.getNumEqualPack(bean.getCommandStackRecordId(),"commandStackRecordId",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlLacCommandStackTemplate(LacCommandStackTemplate bean) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(bean.getTemplateCode(),"templateCode",ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlLacCommandStackStep(LacCommandStackStep bean) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlLacCommandStackStepTask(LacCommandStackStepTask bean) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlLacSuitTask(LacSuitTask bean) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlLacSuitTask(LacSuitTask bean, List<Long> idList) {
+        DdlPackBean ddlPackBean = packHqlLacSuitTask(bean) ;
+
+        DdlPreparedPack.getInPackList(idList,"id",ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlLacSuitTaskParamAdapter(LacSuitTaskParamAdapter bean) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlLacSuitTaskParamAdapter(LacSuitTaskParamAdapter bean, List<Long> taskIdList) {
+        DdlPackBean ddlPackBean = packHqlLacSuitTaskParamAdapter(bean);
+
+        DdlPreparedPack.getInPackList(taskIdList,"taskId",ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean, List<Long> taskIdList) {
+        DdlPackBean ddlPackBean = packHqlLacSuitTaskParam(bean);
+
+        DdlPreparedPack.getInPackList(taskIdList,"taskId",ddlPackBean);
+
         return ddlPackBean;
     }
 

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

@@ -33,9 +33,13 @@ public class MesProduceSn extends BaseBean implements Serializable {
     private static final long serialVersionUID = 6641051790330191326L;
 
     @Column(name = "SERIAL_NUMBER")
-    @ApiParam("产品条码")
+    @ApiParam("过程条码")
     private String serialNumber;
 
+    @Column(name = "PRODUCT_SN")
+    @ApiParam("产品条码")
+    private String productSn;
+
     @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;

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

@@ -31,7 +31,6 @@ public class MesDataObject extends BaseBean {
     @ApiParam("对象代码")
     private String objectCode;
 
-
     @Column(name = "OBJECT_NAME")
     @ApiParam("对象名称")
     private String objectName;

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

@@ -47,6 +47,10 @@ public class MesProdPack extends BaseBean {
     @ApiParam("包装标签模板2")
     private String packLabelTemplate2;
 
+    @Column(name = "PACK_LABEL_TEMPLATE")
+    @ApiParam("包装标签模板")
+    private String packLabelTemplate;
+
     @Column(name = "PACK_LABEL_TEMPLATE3")
     @ApiParam("包装标签模板3")
     private String packLabelTemplate3;
@@ -58,6 +62,4 @@ public class MesProdPack extends BaseBean {
     @Column(name = "PROD_CFG_TYPE")
     @ApiParam("项目")
     private String prodCfgType;
-
-
 }

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

@@ -30,9 +30,13 @@ import javax.persistence.Transient;
 public class MesProduceSn extends BaseBean {
 
     @Column(name = "SERIAL_NUMBER")
-    @ApiParam("产品条码")
+    @ApiParam("过程条码")
     private String serialNumber;
 
+    @Column(name = "PRODUCT_SN")
+    @ApiParam("产品条码")
+    private String productSn;
+
     @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataObjectRepository.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.MesDataObject;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\4 9:53
+ * @Modify:
+ **/
+public interface MesDataObjectRepository extends BaseRepository<MesDataObject, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesObjectCfgRepository.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.MesObjectCfg;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\4 9:37
+ * @Modify:
+ **/
+public interface MesObjectCfgRepository extends BaseRepository<MesObjectCfg, Long> {
+}

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

@@ -432,15 +432,11 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) {
         DdlPackBean packBean = getAllBaseData(organizeCode);
-        if (!StringUtils.isEmpty(mesConfig.getCfgCode())) {
-            DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean);
-        }
-        if (!StringUtils.isEmpty(mesConfig.getCfgName())) {
-            DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean);
-        }
-        if (mesConfig.getIsValid() != null) {
-            DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean);
-        }
+        DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean);
+        DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean);
+        DdlPreparedPack.getStringEqualPack(mesConfig.getCfgKey(), "cfgKey", packBean);
+        DdlPreparedPack.getStringEqualPack(mesConfig.getCfgType(), "cfgType", packBean);
+        DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean);
         return packBean;
     }
 
@@ -1399,8 +1395,9 @@ public class MesHqlPack {
     }
 
     /**
-<<<<<<< Updated upstream
+     * <<<<<<< Updated upstream
      * MES 缺陷查询条件封装
+     *
      * @param mesDefect
      * @param organizeCode
      * @return
@@ -1421,6 +1418,7 @@ public class MesHqlPack {
 
     /**
      * MES 产品类型图片查询条件封装
+     *
      * @param mesProduceCtgyPicture
      * @param organizeCode
      * @return
@@ -1440,7 +1438,9 @@ public class MesHqlPack {
     }
 
 
-    /** 设备通知对象配置 查询条件封装
+    /**
+     * 设备通知对象配置 查询条件封装
+     *
      * @param mesEquNotifyObjectCfg
      * @param organizeCode
      * @return
@@ -1462,7 +1462,9 @@ public class MesHqlPack {
         return packBean;
     }
 
-    /** 设备作业通知配置  查询条件封装
+    /**
+     * 设备作业通知配置  查询条件封装
+     *
      * @param mesEquTaskNotifyCfg
      * @param organizeCode
      * @return
@@ -1489,6 +1491,7 @@ public class MesHqlPack {
 
     /**
      * MES 类型信息查询条件封装
+     *
      * @param mesTypeCfg
      * @param organizeCode
      * @return
@@ -1512,6 +1515,7 @@ public class MesHqlPack {
 
     /**
      * MES 缺陷原因查询条件封装
+     *
      * @param mesDefectCause
      * @param organizeCode
      * @return
@@ -1532,6 +1536,7 @@ public class MesHqlPack {
 
     /**
      * 按条件分页查询mes设备点检保养维修作业
+     *
      * @param mesEquTaskDetail
      * @param organizeCode
      * @return
@@ -1555,6 +1560,7 @@ public class MesHqlPack {
 
     /**
      * 按条件分页查询首检件配置信息
+     *
      * @param mesFiCfg
      * @param organizeCode
      * @return
@@ -1575,6 +1581,7 @@ public class MesHqlPack {
 
     /**
      * 维修记录
+     *
      * @param mesEquTaskRepairRecord
      * @param organizeCode
      * @return
@@ -1589,6 +1596,7 @@ public class MesHqlPack {
 
     /**
      * 点检或保养记录
+     *
      * @param mesEquTaskStandardRecord
      * @param organizeCode
      * @return
@@ -1603,4 +1611,76 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 对象结构
+     * @param mesObjectCfg
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesObjectCfg(MesObjectCfg mesObjectCfg, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesObjectCfg, organizeCode);
+        if (!StringUtils.isEmpty(mesObjectCfg.getObjectCode())) {
+            DdlPreparedPack.getStringLikerPack(mesObjectCfg.getObjectCode(), "objectCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesObjectCfg.getFieldCode())) {
+            DdlPreparedPack.getStringLikerPack(mesObjectCfg.getFieldCode(), "fieldCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesObjectCfg.getFieldName())) {
+            DdlPreparedPack.getStringLikerPack(mesObjectCfg.getFieldName(), "fieldName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesObjectCfg.getFieldType())) {
+            DdlPreparedPack.getStringLikerPack(mesObjectCfg.getFieldType(), "fieldType", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 数据对象
+     * @param mesDataObject
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesDataObject(MesDataObject mesDataObject, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesDataObject, organizeCode);
+        if (!StringUtils.isEmpty(mesDataObject.getObjectCode())) {
+            DdlPreparedPack.getStringLikerPack(mesDataObject.getObjectCode(), "objectCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesDataObject.getObjectName())) {
+            DdlPreparedPack.getStringLikerPack(mesDataObject.getObjectName(), "objectName", packBean);
+        }
+        if (mesDataObject.getOperateType() != null) {
+            DdlPreparedPack.getNumEqualPack(mesDataObject.getOperateType(), "operateType", packBean);
+        }
+        if (!StringUtils.isEmpty(mesDataObject.getFieldPk())) {
+            DdlPreparedPack.getStringLikerPack(mesDataObject.getObjectName(), "fieldPk", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 产品包装关系
+     * @param mesProdPack
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesProdPack(MesProdPack mesProdPack, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdPack, organizeCode);
+        if (!StringUtils.isEmpty(mesProdPack.getPartNo())) {
+            DdlPreparedPack.getStringEqualPack(mesProdPack.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProdPack.getCustomerCode())) {
+            DdlPreparedPack.getStringEqualPack(mesProdPack.getCustomerCode(), "customerCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProdPack.getPackSpec())) {
+            DdlPreparedPack.getStringLikerPack(mesProdPack.getPackSpec(), "packSpec", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProdPack.getPackLabelTemplate())) {
+            DdlPreparedPack.getStringLikerPack(mesProdPack.getPackLabelTemplate(), "packLabelTemplate", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProdPack.getProdLabelTemplate())) {
+            DdlPreparedPack.getStringLikerPack(mesProdPack.getProdLabelTemplate(), "prodLabelTemplate", packBean);
+        }
+        return packBean;
+    }
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/CloudPagerModel.java

@@ -0,0 +1,22 @@
+package cn.estsh.i3plus.pojo.model.common;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 19-11-4 下午7:37
+ * @Modify:
+ **/
+@Data
+public class CloudPagerModel<T> {
+
+    @ApiParam("查询对象")
+    private T obj;
+
+    @ApiParam("分页参数")
+    private Pager pager;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.model.lac;
 
+import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;
 import java.util.List;
@@ -25,4 +26,10 @@ public class LacSuitRequest {
      */
     private List<Task> taskList;
 
+    /**
+     * 指令集代码
+     */
+    @XStreamCDATA
+    private String paramList;
+
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.model.lac;
 
+import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;
 
@@ -16,5 +17,6 @@ public class Task {
 
     private String code;
 
+    @XStreamCDATA
     private Object paramList;
 }

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

@@ -270,6 +270,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("筛选（>=）或<")
     private String choose;
 
+    @Transient
+    @ApiParam("批次校验规则")
+    private String lotCheckRule;
+
     public WmsStockSn() {
     }