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

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMgnManageQueue.java

@@ -0,0 +1,548 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.andon.model.BaseManageQueue;
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import io.swagger.models.auth.In;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.beanutils.BeanUtils;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description : 安灯队列
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2019-05-10 17:16
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_MANAGE_QUEUE", indexes = {
+        @Index(columnList = "WORK_CENTER_CODE", name = "ANDON_INDEX_WORK_CENTER_CODE"),
+        @Index(columnList = "WORK_CELL_CODE", name = "ANDON_INDEX_WORK_CELL_CODE"),
+        @Index(columnList = "ORGANIZE_CODE", name = "ANDON_INDEX_ORGANIZE_CODE"),
+        @Index(columnList = "ANDON_ORDER_NO", name = "ANDON_INDEX_ANDON_ORDER_NO"),
+        @Index(columnList = "ALARM_CODE", name = "ANDON_INDEX_ALARM_CODE"),
+        @Index(columnList = "STATUS_CODE", name = "ANDON_INDEX_STATUS_CODE"),
+        @Index(columnList = "ACTION_CODE", name = "ANDON_INDEX_ACTION_CODE"),
+        @Index(columnList = "EQUIPMENT_CODE", name = "ANDON_INDEX_EQUIPMENT_CODE")
+})
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Api("安灯队列")
+public class AndonMgnManageQueue extends BaseManageQueue implements Serializable {
+
+    private static final long serialVersionUID = 183865984747203897L;
+
+    @Transient
+    @ApiParam(value ="触发事件")
+    private String triggerEvent;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam(value = "流程代码")
+    private String routeCode;
+
+    @Column(name = "ROUTE_STATUS_CODE")
+    @ApiParam(value = "状态点代码")
+    private String routeStatusCode;
+
+    @Column(name = "SEQ")
+    @ApiParam(value = "序号", example = "1")
+    private Double seq;
+
+    @Transient
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="呼叫时间，查询开始时间", example = "2018-01-01 01:00:00")
+    public String callTimeStart;
+
+    @Transient
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="呼叫时间，查询结束时间", example = "2018-01-01 01:00:00")
+    public String callTimeEnd;
+
+    @Transient
+    @ApiParam(value = "呼叫人名字")
+    private String callUserName;
+
+    @Transient
+    @ApiParam(value = "响应人名字")
+    private String confirmUserName;
+
+    @Column(name = "SOURCE_TYPE")
+    @ApiParam(value = "安灯来源类型")
+    private String sourceType = AndonEnumUtil.ALARM_SOURCE_TYPE.SOFT.getValue();
+
+    @Transient
+    @ApiParam(value = "解决人名字")
+    private String resetUserName;
+
+    @Column(name = "IS_SHIFT_CALL")
+    @ApiParam(value = "是否转呼", example = "1")
+    private Integer isShiftCall;
+
+    @Column(name="SHIFT_CALL_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="转呼时间",example = "2018-01-01 01:00:00")
+    @AnnoOutputColumn(hidden = true)
+    public String shiftCallTime;
+
+    @Column(name = "RP_OBJECT_CODE")
+    @ApiParam(value = "转呼对象代码")
+    private String rpObjectCode;
+
+    @Column(name = "SC_RESPONSE_CODE")
+    @ApiParam(value = "转呼响应方式")
+    private String scResponseCode;
+
+    @Column(name = "SC_RP_LEVEL")
+    @ApiParam(value = "转呼通知等级")
+    private String scRpLevel;
+
+    @Column(name = "SHIFT_CODE")
+    @ApiParam(value = "班次")
+    private String shiftCode;
+
+    @Column(name = "PRODUCTION_NUM")
+    @ApiParam(value = "生产号")
+    private String productionNum;
+
+    @Column(name = "MODEL")
+    @ApiParam(value = "车型")
+    private String model;
+
+    @Column(name = "FAULT_CAUSE")
+    @ApiParam(value = "故障原因")
+    private String faultCause;
+
+    @Column(name = "PROCESS_METHOD")
+    @ApiParam(value = "处理方法")
+    private String processMethod;
+
+    @Column(name = "REPLACE_SPARE_PART")
+    @ApiParam(value = "更换备件")
+    private String replaceSparePart;
+
+    @Column(name = "MAINTENANCE_SCORE")
+    @ApiParam(value = "维修评分")
+    private String maintenanceScore;
+
+    @Column(name = "UNQUALIFIED_QTY")
+    @ApiParam(value = "不良品数量")
+    private Integer unqualifiedQty;
+
+    @Column(name = "PREVENTIVE_MEASURES")
+    @ApiParam(value = "维修工程师预防性对策")
+    private String preventiveMeasures;
+
+    @Column(name = "ENGINEER_SUGGESTION")
+    @ApiParam(value = "工艺工程师建议")
+    private String engineerSuggestion;
+
+    @Column(name = "RESPONSE_SPEED")
+    @ApiParam(value = "响应速度")
+    private String responseSpeed;
+
+    @Column(name = "REPAIR_SPEED")
+    @ApiParam(value = "修复速度")
+    private String repairSpeed;
+
+    @Column(name = "MONTH")
+    @ApiParam(value = "月")
+    private Integer month;
+
+    @Column(name = "WEEK")
+    @ApiParam(value = "周")
+    private Integer week;
+
+
+    @Transient
+    @ApiParam(value = "异常时长", example = "0")
+    private Long execptionTime;
+
+    @Transient
+    @ApiParam(value = "响应时长", example = "0")
+    private Long signTime;
+
+    @Transient
+    @ApiParam(value = "ANDON次数（用于报表统计）", example = "0")
+    private Long andonCount;
+
+    @Transient
+    @ApiParam(value = "平均响应时长", example = "0")
+    private Double avgSignTime;
+
+    @Transient
+    @ApiParam(value = "解决时长", example = "0")
+    private Long resolveTime;
+
+    @Transient
+    @ApiParam(value = "平均解决时长", example = "0")
+    private Double avgResolveTime;
+
+    @Transient
+    @ApiParam(value = "查询条件：ANDON状态")
+    private List<Object> statusList;
+
+    @Transient
+    @ApiParam(value = "查询条件：ANDON状态")
+    private List<Object> typeList;
+
+    @Transient
+    @ApiParam(value = "比例", example = "0")
+    private Double proportion;
+
+    @Transient
+    @ApiParam(value = "当前比例（累加）", example = "0")
+    private Double currentProportion;
+
+    @Transient
+    @ApiParam(value = "总次数（用于报表统计）", example = "0")
+    private Integer sumCount;
+
+    @Column(name = "SEND_FLAG")
+    @ApiParam(value = "发送标志")
+    private String sendFlag;
+
+    @Column(name = "SIGN_SEND_FLAG")
+    @ApiParam(value = "响应已通知标识")
+    private String signSendFlag;
+
+    /**
+     * 1 = 是，2 = 否
+     */
+    @Transient
+    @ApiParam(value = "是否勾选加入自处理问题库", example = "2")
+    private Integer isDisposal;
+
+    @Column(name = "ALARM_DETAIL_NAME_RDD")
+    @ApiParam(value = "安灯子类型名称")
+    private String alarmDetailNameRdd;
+
+    @Column(name = "EPM_CODE")
+    @ApiParam(value = "事件现象代码")
+    private String epmCode;
+
+    @Column(name = "EPM_NAME_RDD")
+    @ApiParam(value = "事件现象描述")
+    private String epmNameRdd;
+
+    @Column(name = "IMPORTANCE_CODE")
+    @ApiParam(value = "重要等级代码")
+    private String importanceCode;
+
+    @Column(name = "IMPORTANCE_NAME_RDD")
+    @ApiParam(value = "重要等级名称")
+    private String importanceNameRdd;
+
+    @Column(name = "ORGANIZE_NAME_RDD")
+    @ApiParam(value = "组织名称")
+    private String organizeNameRdd;
+
+    @Column(name = "REJECT_OPINION")
+    @ApiParam(value = "驳回意见")
+    private String rejectOpinion;
+
+    @Column(name = "OPEN_INFO")
+    @ApiParam(value = "放行说明")
+    private String openInfo;
+
+    @Column(name = "IS_OVER_TIME")
+    @ApiParam(value = "是否超时")
+    private Integer overTimeFlag;
+
+    @Transient
+    @ApiParam(value = "安灯状态集合")
+    private List<String> statusCodeList;
+
+    @Transient
+    @ApiParam(value = "日发生次数")
+    private int dayTime;
+
+    @Transient
+    @ApiParam(value = "周发生次数")
+    private int weekendsTime;
+
+    @Transient
+    @ApiParam(value = "事件统计报表该事件描述的总次数")
+    private int acCodeTime;
+
+    @ApiParam(value = "操作来源")
+    @Transient
+    private String operationFlag;
+
+    // 安灯附属表
+    @Transient
+    @ApiParam(value ="临时/纠正措施")
+    private String tempCorrectMethod;
+
+    @Transient
+    @ApiParam(value ="预防/纠正措施")
+    private String preCorrectMethod;
+
+    @Transient
+    @ApiParam(value ="客户")
+    private String customer;
+
+    @Transient
+    @ApiParam(value ="零件号")
+    private String partNo;
+
+    @Transient
+    @ApiParam(value ="零件名称")
+    private String partName;
+
+    @Transient
+    @ApiParam(value ="报废数量")
+    private Double scrapNum;
+
+    @Transient
+    @ApiParam(value ="批次")
+    private String lot;
+
+    @Transient
+    @ApiParam(value ="零件数量")
+    private Double partNum;
+
+    @Transient
+    @ApiParam(value ="设备名称")
+    private String deviceName;
+
+    @Transient
+    @ApiParam(value ="是否更换备件")
+    private Integer isChangeBackup;
+
+    @Transient
+    @ApiParam(value ="备件名称")
+    private String backupPartName;
+
+    @Transient
+    @ApiParam(value ="规格型号")
+    private String scale;
+
+    @Transient
+    @ApiParam(value ="当前件数")
+    private Integer currentProdNum;
+
+    @Transient
+    @ApiParam(value ="生产累计件数")
+    private Integer totalProdNum;
+
+    @Transient
+    @ApiParam(value ="安灯类型名称")
+    private String alarmCodeName;
+
+    @Transient
+    @ApiParam(value ="响应时长-分钟")
+    private Integer downtime;
+
+    @Transient
+    @ApiParam(value ="故障时长-分钟")
+    private Integer brokenTime;
+
+    @Transient
+    @ApiParam(value ="响应时长(分钟)")
+    private Double sumDowntime;
+
+    @Transient
+    @ApiParam(value ="故障时长(分钟)")
+    private Double sumBrokenTime;
+
+    @Transient
+    @ApiParam(value ="故障字符串")
+    private String faultStr;
+
+    @Transient
+    @ApiParam(value ="百分比")
+    private Integer propagation;
+
+    // 是否转呼
+    public Integer getIsShiftCall() {
+        return this.isShiftCall == null ? 0 : this.isShiftCall;
+    }
+
+    // 获取优先级别
+    public Integer getPriorityLevel() {
+        return this.priorityLevel == null ? 0 : this.priorityLevel;
+    }
+
+    /**
+     * 工位统计 构造函数
+     * @param workCenterCode
+     * @param workCenterNameRdd
+     * @param workCellCode
+     * @param workCellNameRdd
+     * @param equipmentCode
+     * @param equipmentNameRdd
+     * @param shiftCode
+     * @param shiftNameRdd
+     * @param alarmCode
+     * @param andonCount
+     */
+    public AndonMgnManageQueue(String workCenterCode, String workCenterNameRdd, String workCellCode, String workCellNameRdd,
+                               String equipmentCode, String equipmentNameRdd, String shiftCode, String shiftNameRdd,
+                               String alarmCode, Long andonCount, String callTime, String resetTime) {
+        this.workCenterCode = workCenterCode;
+        this.workCenterNameRdd = workCenterNameRdd;
+        this.workCellNameRdd = workCellNameRdd;
+        this.workCellCode = workCellCode;
+        this.equipmentCode = equipmentCode;
+        this.equipmentNameRdd = equipmentNameRdd;
+        this.shiftCode = shiftCode;
+        this.shiftNameRdd = shiftNameRdd;
+        this.alarmCode = alarmCode;
+        this.andonCount = andonCount;
+        this.callTime = callTime;
+        this.resetTime = resetTime;
+    }
+
+    /**
+     * 原因统计 使用Java内存计算（获取原始数据）
+     * @param acCode
+     * @param acNameRdd
+     * @param workCenterCode
+     * @param workCenterNameRdd
+     * @param workCellCode
+     * @param workCellNameRdd
+     * @param alarmCode
+     * @param ecCode
+     * @param ecNameRdd
+     * @param emCode
+     * @param emNameRdd
+     * @param callTime
+     * @param confirmTime
+     * @param resetTime
+     */
+    public AndonMgnManageQueue(String acCode, String acNameRdd, String workCenterCode, String workCenterNameRdd, String workCellCode, String workCellNameRdd, String alarmCode, String ecCode, String ecNameRdd, String emCode, String emNameRdd, String callTime, String confirmTime, String resetTime){
+        this.acCode = acCode;
+        this.acNameRdd = acNameRdd;
+        this.workCenterCode = workCenterCode;
+        this.workCenterNameRdd = workCenterNameRdd;
+        this.workCellCode = workCellCode;
+        this.workCellNameRdd = workCellNameRdd;
+        this.alarmCode = alarmCode;
+        this.ecCode = ecCode;
+        this.ecNameRdd = ecNameRdd;
+        this.emCode = emCode;
+        this.emNameRdd = emNameRdd;
+        this.callTime = callTime;
+        this.confirmTime = confirmTime;
+        this.resetTime = resetTime;
+    }
+
+    /**
+     * 人员统计 使用Java内存计算（获取原始数据）
+     * @param organizeCode
+     * @param workCenterNameRdd
+     * @param workCellCode
+     * @param workCellNameRdd
+     * @param resetUser
+     * @param alarmCode
+     * @param callTime
+     * @param confirmTime
+     * @param resetTime
+     */
+    public AndonMgnManageQueue(String organizeCode, String workCenterNameRdd, String workCellCode, String workCellNameRdd, String resetUser, String alarmCode, String callTime, String confirmTime, String resetTime){
+        this.organizeCode = organizeCode;
+        this.workCenterNameRdd = workCenterNameRdd;
+        this.workCellCode = workCellCode;
+        this.workCellNameRdd = workCellNameRdd;
+        this.resetUser = resetUser;
+        this.alarmCode = alarmCode;
+        this.callTime = callTime;
+        this.confirmTime = confirmTime;
+        this.resetTime = resetTime;
+    }
+
+    /**
+     * 统计分析柏拉图 使用JAVA内存计算（获取原始数据）
+     * @param workCenterNameRdd
+     * @param alarmCode
+     * @param ecCode
+     * @param ecNameRdd
+     * @param callTime
+     * @param confirmTime
+     * @param resetTime
+     */
+    public AndonMgnManageQueue(String workCenterNameRdd, String alarmCode, String ecCode, String ecNameRdd, String callTime, String confirmTime, String resetTime){
+        this.workCenterNameRdd = workCenterNameRdd;
+        this.ecNameRdd = ecNameRdd;
+        this.ecCode = ecCode;
+        this.alarmCode = alarmCode;
+        this.callTime = callTime;
+        this.confirmTime = confirmTime;
+        this.resetTime = resetTime;
+    }
+
+    public AndonMgnManageQueue() {
+    }
+
+    /**
+     * 安灯问题情况报表
+     * @param organizeNameRdd
+     * @param workCenterNameRdd
+     * @param andonCount
+     */
+    public AndonMgnManageQueue(String organizeNameRdd, String workCenterCode, String workCenterNameRdd, Long andonCount) {
+        this.organizeNameRdd = organizeNameRdd;
+        this.workCenterCode = workCenterCode;
+        this.workCenterNameRdd = workCenterNameRdd;
+        this.andonCount = andonCount;
+    }
+
+    /**
+     * 工位统计报表查询 构造函数
+     * @param workCenterCode
+     * @param workCenterNameRdd
+     * @param workCellCode
+     * @param workCellNameRdd
+     * @param equipmentCode
+     * @param equipmentNameRdd
+     * @param shiftCode
+     * @param shiftNameRdd
+     * @param alarmCode
+     * @param andonCount
+     */
+    public AndonMgnManageQueue(String workCenterCode, String workCenterNameRdd, String workCellNameRdd, String workCellCode,
+                               String equipmentCode, String equipmentNameRdd, String shiftCode, String shiftNameRdd,
+                               String alarmCode, Long andonCount) {
+        this.workCenterCode = workCenterCode;
+        this.workCenterNameRdd = workCenterNameRdd;
+        this.workCellNameRdd = workCellNameRdd;
+        this.workCellCode = workCellCode;
+        this.equipmentCode = equipmentCode;
+        this.equipmentNameRdd = equipmentNameRdd;
+        this.shiftCode = shiftCode;
+        this.shiftNameRdd = shiftNameRdd;
+        this.alarmCode = alarmCode;
+        this.andonCount = andonCount;
+    }
+
+
+    public static void main(String[] args) {
+        try {
+            List ds = new ArrayList();
+            ds.add(new AndonMgnManageQueue());
+            System.out.println(BeanUtils.describe(ds));
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        } catch (InvocationTargetException e) {
+            e.printStackTrace();
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        }
+    }
+
+}

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-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonMgnManageQueueRepository.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonMgnManageQueue;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/6/18 5:14 PM
+ * @Modify:
+ */
+public interface IAndonMgnManageQueueRepository extends BaseRepository<AndonMgnManageQueue, Long> {
+}

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

