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

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-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-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/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

@@ -1611,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/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() {
     }