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/bean/AndonManageQueue.java

@@ -298,6 +298,14 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {
     private Integer brokenTime;
 
     @Transient
+    @ApiParam(value ="响应时长(分钟)")
+    private Double sumDowntime;
+
+    @Transient
+    @ApiParam(value ="故障时长(分钟)")
+    private Double sumBrokenTime;
+
+    @Transient
     @ApiParam(value ="故障字符串")
     private String faultStr;
 

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

@@ -4,15 +4,11 @@ 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 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 javax.persistence.*;
 
 /**
  * @Description : MES_容器
@@ -40,6 +36,10 @@ public class MesContainer extends BaseBean {
     @ApiParam(value = "容器类型代码")
     private String ctCode;
 
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "产线代码")
+    private String workCenterCode;
+
     @Column(name = "USE_STATUS")
     @ApiParam(value = "使用状态")
     private String useStatus;

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

@@ -5,8 +5,6 @@ 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 lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -77,4 +75,8 @@ public class MesPackageTravel extends BaseBean implements Serializable {
     @Column(name = "QR_CODE")
     @ApiParam("包装二维码")
     private String qrCode;
+
+    @Column(name = "EMPLOYEE_NUMBER")
+    @ApiParam("员工编号")
+    private String employeeNumber;
 }

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

@@ -4,8 +4,6 @@ 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 lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
@@ -162,6 +160,10 @@ public class MesProduceSnTravel extends BaseBean implements Serializable {
     @ApiParam("生产批次")
     private String lotNo;
 
+    @Column(name = "EMPLOYEE_NUMBER")
+    @ApiParam("员工编号")
+    private String employeeNumber;
+
     @Transient
     @ApiParam("返回信息")
     private String resultMsg;

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

@@ -166,6 +166,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("工步弹框状态")
     private Boolean stepDialogStatus = false;
 
+    @ApiParam("按钮显示开关")
+    private Boolean buttonDisplay = true;
+
     @ApiParam("是否按时完成")
     private Integer isOnTimeComplete = 1;
 

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

@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.ptl.model;
+
+import lombok.Data;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.net.Socket;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/6/8 2:12 PM
+ * @Modify:
+ */
+@Data
+public class MgnBjAblePickModel {
+
+    private Socket socket = null;
+
+    private String organizeCode;
+    private String areaNo;
+    private String clientInfo;
+    private String ip;
+    private Integer port;
+
+    private Integer timeout = 3000;
+    private Integer sleepTime = 2000;
+
+    private DataOutputStream bw;
+    private DataInputStream br;
+}