Merge branch 'dev' of i3-IMPP/i3plus-pojo into test

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

@@ -161,7 +161,8 @@ public class MesEnumUtil {
         DEFECT("DEFECT", "缺陷"),
         DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"),
         REPAIR("REPAIR", "处理措施"),
-        SCRAP("SCRAP", "报废原因");
+        SCRAP("SCRAP", "报废原因"),
+        QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准");
 
         private String value;
         private String description;

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

@@ -179,7 +179,7 @@ public class MesPcnEnumUtil {
     }
 
     /**
-     * pcn 是否是关键件
+     * MesProdBindRecord 是否是关键件
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_IS_BIND_KEY {

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

@@ -73,10 +73,14 @@ public class MesQcCheckStandard extends BaseBean {
     @ApiParam("检测值")
     private String checkValue;
 
+    @Column(name = "CHECK_ITEM_TYPE")
+    @ApiParam("检测项类型")
+    private String checkItemType;
+
     public MesQcCheckStandard() {
     }
 
-    public MesQcCheckStandard(String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName) {
+    public MesQcCheckStandard(String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName, String checkItemType) {
         this.partNo = partNo;
         this.workCenterCode = workCenterCode;
         this.workCellCode = workCellCode;
@@ -86,5 +90,6 @@ public class MesQcCheckStandard extends BaseBean {
         this.checkGuide = checkGuide;
         this.checkFrequency = checkFrequency;
         this.partName = partName;
+        this.checkItemType = checkItemType;
     }
 }

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

@@ -129,6 +129,14 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("返回信息")
     private String resultMsg;
 
+    @Transient
+    @ApiParam("下线开始时间")
+    private String outWorkCenterStartTime;
+
+    @Transient
+    @ApiParam("下线结束时间")
+    private String outWorkCenterEndTime;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -60,4 +60,8 @@ public class MesQcCheckStandard extends BaseBean {
     @ApiParam("频率")
     private String checkFrequency;
 
+    @Column(name = "CHECK_ITEM_TYPE")
+    @ApiParam("检测项类型")
+    private String checkItemType;
+
 }

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

@@ -1876,6 +1876,10 @@ public class MesHqlPack {
                 mesProduceSn.getCreateDateTimeStart(),
                 mesProduceSn.getCreateDateTimeEnd(),
                 "createDatetime", packBean, true);
+        DdlPreparedPack.timeBuilder(
+                mesProduceSn.getOutWorkCenterStartTime(),
+                mesProduceSn.getOutWorkCenterEndTime(),
+                "outWorkCenterTime", packBean, true);
         return packBean;
     }
 

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

@@ -76,4 +76,26 @@ public class StationRequestBean implements Serializable {
     @ApiParam("工步列表")
     private List<StepModel> stepList;
 
+    @Override
+    public String toString() {
+        return "StationRequestBean{" +
+                "scanInfo='" + scanInfo + '\'' +
+                ", serialNumber='" + serialNumber + '\'' +
+                ", partNo='" + partNo + '\'' +
+                ", organizeCode='" + organizeCode + '\'' +
+                ", organizeName='" + organizeName + '\'' +
+                ", workCenterCode='" + workCenterCode + '\'' +
+                ", workCellCode='" + workCellCode + '\'' +
+                ", routeCode='" + routeCode + '\'' +
+                ", processCode='" + processCode + '\'' +
+                ", clientInfo='" + clientInfo + '\'' +
+                ", userInfo='" + userInfo + '\'' +
+                ", buttonCode='" + buttonCode + '\'' +
+                ", stepCode='" + stepCode + '\'' +
+                ", busiType='" + busiType + '\'' +
+                ", workOrderNo='" + workOrderNo + '\'' +
+                ", tray='" + tray + '\'' +
+                ", finishCount=" + finishCount +
+                '}';
+    }
 }