中航四月十号 内容提交

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

@@ -77,6 +77,11 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("备注")
     private String memo;
 
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+
     @Transient
     private List<MesDefect> mesDefectList;
 

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

@@ -92,6 +92,10 @@ public class MesDismantleRecord extends BaseBean implements Serializable {
     @ApiParam("关联批次")
     private String lotNo;
 
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("工单号")
+    private String workOrderNo;
+
     @Transient
     private String serialNumber;
 }

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

@@ -123,6 +123,7 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("条码类型 10=正常 20=首检件")
     private Integer snType;
 
+
     @Column(name = "TRAY_NO")
     @ApiParam("托盘号")
     private String trayNo;
@@ -164,6 +165,8 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("条码类型名称")
     private String snTypeName;
 
+
+
     public MesProduceSn() {
     }
 

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

@@ -219,6 +219,18 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("批量打包开窗页面查询工单=1")
     private String pageType;
 
+    @Transient
+    @ApiParam("产品批次")
+    private String productBatch;
+
+    @Transient
+    @ApiParam("工单类型描述")
+    private String workOrderTypeDesc;
+
+    @Transient
+    @ApiParam("工单状态描述")
+    private String workOrderStatusDesc;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesQcCheckData;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/4/9 18:00
+ * @desc
+ */
+@Data
+public class QcCheckDataResultModel {
+
+    @ApiParam("是否完成首检")
+    private Integer isFirstCheck;
+
+    @ApiParam("首检结果")
+    private List<MesQcCheckData> firstCheckResult;
+
+    @ApiParam("是否完成巡检")
+    private Integer isOnSiteCheck;
+
+    @ApiParam("巡检结果")
+    private List<MesQcCheckData> onSiteCheckResult;
+
+    @ApiParam("是否完成尾检")
+    private Integer isEndCheck;
+
+    @ApiParam("尾检结果")
+    private List<MesQcCheckData> endCheckResult;
+
+    public QcCheckDataResultModel() {
+    }
+
+    public QcCheckDataResultModel(Integer isFirstCheck, Integer isOnSiteCheck, Integer isEndCheck) {
+        this.isFirstCheck = isFirstCheck;
+        this.isOnSiteCheck = isOnSiteCheck;
+        this.isEndCheck = isEndCheck;
+    }
+}

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

@@ -0,0 +1,22 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/4/9 19:40
+ * @desc
+ */
+@Data
+public class ReworkResultModel {
+
+    @ApiParam("已维修数量")
+    private Integer alreadyRepairCount;
+
+    @ApiParam("未维修数量")
+    private Integer notRepairCount;
+
+    @ApiParam("拆解数量")
+    private Integer dismantleCount;
+}

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesWcCheckRecord;
 import io.swagger.annotations.Api;
@@ -36,6 +37,9 @@ public class WcCheckModel {
     @ApiParam("是否通过")
     private Integer isPass;
 
+    @ApiParam("输入框是否可以重选")
+    private Integer isEnable;
+
     @ApiParam("开线信号")
     private Integer onlineSignal;
 
@@ -53,6 +57,7 @@ public class WcCheckModel {
 
     public WcCheckModel initialWcCheckModel() {
         WcCheckModel wcCheckModel = new WcCheckModel();
+        wcCheckModel.setIsEnable(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
         wcCheckModel.setOnlineSignal(MesPcnEnumUtil.ONLINE_SIGNAL.NON_CHECK.getValue());
         wcCheckModel.setIsPass(MesPcnEnumUtil.IS_WCCHECK_PASS.NON_PASS.getValue());
         onlineSignalEqu = new MesWcCheckRecord();