Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.andon.model;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Column;
 import java.io.Serializable;
 
 /**
@@ -77,6 +78,18 @@ public class AndonBoardModel implements Serializable {
     @ApiParam("停线时间比率")
     private String downtimeRate;
 
+    @ApiParam("周")
+    private Integer week;
+
+    @ApiParam(value = "事件原因代码")
+    public String ecCode;
+
+    @ApiParam(value = "事件原因描述")
+    public String ecNameRdd;
+
+    @ApiParam(value = "小时")
+    public String hour;
+
     public int getTotalTimeVal() {
         return totalTime == null ? 0 : totalTime;
     }

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

@@ -2102,8 +2102,8 @@ public class MesEnumUtil {
         MES_JISA(640, "jisaExcelService", "JISA导入"),
         MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入"),
         MES_HOLIDAY_VACATION(660, "holidayVacationExcelService", "节假日导入"),
-        MES_PENDING_REPORT_TYPE(670, "PendingReportTypeExcelService", "待处理报工类型导入"),
-        MES_FAILURE_MODE_PARTS(680, "FailureModePartsExcelService", "失效模式零件导入");
+        MES_PENDING_REPORT_TYPE(670, "pendingReportTypeExcelService", "待处理报工类型导入"),
+        MES_FAILURE_MODE_PARTS(680, "failureModePartsExcelService", "失效模式零件导入");
 
         private int value;
         private String service;
@@ -4796,7 +4796,8 @@ public class MesEnumUtil {
         CANCEL(30, "取消"),
         OFFLINE(40, "下线"),
         SHIPMENT(50, "发运"),
-        SPECIAL(60, "特殊标识");
+        SPECIAL(60, "特殊标识"),
+        FORCE_REPORT_WORK(70, "强制报工");
 
         private int value;
         private String description;
@@ -8467,4 +8468,37 @@ public class MesEnumUtil {
             return description;
         }
     }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PERSONNEL_LEVEL {
+
+        ONE(10, "一级"),
+        TWO(20, "二级");
+
+        private int value;
+        private String description;
+
+        PERSONNEL_LEVEL(int value, String description) {
+            this.value = value;
+            this.description = 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 int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }

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

@@ -29,7 +29,8 @@ import java.io.Serializable;
 @Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "IF_PACKAGE_DETAIL", indexes = {
         @Index(columnList = "SERIAL_NUMBER"),
-        @Index(columnList = "PART_NO")
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "PACKAGE_NO")
 }, uniqueConstraints = {
         @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER", "IF_CODE"})
 })

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

@@ -0,0 +1,60 @@
+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: dominic
+ * @Date: 2020/12/03 20:29
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_FAILURE_MODE_APPROVAL")
+@Api("MES_失效模式审批人员")
+public class MesFailureModeApproval extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -5274274774653791153L;
+
+    @Column(name = "PATTERN_CODE")
+    @ApiParam("模式代码")
+    private String patternCode;
+
+    @Column(name = "PATTERN_NAME")
+    @ApiParam("模式代码名称")
+    private String patternName;
+
+    @Column(name = "DEPARTMENT_NAME_RDD")
+    @ApiParam("部门名称")
+    private String departmentNameRdd;
+
+    @Column(name = "DEPARTMENT_ID")
+    @ApiParam("部门id")
+    private Long departmentId;
+
+    @Column(name = "USER_NAME")
+    @ApiParam("人员名称")
+    private String userName;
+
+    @Column(name = "USER_ID")
+    @ApiParam("人员id")
+    private Long userId;
+
+    @Column(name = "PERSONNEL_LEVEL")
+    @ApiParam("人员级别")
+    private Integer personnelLevel;
+}

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

@@ -0,0 +1,63 @@
+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.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description :锁定记录
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2021-06-10
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_LOCK_RECORD")
+@Api("mes锁定记录表")
+public class MesLockRecord extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 5132229443235106976L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位代码")
+    private String workCellCode;
+
+    @Column(name = "PROCESS_CODE")
+    @ApiParam("工序代码")
+    private String processCode;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @Column(name = "LOCK_REASON")
+    @ApiParam("锁定原因")
+    private String lockReason;
+
+    @Column(name = "EMPLOYEE_NUMBER")
+    @ApiParam("工号")
+    private String employeeNumber;
+
+    @Column(name = "LOCK_STATUS")
+    @ColumnDefault("1")
+    @ApiParam("锁定状态")
+    private Integer lockStatus = 1;
+}

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

@@ -77,4 +77,8 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable {
     @Transient
     @ApiParam("收货日期")
     private String receiptDate;
+
+    @Transient
+    @ApiParam("选配类型")
+    private Integer optionType;
 }

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

@@ -8,6 +8,7 @@ import java.io.Serializable;
 
 /**
  * 产品履历报表-产品信息
+ *
  * @author yumingxing
  * @version 1.0
  * @date 2020/12/18 15:16
@@ -33,6 +34,9 @@ public class ProductSnModel implements Serializable {
     @ApiParam("CMS标签号")
     private String qrCode;
 
+    @ApiParam("料架号")
+    private String ctNo;
+
     @ApiParam("产线")
     private String workCenterName;
 
@@ -55,10 +59,8 @@ public class ProductSnModel implements Serializable {
     private String qcStatusName;
 
 
-
-
-    public ProductSnModel(String packageNo,String customerPartNo, String serialNumber, String partNo,
-                          String qrCode, String workCenterName, String processName,
+    public ProductSnModel(String packageNo, String customerPartNo, String serialNumber, String partNo,
+                          String qrCode, String ctNo, String workCenterName, String processName,
                           String workCellName, String createDatetime,
                           String createUser, Integer qcStatus) {
         this.packageNo = packageNo;
@@ -66,6 +68,7 @@ public class ProductSnModel implements Serializable {
         this.serialNumber = serialNumber;
         this.partNo = partNo;
         this.qrCode = qrCode;
+        this.ctNo = ctNo;
         this.workCenterName = workCenterName;
         this.processName = processName;
         this.workCellName = workCellName;

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

@@ -0,0 +1,33 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Description : 报废率趋势model
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2021/6/17 19:12
+ * @Modify:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("报废率趋势model")
+public class ScrapRateTrendReportModel {
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("修改时间")
+    private String modifyDatetime;
+
+    @ApiParam("操作类型")
+    private Integer operateType;
+
+    @ApiParam("报废原因")
+    private String scrapCode;
+}

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

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLockRecordRepository.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.MesLockRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2021/6/10 19:36
+ * @Modify:
+ **/
+@Repository
+public interface MesLockRecordRepository extends BaseRepository<MesLockRecord, Long> {
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java

@@ -99,6 +99,11 @@ public class SysMenu extends BaseBean {
     @AnnoOutputColumn(required = false)
     private String menuIcon;
 
+    @Column(name="MENU_BACKGROUND_IMAGE")
+    @ApiParam(value ="资源背景图片" , access ="资源背景图片")
+    @AnnoOutputColumn(required = false)
+    private String menuBackgroundImage;
+
     @Column(name="MENU_DESCRIPTION")
     @ApiParam(value ="资源描述" , access ="配置描述")
     @AnnoOutputColumn(required = false)

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MgnBjAblePickModel.java

@@ -22,6 +22,7 @@ public class MgnBjAblePickModel {
     private String clientInfo;
     private String ip;
     private Integer port;
+    private boolean isBackOff;
 
     private Integer timeout = 3000;
     private Integer sleepTime = 2000;