@@ -2102,8 +2102,10 @@ 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", "失效模式零件导入"),
+        MES_ELECTROTESTING_PRINT_DATA(690, "electrotestingPrintDataExcelService", "电检打印数据导入");
+
 
         private int value;
         private String service;
@@ -4796,7 +4798,8 @@ public class MesEnumUtil {
         CANCEL(30, "取消"),
         OFFLINE(40, "下线"),
         SHIPMENT(50, "发运"),
-        SPECIAL(60, "特殊标识");
+        SPECIAL(60, "特殊标识"),
+        FORCE_REPORT_WORK(70, "强制报工");
 
         private int value;
         private String description;
@@ -5727,7 +5730,7 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum VALUE_TYPE {
-        
+
         MANUAL_ASSIGNMENT("10", "手工赋值"),
         SPEL_EXPRESSION("20", "spel表达式"),
         FUNCTION_ASSIGNMENT("30", "函数赋值"),
@@ -8467,4 +8470,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/MesElectrotestingPrintData.java

@@ -0,0 +1,59 @@
+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.*;
+import java.io.Serializable;
+
+/**
+ * @Description : 泰国电检打印数据
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2021/6/16 14:15
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_ELECTROTESTING_PRINT_DATA")
+@Api("MES_电检打印数据")
+public class MesElectrotestingPrintData extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 5179928838368157923L;
+
+    @Column(name = "COLOUR_CODE")
+    @ApiParam("颜色代码")
+    private String colourCode;
+
+    @Column(name = "VARIANT")
+    @ApiParam("型号")
+    private String variant;
+
+    @Column(name = "PRODUCTION_NUMBER")
+    @ApiParam("产品号")
+    private String productionNumber;
+
+    @Column(name = "COMMISSION_NUMBER")
+    @ApiParam("佣金号")
+    private String commissionNumber;
+
+    @Column(name = "QAD_NO")
+    @ApiParam("位置号")
+    private String qadNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PRINT_STATUS")
+    @ApiParam("打印状态")
+    private Integer printStatus = 10;
+}

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/MesPart.java

@@ -5,17 +5,14 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
+
+import javax.persistence.*;
+
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 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.io.Serializable;
 
 /**
@@ -31,7 +28,9 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Inheritance(strategy = InheritanceType.JOINED)
-@Table(name = "MES_PART")
+@Table(name = "MES_PART", indexes = {
+        @Index(columnList = "PART_NO")
+})
 @Api("物料信息")
 public class MesPart extends BaseBean implements Serializable {
     private static final long serialVersionUID = -7731182105899332283L;

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

@@ -29,6 +29,10 @@ public class MesPartCarModel extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = -4039513102671811231L;
 
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线代码")
+    private String workCenterCode;
+
     @Column(name = "PART_NO")
     @ApiParam("零件号")
     private String partNo;

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/CosmaDefectModel.java

@@ -29,15 +29,12 @@ public class CosmaDefectModel {
     @ApiParam("过程条码")
     private String serialNumber;
 
-    @ApiParam("缺陷代码集合")
-    private List<String> defectCodeList;
+    @ApiParam("缺陷代码")
+    private String defectCode;
 
     @ApiParam("缺陷位置")
     private String location;
 
     @ApiParam("操作人")
     private String userName;
-
-    @ApiParam("报废原因")
-    private String scrapCode;
 }

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/MesElectrotestingPrintDataRepository.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.MesElectrotestingPrintData;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 泰国电检打印数据
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2021/6/16 14:27
+ * @Modify:
+ **/
+@Repository
+public interface MesElectrotestingPrintDataRepository extends BaseRepository<MesElectrotestingPrintData, Long> {
+}

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;

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

@@ -135,7 +135,9 @@ public class WmsHqlPack {
 
         //查询参数封装
         // 该查询封装用于单据主表查询明细使用equal 精准查询
-        DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
+        if (!StringUtil.isEmpty(wmsDocMovementDetails.getOrderNo())) {
+            DdlPreparedPack.getInPackList(Arrays.asList(wmsDocMovementDetails.getOrderNo().split(",")), "orderNo", result);
+        }
         DdlPreparedPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result);
         DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestZoneNo(), "destZoneNo", result);
@@ -236,7 +238,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean);
         DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getCostCenter(), "costCenter", packBean);
         DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getThirdRemake(), "thirdRemake", packBean);
-        DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getVendorNo(), "vendorNo", packBean);
+        DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getVendorNo(), "vendorNo", packBean);
 
         getStringBuilderPack(wmsDocMovementMaster, packBean);
 
@@ -484,6 +486,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", result);
         DdlPreparedPack.getStringLikerPack(basVendor.getVendorAddr(), "vendorAddr", result);
         DdlPreparedPack.getStringLikerPack(basVendor.getVendorEmail(), "vendorEmail", result);
+        DdlPreparedPack.getStringLikerPack(basVendor.getUserName(), "userName", result);
         DdlPreparedPack.getNumEqualPack(basVendor.getIsAsn(), "isAsn", result);
         DdlPreparedPack.getNumEqualPack(basVendor.getVendorType(), "vendorType", result);