From b17cf60ac6392e504bfcacd9f587272f30c9794b Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Wed, 15 Apr 2020 21:42:54 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1571=20=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=8A=A5=E5=8A=9F=E6=95=B0=E6=8D=AE=20=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E5=8F=98=E6=9B=B4]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java  | 16 ++++++++++++++++
 .../estsh/i3plus/pojo/mes/model/EsProductDataModule.java |  1 -
 .../cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java  | 13 +++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java
index 5d8e27c..3ceba82 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java
@@ -85,4 +85,20 @@ public class IfProductOffLine extends BaseBean  implements Serializable {
     @Column(name = "IF_CODE")
     @ApiParam("接口代码")
     private String ifCode;
+
+    @Column(name = "PRODUCE_CATEGORY_CODE")
+    @ApiParam("产品位置")
+    private String produceCategoryCode;
+
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+
+    @Column(name = "JIT_LOT_NO")
+    @ApiParam("JIT队列批次")
+    private String jitLotNo;
+
+    @Column(name = "VIN_CODE")
+    @ApiParam("vin")
+    private String vinCode;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java
index bd38834..151b5ef 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java
@@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.mes.model;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.mes.annotation.ElasticSearch;
 import cn.estsh.i3plus.pojo.mes.annotation.Json4Es;
-//import com.sun.tools.javac.util.List;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
index a624677..8667491 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
@@ -79,6 +79,11 @@ public class QueueOrderModel implements Serializable {
     @ApiParam("产品类型名称")
     private String pptCode;
 
+    @ApiParam("JIT队列批次")
+    private String jitLotNo;
+    @ApiParam("vin")
+    private String vinCode;
+
     public QueueOrderModel() {
     }
 
@@ -234,4 +239,12 @@ public class QueueOrderModel implements Serializable {
         this.partNameRdd = partNameRdd;
         this.organizeCode = organizeCode;
     }
+
+    public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode) {
+        this.id = id;
+        this.queueGroupNo = queueGroupNo;
+        this.jitLotNo = jitLotNo;
+        this.vinCode = vinCode;
+        this.organizeCode = organizeCode;
+    }
 }