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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -2349,6 +2349,21 @@ public class WmsEnumUtil {
         public String getDescription() {
             return description;
         }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
     }
 
     /**

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

@@ -168,4 +168,13 @@ public class IfProductOffLine extends BaseBean implements Serializable {
         this.workCenterCode = workCenterCode;
         this.qcStatus = qcStatus;
     }
+
+    public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double itemQty, String createDatetime) {
+        this.workCenterCode = workCenterCode;
+        this.partNo = partNo;
+        this.partName = partName;
+        this.packageNo = packageNo;
+        this.itemQty = itemQty;
+        this.createDatetime = createDatetime;
+    }
 }

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

@@ -77,4 +77,10 @@ public class MesDefect extends BaseBean implements Serializable {
         this.defectType = defectType;
         this.defectTypeName = defectTypeName;
     }
+
+    public MesDefect(String defectType, String defectCode, String defectName) {
+        this.defectType = defectType;
+        this.defectCode = defectCode;
+        this.defectName = defectName;
+    }
 }

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

@@ -105,7 +105,26 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("缺陷类型名称")
     private String defectActionTypeName;
 
+    @Transient
+    @ApiParam("缺陷数量")
+    private Integer defectQty;
+
     public int getRepairStatusVal() {
         return this.repairStatus == null ? 0 : this.repairStatus;
     }
+
+    public MesDefectRecord() {
+
+    }
+
+    public MesDefectRecord(String partNo, String partName, String workOrderNo, String defectActionType,
+                           String defectCode, String defectName, Integer defectQty) {
+        this.partNo = partNo;
+        this.partName = partName;
+        this.workOrderNo = workOrderNo;
+        this.defectActionType = defectActionType;
+        this.defectCode = defectCode;
+        this.defectName = defectName;
+        this.defectQty = defectQty;
+    }
 }

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -69,11 +70,11 @@ public class MesQualityStandard extends BaseBean implements Serializable {
 
     @Column(name = "IS_CONCESSION")
     @ApiParam("是否允许让步")
-    private String isConcession;
+    private Integer isConcession;
 
     @Column(name = "CHECK_INTERVAL")
     @ApiParam("间隔时间")
-    private String checkInterval;
+    private Integer checkInterval = 0;
 
     //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2
     @Column(name = "NUMBER_FLAG")
@@ -99,13 +100,15 @@ public class MesQualityStandard extends BaseBean implements Serializable {
     @ApiParam("检验值类型")
     private String checkValueType;
 
-    @Column(name = "maximum")
+    @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("公差上限")
-    private BigDecimal maximum;
+    private Double maximum = 0d;
 
-    @Column(name = "minimum")
+    @Column(name = "MINIMUM", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("公差下限")
-    private BigDecimal minimum;
+    private Double minimum = 0d;
 
     @Column(name = "IS_KEY_CHECK_ITEM")
     @ApiParam("是否关键检测项")

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

@@ -42,4 +42,7 @@ public class DismantleRecordModel {
 
     @ApiParam("不良集合")
     private List<MesDefect> defectList;
+
+    @ApiParam("返修工位标志")
+    private String repairFlag;
 }

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

@@ -45,10 +45,10 @@ public class MesQualityStandardModel {
     private String checkFrequency;
 
     @ApiParam("是否允许让步")
-    private String isConcession;
+    private Integer isConcession;
 
     @ApiParam("间隔时间")
-    private String checkInterval;
+    private Integer checkInterval;
 
     //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2
     @ApiParam("个数标识")
@@ -70,10 +70,10 @@ public class MesQualityStandardModel {
     private String checkValueType;
 
     @ApiParam("公差上限")
-    private BigDecimal maximum;
+    private Double maximum;
 
     @ApiParam("公差下限")
-    private BigDecimal minimum;
+    private Double minimum;
 
     @ApiParam("是否关键检测项")
     private Integer isKeyCheckItem;

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

@@ -5,12 +5,13 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import javax.persistence.Transient;
+import java.io.Serializable;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
 @Data
-public class TJMgnBoardModel extends BaseBean {
+public class TJMgnBoardModel extends BaseBean implements Serializable {
 
     @ApiParam("工单号")
     private String workOrderNo;
@@ -21,6 +22,12 @@ public class TJMgnBoardModel extends BaseBean {
     @ApiParam("物料名称")
     private String partNameRdd;
 
+    @ApiParam("质量状态")
+    private Integer qcStatus;
+
+    @ApiParam("条码数量")
+    private Integer snQty;
+
     @ApiParam("颜色")
     private String partColor;
 
@@ -74,4 +81,15 @@ public class TJMgnBoardModel extends BaseBean {
     @ApiParam("结束工单")
     private String workOrderNoEnd;
 
+    public TJMgnBoardModel() {
+    }
+
+    public TJMgnBoardModel(String partNo, String partNameRdd, Integer qcStatus, String workOrderNo, Integer snQty) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qcStatus = qcStatus;
+        this.workOrderNo = workOrderNo;
+        this.snQty = snQty;
+    }
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java

@@ -437,6 +437,8 @@ public class MesPcnHqlPack {
             DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean);
         }
 
+        DdlPreparedPack.getStringLikerPack(mesPackage.getLotNo(), "lotNo", packBean);
+
         // 时间段查询
         DdlPreparedPack.timeBuilder(
                 mesPackage.getCreateDateTimeStart(),

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

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description 全量BOM
@@ -103,4 +104,15 @@ public class WmsBomTotal extends BaseBean {
     public boolean hasChild() {
         return category != null && category.trim().equals(MGANA_BOM_HAS_CHILD);
     }
+
+    /**
+     * 导入列
+     */
+    @Transient
+    @ApiParam(value = "行数")
+    private Integer rows;
+
+    @Transient
+    @ApiParam(value = "状态")
+    private Integer status;
 }