From 3c1f8cf6b19e5af248ef88e81983c58f49a8cec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= <adair.song@estsh.com>
Date: Wed, 3 Jun 2020 19:48:08 +0800
Subject: [PATCH] Finish Task #1889 Cost:24h

---
 .../i3plus/pojo/mes/bean/MesProdBindRecord.java    |  3 ++
 .../i3plus/pojo/mes/model/DefectTypeModel.java     | 19 ++++++++
 .../pojo/mes/model/RepairAndDefectModel.java       | 56 ++++++++++++++++++++++
 .../i3plus/pojo/mes/model/ScatterBomModel.java     | 26 ++++++++++
 .../i3plus/pojo/mes/model/SkinCheckModel.java      | 40 ++++++++++++++++
 5 files changed, 144 insertions(+)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectTypeModel.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RepairAndDefectModel.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterBomModel.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkinCheckModel.java

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java
index 61a2dc8..90a96f1 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java
@@ -112,6 +112,9 @@ public class MesProdBindRecord extends BaseBean implements Serializable {
     @ApiParam("原材料零件名称")
     private String itemPartName;
 
+    @ApiParam("生产队列号")
+    private String orderNo;
+
 
     public int getIsFeedVal() {
         return this.isFeed == null ? 0 : this.isFeed;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectTypeModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectTypeModel.java
new file mode 100644
index 0000000..3620dd2
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectTypeModel.java
@@ -0,0 +1,19 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class DefectTypeModel<T> implements Serializable {
+
+    // 缺陷/维修
+    @ApiParam("业务类型")
+    private String busiType;
+
+    @ApiParam("List结果集")
+    private List<T> resultList;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RepairAndDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RepairAndDefectModel.java
new file mode 100644
index 0000000..247288e
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RepairAndDefectModel.java
@@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class RepairAndDefectModel implements Serializable {
+
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partName;
+
+    @ApiParam("缺陷代码")
+    private String defectCode;
+
+    @ApiParam("缺陷名称")
+    private String defectName;
+
+    @ApiParam("缺陷位置")
+    private String defectLocation;
+
+    @ApiParam("面位")
+    private String sideLocation;
+
+    @ApiParam("维修状态")
+    private Integer repairStatus;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("维修代码")
+    private String repairCode;
+
+    @ApiParam("维修名称")
+    private String repairName;
+
+    @ApiParam("缺陷原因代码")
+    private String dcCode;
+
+    @ApiParam("缺陷原因描述")
+    private String dcName;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterBomModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterBomModel.java
new file mode 100644
index 0000000..6fe1eaf
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterBomModel.java
@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ScatterBomModel implements Serializable {
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partName;
+
+    @ApiParam("个数")
+    private Double qty;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkinCheckModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkinCheckModel.java
new file mode 100644
index 0000000..1f6afc7
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkinCheckModel.java
@@ -0,0 +1,40 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesProduceCtgyPicture;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class SkinCheckModel implements Serializable {
+
+    @ApiParam("主队列编号")
+    private String orderNo;
+
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @ApiParam("生产号")
+    private String vinCode;
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @ApiParam("车型")
+    private String prodCfgTypeCode;
+
+    @ApiParam("等级")
+    private String gradeCode;
+
+    @ApiParam("面位")
+    private String sideLocation;
+
+    // 产品位置图片
+    private List<MesProduceCtgyPicture> produceCtgyPictureList;
+
+}