From fd1a0ebdb816fe05b43b4f27e02e29f3255a8d5b Mon Sep 17 00:00:00 2001
From: jokelone <jokelone@yeah.net>
Date: Tue, 14 Jan 2020 14:18:05 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1404=20?=
 =?UTF-8?q?=E8=BF=87=E7=A8=8B=E8=B4=A8=E9=87=8F=20=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E9=A1=B9=E7=B1=BB=E5=9E=8B=E5=88=86=E7=BB=84=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/mes/pcn/model/QcCheckStandardModel.java   | 61 ++--------------------
 .../i3plus/pojo/mes/bean/MesProdBindRecord.java    | 13 +++++
 2 files changed, 16 insertions(+), 58 deletions(-)

diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java
index b038988..f2ec4a3 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java
@@ -18,63 +18,8 @@ public class QcCheckStandardModel {
 
     private Long id;
 
-    @ApiParam("物料编码")
-    private String partNo;
+    @ApiParam("列头")
+    private String title;
 
-    @ApiParam("工作中心代码")
-    private String workCenterCode;
-
-    @ApiParam("工作单元代码")
-    private String workCellCode;
-
-    @ApiParam("检测类型")
-    private Integer checkType;
-
-    @ApiParam("检测项")
-    private String checkItem;
-
-    @ApiParam("检测标准")
-    private String checkStandard;
-
-    @ApiParam("检测指导")
-    private String checkGuide;
-
-    @ApiParam("频率")
-    private String checkFrequency;
-
-    @ApiParam("物料名称")
-    private String partName;
-
-    @ApiParam("检测结果")
-    private String checkResult;
-
-    @ApiParam("检测值")
-    private String checkValue;
-
-    @ApiParam("检测项类型")
-    private String checkItemType;
-
-    @ApiParam("检测项类型名称")
-    private String checkItemTypeName;
-
-    private List<MesQcCheckStandard> childQcList;
-
-    public QcCheckStandardModel() {
-    }
-
-    public QcCheckStandardModel(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard
-            , String checkGuide, String checkFrequency, String partName, String checkItemType, String checkItemTypeName) {
-        this.id = id;
-        this.partNo = partNo;
-        this.workCenterCode = workCenterCode;
-        this.workCellCode = workCellCode;
-        this.checkType = checkType;
-        this.checkItem = checkItem;
-        this.checkStandard = checkStandard;
-        this.checkGuide = checkGuide;
-        this.checkFrequency = checkFrequency;
-        this.partName = partName;
-        this.checkItemType = checkItemType;
-        this.checkItemTypeName = checkItemTypeName;
-    }
+    private List<MesQcCheckStandard> resultList;
 }
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 32ad09c..b11e807 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
@@ -98,6 +98,19 @@ public class MesProdBindRecord extends BaseBean {
     @ApiParam(value = "动作类型")
     private String actionType;
 
+    @ApiParam(value = "是否绑定关键件名称")
+    private String isBindKeyName;
+
+    @ApiParam(value = "动作类型名称")
+    private String actionTypeName;
+
+    @ApiParam("产品条码零件名称")
+    private String partName;
+
+    @ApiParam("原材料零件名称")
+    private String itemPartName;
+
+
     public int getIsFeedVal() {
         return this.isFeed == null ? 0 : this.isFeed;
     }