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

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

@@ -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;

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

@@ -44,6 +44,10 @@ public class MesLockRecord extends BaseBean implements Serializable {
     @ApiParam("工序代码")
     private String processCode;
 
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("过程条码")
+    private String serialNumber;
+
     @Column(name = "LOCK_REASON")
     @ApiParam("锁定原因")
     private String lockReason;

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