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

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

@@ -2519,4 +2519,12 @@ public class CommonEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 业务表：库存条码状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DYNAMIC_DATA_SOURCE_TYPE {
+        MASTER,NODE
+    }
 }

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

@@ -4100,4 +4100,50 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 停机类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STOP_MACHINE_TYPE {
+        TIMER_TIME_OUT(10, "计时器超时停机"),
+        DELAY_HELP(20, "延时帮助停机"),
+        URGENT_STOP(30, "急停停机");
+
+        private int value;
+        private String description;
+
+        STOP_MACHINE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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 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-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAgvStopRecord.java

@@ -0,0 +1,72 @@
+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 : siliter.yuan
+ * @CreateDate : 2020-06-03 15:38
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_AGV_STOP_RECORD")
+@Api("MES_停机记录表")
+public class MesAgvStopRecord extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -8961182851767690154L;
+    @Column(name = "STOP_TYPE")
+    @ApiParam("停机类型")
+    private Integer stopType;
+
+    @Column(name = "PRODUCT_SN")
+    @ApiParam("产品条码")
+    private String productSn;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "STOP_START_TIME")
+    @ApiParam("停机开始时间")
+    private String stopStartTime;
+
+    @Column(name = "STOP_END_TIME")
+    @ApiParam("停机结束时间")
+    private String stopEndTime;
+
+    @Column(name = "STOP_REASON")
+    @ApiParam("停机原因")
+    private String stopReason;
+}

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

@@ -44,6 +44,10 @@ public class MesDefect extends BaseBean implements Serializable {
     @ApiParam("缺陷类型")
     private String defectType;
 
+    @Column(name = "PROD_CFG_TYPE_CODE")
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
     @Transient
     @ApiParam("缺陷类型名称")
     private String defectTypeName;

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

@@ -112,6 +112,9 @@ public class MesProdBindRecord extends BaseBean implements Serializable {
     @ApiParam("原材料零件名称")
     private String itemPartName;
 
+    @ApiParam("生产队列号")
+    private String orderNo;
+
 
     public int getIsFeedVal() {
         return this.isFeed == null ? 0 : this.isFeed;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.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;
 
 /**
@@ -81,4 +82,12 @@ public class MesProdModelCfg extends BaseBean implements Serializable {
     @Column(name = "PROCESS_LABEL_TEMPLATE")
     @ApiParam("过程标签模板")
     private String processLabelTemplate;
+
+    @Transient
+    @ApiParam("产品颜色")
+    private String produceColor;
+
+    @Transient
+    @ApiParam("Vin")
+    private String vinCode;
 }

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

@@ -132,6 +132,10 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     @ApiParam("队列类型名称")
     private String queueTypeName;
 
+    @Transient
+    @ApiParam("产品颜色")
+    private String colorName;
+
     public int getStatusVal() {
         return this.status == null ? 0 : this.status;
     }

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

@@ -0,0 +1,19 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class DefectTypeModel<T> implements Serializable {
+
+    // 缺陷/维修
+    @ApiParam("业务类型")
+    private String busiType;
+
+    @ApiParam("List结果集")
+    private List<T> resultList;
+
+}

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

@@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class RepairAndDefectModel implements Serializable {
+
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partName;
+
+    @ApiParam("缺陷代码")
+    private String defectCode;
+
+    @ApiParam("缺陷名称")
+    private String defectName;
+
+    @ApiParam("缺陷位置")
+    private String defectLocation;
+
+    @ApiParam("面位")
+    private String sideLocation;
+
+    @ApiParam("维修状态")
+    private Integer repairStatus;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("维修代码")
+    private String repairCode;
+
+    @ApiParam("维修名称")
+    private String repairName;
+
+    @ApiParam("缺陷原因代码")
+    private String dcCode;
+
+    @ApiParam("缺陷原因描述")
+    private String dcName;
+
+}

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

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ScatterBomModel implements Serializable {
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partName;
+
+    @ApiParam("个数")
+    private Double qty;
+
+}

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

@@ -0,0 +1,40 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesProduceCtgyPicture;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class SkinCheckModel implements Serializable {
+
+    @ApiParam("主队列编号")
+    private String orderNo;
+
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @ApiParam("生产号")
+    private String vinCode;
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @ApiParam("车型")
+    private String prodCfgTypeCode;
+
+    @ApiParam("等级")
+    private String gradeCode;
+
+    @ApiParam("面位")
+    private String sideLocation;
+
+    // 产品位置图片
+    private List<MesProduceCtgyPicture> produceCtgyPictureList;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAgvStopRecordRepository.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.MesAgvStopRecord;
+
+/**
+ * @Description: 停机记录数据操作层
+ * @Reference:
+ * @Author: siliter.yuan
+ * @CreateDate: 2020\06\03 10:34
+ * @Modify:
+ **/
+public interface MesAgvStopRecordRepository extends BaseRepository<MesAgvStopRecord, Long> {
+}

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

@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.model.common;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-29 下午3:40
+ * @Modify:
+ **/
+@Data
+public class ThreadModel implements Serializable {
+
+    @ApiParam(value ="自定义调用ID")
+    private Long requestId;
+    @ApiParam(value ="当前用户ID")
+    private Long userId;
+    @ApiParam(value ="当前用户名称")
+    private String userName;
+    @ApiParam(value ="用户登录IP")
+    private String userHost;
+    @ApiParam(value ="用户登录浏览器")
+    private String userBrowser;
+    @ApiParam(value ="用户登录操作系统")
+    private String userOs;
+
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java

@@ -47,6 +47,7 @@ public class SysLogConsole extends BaseBean {
 
     @Column(name="LOG_PID")
     @ApiParam(value ="应用PID")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long logPid;
 
     @Column(name="LOG_PORT")
@@ -89,6 +90,10 @@ public class SysLogConsole extends BaseBean {
     private String userLoginName;
 
     /******** 日志信息 ********/
+    @Column(name="REQUEST_ID")
+    @ApiParam(value ="请求ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long requestId;
 
     @Column(name="EXECUTE_THREAD_ID")
     @ApiParam(value ="执行线程")

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrCssStyle.java

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.report.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:33
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="BR_CSS_STYLE")
+@Api(value="自定义样式")
+public class BrCssStyle extends BaseBean {
+
+    private static final long serialVersionUID = 8651392479116992679L;
+
+    @Column(name="STYLE_CODE")
+    @ApiParam(value ="样式编码")
+    private String styleCode;
+
+    @Column(name="STYLE_CONTENT")
+    @ApiParam(value ="样式内容")
+    private String styleContent;
+
+    @Column(name="STYLE_DESCRIPTION")
+    @ApiParam(value ="样式描述")
+    private String styleDescription;
+
+}

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrCssStyleRepository.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.report.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.report.bean.BrCssStyle;
+import cn.estsh.i3plus.pojo.report.bean.BrElement;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:39
+ * @Modify:
+ **/
+public interface BrCssStyleRepository extends BaseRepository<BrCssStyle,Long> {
+}

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

@@ -109,7 +109,7 @@ public class BsSuitCase extends BaseBean {
     @ApiParam(value = "是否推送MQ")
     private Integer isPushMQ;
 
-    @Column(name = "RESULT_SOFT_TYPE")
+    @Column(name = "RESULT_SOFT_TYPE",columnDefinition = "int default 0")
     @ApiParam(value = "同步调用微服务")
     private Integer resultSoftType;
     public String getResultSoftTypeTxt() {