16217 20135--增加料架需要跟生产线绑定关系--2021-06-08

16162 20135--自动操作增加工号扫码（在每一个工位第一步扫码工号，每操作一次需要扫描一次工号）--2021-06-28
16152 20135--异常锁定，解锁和解锁记录--2021-06-25

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;