From 9fb8962e4e991e710e91af826aef7e082cf101bc Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Thu, 24 Sep 2020 09:15:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E9=80=80=E4=BB=B6bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java     | 4 ++++
 .../java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java  | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java
index 926b291..5ecb56c 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java
@@ -178,4 +178,8 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     @ApiParam(value = "qty")
     public Integer qty;
 
+    @Transient
+    @ApiParam("工单类型")
+    private String woTypeName;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java
index 4cee1fd..64e9e70 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java
@@ -36,6 +36,9 @@ public class QueueJitActualModel {
     public String workTypeName;
 
     @ApiParam("客户产线代码")
+    private String custPlantCode;
+
+    @ApiParam("客户产线代码")
     private String custProdLineCode;
 
     @ApiParam("产品位置代码")
@@ -73,13 +76,13 @@ public class QueueJitActualModel {
 
     }
 
-    public QueueJitActualModel(Long id, String vinCode, String jisActualNo, Integer workType, String custProdLineCode, String produceCtgyCode,
+    public QueueJitActualModel(Long id, String vinCode, String jisActualNo, Integer workType, String custPlantCode, String produceCtgyCode,
                                String productSn, Integer detailStatus, String createUser, String createDatetime) {
         this.id = id;
         this.vinCode = vinCode;
         this.jisActualNo = jisActualNo;
         this.workType = workType;
-        this.custProdLineCode = custProdLineCode;
+        this.custPlantCode = custPlantCode;
         this.produceCtgyCode = produceCtgyCode;
         this.productSn = productSn;
         this.detailStatus = detailStatus;
@@ -94,6 +97,7 @@ public class QueueJitActualModel {
         this.jisActualNo = jisActualNo;
         this.partNo = partNo;
         this.partName = partName;
+        this.produceCtgyCode = produceCtgyCode;
         this.qty = qty;
         this.createUser = createUser;
         this.createDatetime = createDatetime;