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

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

@@ -26,7 +26,9 @@ import java.io.Serializable;
 @Table(name = "MES_PROD_BIND_RECORD_EXT", indexes = {
         @Index(columnList = "ORGANIZE_CODE_EXT"),
         @Index(columnList = "CREATE_DATE_TIME_EXT"),
-        @Index(columnList = "MODIFY_DATE_TIME_EXT")
+        @Index(columnList = "MODIFY_DATE_TIME_EXT"),
+        @Index(columnList = "PRODUCT_SN"),
+        @Index(columnList = "THIRD_PARTY_PID")
 })
 @PrimaryKeyJoinColumn(name = "PID")
 @Api("产品绑定记录表拓展")
@@ -73,4 +75,21 @@ public class MesProdBindRecordExt extends MesProdBindRecord implements Serializa
     @Column(name="MODIFY_DATE_TIME_EXT")
     @ApiParam(value = "修改日期")
     public String modifyDatetimeExt;
+
+    @Column(name = "PRODUCT_SN")
+    @ApiParam("产品条码")
+    private String productSn;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "MANAGE_CODE")
+    @ApiParam(value = "管理编码")
+    private String manageCode;
+
+    @Column(name = "THIRD_PARTY_PID")
+    @ApiParam("关联ID")
+    private String thirdPartyPid;
+
 }

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

@@ -27,7 +27,7 @@ import java.io.Serializable;
         @Index(columnList = "SYSTEM_SYNC_STATUS"),
         @Index(columnList = "MANAGE_CODE"),
         @Index(columnList = "MANAGE_CODE, SN_STATUS"),
-        @Index(columnList = "SERIAL_NUMBER, WORK_ORDER_NO")
+        @Index(columnList = "WORK_ORDER_NO")
 })
 @Api("管理码与工单条码关系表")
 public class MesProduceSnMcRecord extends BaseBean implements Serializable {
@@ -75,4 +75,12 @@ public class MesProduceSnMcRecord extends BaseBean implements Serializable {
     @ApiParam("质量状态")
     private Integer qcStatus;
 
+    @Column(name = "OPERATE_TYPE")
+    @ApiParam("操作类型")
+    private Integer operateType;
+
+    @Column(name = "LINE_ON_STATUS")
+    @ApiParam("上线状态")
+    private Integer lineOnStatus;
+
 }