From 280385eb2081d5c8074401c676e0876beaa572bb Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Thu, 16 Apr 2020 18:59:30 +0800
Subject: [PATCH] =?UTF-8?q?[bug:=208092=20SOP=E4=BF=A1=E6=81=AF=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

---
 .../estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 20 ++++++++++++++++++++
 .../cn/estsh/i3plus/pojo/mes/bean/MesProcess.java    | 13 +++++++++++++
 .../java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java |  9 +++++----
 3 files changed, 38 insertions(+), 4 deletions(-)

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 3ceba82..040228e 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
@@ -58,6 +58,26 @@ public class IfProductOffLine extends BaseBean  implements Serializable {
     @ApiParam("特殊批次")
     private String fixLotNo;
 
+    @Column(name = "ITEM_PART_NO")
+    @ApiParam("原材料物料号")
+    private String itemPartNo;
+
+    @Column(name = "ITEM_PART_NAME")
+    @ApiParam("原材料物料名称")
+    private String itemPartName;
+
+    @Column(name = "ITEM_QTY")
+    @ApiParam("原材料用量")
+    private String itemQty;
+
+    @Column(name = "ITEM_UNIT")
+    @ApiParam("原材料单位")
+    private String itemUnit;
+
+    @Column(name = "SUPPLIER_CODE")
+    @ApiParam("供应商代码")
+    private String supplierCode;
+
     @Column(name = "ACTION_USER")
     @ApiParam("操作人")
     private String actionUser;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java
index bc05708..661059a 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java
@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -37,4 +38,16 @@ public class MesProcess extends BaseBean implements Serializable {
     @Column(name = "PROCESS_NAME")
     @ApiParam("工序名称")
     private String processName;
+
+    @Transient
+    @ApiParam("生产线代码")
+    private String workCenterCode;
+
+    @Transient
+    @ApiParam("工位代码")
+    private String workCellCode;
+
+    @Transient
+    @ApiParam("流程代码")
+    private String routeCode;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java
index bea56af..a0a107d 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java
@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -47,4 +44,8 @@ public class MesRoute extends BaseBean implements Serializable {
     @Column(name = "ROUTE_TYPE")
     @ApiParam("流程类型 10-扫描类型 20-监控类型")
     private Integer routeType;
+
+    @Transient
+    @ApiParam("生产线")
+    private String workCenterCode;
 }