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

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

@@ -37,4 +37,12 @@ public class MesProdCfgType extends BaseBean implements Serializable {
     @Column(name = "PROD_CFG_TYPE_NAME")
     @ApiParam("项目名称")
     private String prodCfgTypeName;
+
+    @Column(name = "PCT_VERSION")
+    @ApiParam("项目版本")
+    private String pctVersion;
+
+    @Column(name = "DWG_VERSION")
+    @ApiParam("图纸版本")
+    private String dwgVersion;
 }

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -61,4 +62,8 @@ public class MesQueueOrderBom extends BaseBean  implements Serializable {
     @Column(name = "OPTION_TYPE")
     @ApiParam("选配类型")
     private Integer optionType;
+
+    @Transient
+    @ApiParam("物料类型3")
+    private String categoryCode3;
 }

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

@@ -94,6 +94,9 @@ public class QueueOrderModel implements Serializable {
     @ApiParam("项目代码")
     private String prodCfgTypeCode;
 
+    @ApiParam("配方内容")
+    private String formulaContent;
+
     public QueueOrderModel() {
     }
 
@@ -227,7 +230,7 @@ public class QueueOrderModel implements Serializable {
     //getWaitQueueOrderModelNoSnMgn
     public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
                            String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode, String prodCfgTypeCode,
-                           String vinCode) {
+                           String vinCode, String formulaContent, String queueGroupNo) {
         this.serialNumber = serialNumber;
         this.id = id;
         this.queueSeq = queueSeq;
@@ -245,11 +248,13 @@ public class QueueOrderModel implements Serializable {
         this.produceCategoryCode = produceCategoryCode;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.vinCode = vinCode;
+        this.formulaContent = formulaContent;
+        this.queueGroupNo = queueGroupNo;
     }
 
     //getAlreadyQueueOrderModelNoSnMgn
     public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
-                           String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode) {
+                           String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode, String formulaContent, String queueGroupNo) {
         this.id = id;
         this.queueSeq = queueSeq;
         this.queDetailSeq = queDetailSeq;
@@ -263,6 +268,8 @@ public class QueueOrderModel implements Serializable {
         this.serialNumber = serialNumber;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.vinCode = vinCode;
+        this.formulaContent = formulaContent;
+        this.queueGroupNo = queueGroupNo;
     }
 
     //getAlreadyQueueOrderModelNoSn

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

@@ -108,4 +108,19 @@ public class StepPrintSnModel extends MesProduceSn {
     @ApiParam("产品配置名称")
     private String prodCfgCodeName;
 
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+    @ApiParam("产品位置")
+    private String produceCategoryCode;
+    @ApiParam("结果")
+    private String result;
+    @ApiParam("项目版本")
+    private String pctVersion;
+    @ApiParam("图纸版本")
+    private String dwgVersion;
+    @ApiParam("班次名称")
+    private String shiftName;
+    @ApiParam("JIT排序号")
+    private String jitSeq;
+
 }

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

@@ -290,6 +290,11 @@ public class WmsPart extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.FREQUENCY.class, refForeignKey = "value", value = "description", hidden = true)
     private Integer frequency;
 
+    @Column(name = "LIMIT_QUALITY_DAYS")
+    @ApiParam(value = "卡控周期", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Integer limitQualityDays;
+
 
     public int getIqcVal() {
         return this.iqc == null ? 0 : this.iqc.intValue();