Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev

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

@@ -111,4 +111,25 @@ public class IfDismantleRecord extends BaseBean implements Serializable {
     @Column(name = "DEFECT_CODE")
     @ApiParam("缺陷代码")
     private String defectCode;
+
+    @Column(name = "DEFECT_NAME")
+    @ApiParam("缺陷名称")
+    private String defectName;
+
+    @Column(name = "DC_CODE")
+    @ApiParam("缺陷原因代码")
+    private String dcCode;
+
+    @Column(name = "DC_NAME")
+    @ApiParam("缺陷原因名称")
+    private String dcName;
+
+    @Column(name = "REPAIR_CODE")
+    @ApiParam("维修代码")
+    private String repairCode;
+
+    @Column(name = "REPAIR_NAME")
+    @ApiParam("维修名称")
+    private String repairName;
+
 }

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

@@ -5,17 +5,13 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.io.Serializable;
 
 /**
@@ -31,7 +27,9 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Inheritance(strategy = InheritanceType.JOINED)
-@Table(name = "IF_PRODUCT_OFF_LINE")
+@Table(name = "IF_PRODUCT_OFF_LINE", uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "ITEM_PART_NO"})
+})
 @NoArgsConstructor
 @AllArgsConstructor
 @Api("生产报工表")

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

@@ -163,4 +163,12 @@ public class MesQcOrder extends BaseBean implements Serializable {
     @Transient
     @ApiParam("质检单集合")
     private List<String> orderNoList;
+
+    @Transient
+    @ApiParam("控制计划编号")
+    private String controlPlanId;
+
+    @Transient
+    @ApiParam("班组")
+    private String shiftGroupName;
 }

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

@@ -73,4 +73,16 @@ public class MesQuarantineRecord extends BaseBean {
     @Column(name = "SCRAP_No")
     @ApiParam("报废单号")
     private String scrapNo;
+
+    @Column(name = "DEFECT_NAME")
+    @ApiParam("缺陷名称")
+    private String defectName;
+
+    @Column(name = "DC_NAME")
+    @ApiParam("缺陷原因名称")
+    private String dcName;
+
+    @Column(name = "REPAIR_NAME")
+    @ApiParam("维修名称")
+    private String repairName;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java

@@ -130,6 +130,33 @@ public class WmsDocMovementDetails extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
     private Integer itemStatus;
 
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工序")
+    private String workCellCode;
+
+    @Column(name = "DEFECT_CODE")
+    @ApiParam("缺陷代码")
+    private String defectCode;
+
+    @Column(name = "DEFECT_NAME")
+    @ApiParam("缺陷名称")
+    private String defectName;
+
+    @Column(name = "DC_CODE")
+    @ApiParam("缺陷原因代码")
+    private String dcCode;
+
+    @Column(name = "DC_NAME")
+    @ApiParam("缺陷原因名称")
+    private String dcName;
+
+    @Column(name = "REPAIR_CODE")
+    @ApiParam("维修代码")
+    private String repairCode;
+
+    @Column(name = "REPAIR_NAME")
+    @ApiParam("维修名称")
+    private String repairName;
 
     @Transient
     @ApiParam(value = "完成状态")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -99,6 +101,10 @@ public class WmsQCSNErrorList extends BaseBean {
     @ApiParam(value = "供应商编码")
     private String vendorNo;
 
+    @Column(name = "VENDOR_NAME")
+    @ApiParam(value = "供应商名称")
+    private String vendorName;
+
     @Column(name = "ERROR_CODE")
     @ApiParam("不良代码")
     private String errorCode;
@@ -116,4 +122,9 @@ public class WmsQCSNErrorList extends BaseBean {
     @ColumnDefault("0")
     @ApiParam(value = "质检比例", example = "0")
     public String qcScale;
+
+    @Column(name = "REF_SRC")
+    @ApiParam("关联单号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    public String refSrc;
 }