From 32f6215be7340264ef745ca9ebc502886f5b31b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= <jessica.chen@estsh.com>
Date: Tue, 28 Apr 2020 19:12:30 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=908309=20=E4=BA=A7=E5=93=81=E9=85=8D?=
 =?UTF-8?q?=E6=96=B9=E5=AF=BC=E5=85=A5-=E5=AF=BC=E5=85=A5=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java  |  4 ++++
 .../estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java  | 17 +++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java
index 0bc3879..48a7682 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java
@@ -91,6 +91,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
     @Transient
     private List<MesQcCheckStandard> childQcList;
 
+    @Transient
+    @ApiParam("备注")
+    private String memo;
+
     public MesQcCheckStandard() {
     }
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java
index d7ca7a5..9fce24b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java
@@ -16,23 +16,28 @@ import lombok.Data;
 @Api(value="生产工单导入",description = "生产工单导入")
 public class MesWorkOrderModel {
 
-    @ApiParam("工单号")
+    //工单号
+    @ApiParam("OrderCode")
     @AnnoOutputColumn
     private String orderNo;
 
-    @ApiParam("物料号")
+    //物料号
+    @ApiParam("ItemCode")
     @AnnoOutputColumn
     private String partNo;
 
-    @ApiParam("客户产线代码")
+    //客户产线代码
+    @ApiParam("ProductionLineID")
     @AnnoOutputColumn
-    private String custProdLineCode;
+    private String workCenterCode;
 
-    @ApiParam("数量")
+    //数量
+    @ApiParam("DemandQty")
     @AnnoOutputColumn
     private Double qty;
 
-    @ApiParam("开始时间")
+    //开始时间
+    @ApiParam("ProductDate")
     @AnnoOutputColumn
     private String startTime;