From d22bd22012d734b79ea5764e60b7404df1ed8bc5 Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Sat, 18 Apr 2020 18:18:08 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A=E5=AE=A2=E6=88=B7J?=
 =?UTF-8?q?IT=E8=87=AA=E5=8A=A8=E4=B8=8B=E8=BE=BE]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java   | 16 ++++++++++++++--
 .../cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java  | 12 ++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java
index b656d3f..808ca31 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java
@@ -60,17 +60,29 @@ public class IfQueueShipping extends BaseBean implements Serializable {
     private Double qty;
 
     @Column(name = "SUPPLIER_CODE")
-    @ApiParam("操作人")
+    @ApiParam("供应商代码")
     private String supplierCode;
 
+    @Column(name = "ACTION_USER")
+    @ApiParam("操作人")
+    private String actionUser;
+
     @Column(name = "ACTION_DATE_TIME")
     @ApiParam("操作时间")
-    private Date actionDateTime;
+    private String actionDateTime;
 
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("产线")
     private String workCenterCode;
 
+    @Column(name = "PRODUCE_CATEGORY_CODE")
+    @ApiParam("产品位置")
+    private String produceCategoryCode;
+
+    @Column(name = "JIT_LOT_NO")
+    @ApiParam("JIT队列批次")
+    private String jitLotNo;
+
     @Column(name = "SYNC_STATUS")
     @ApiParam("同步状态")
     private Integer syncStatus;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java
index db10be7..d75a1de 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java
@@ -43,6 +43,10 @@ public class MesQueueShipping extends BaseBean implements Serializable {
     @ApiParam("vin")
     private String vinCode;
 
+    @Column(name = "CAR_NO")
+    @ApiParam("车号")
+    private String carNo;
+
     @Column(name = "CUST_FLAG_NO")
     @ApiParam("客户标识号")
     private String custFlagNo;
@@ -63,4 +67,12 @@ public class MesQueueShipping extends BaseBean implements Serializable {
     @ApiParam("客户产线代码")
     private String custPlantCode;
 
+    @Column(name = "JIT_LOT_NO")
+    @ApiParam("JIT队列批次")
+    private String jitLotNo;
+
+    @Column(name = "JIT_ACTUAL_NO")
+    @ApiParam("客户JIT队列编号")
+    private String jitActualNo;
+
 }