From 339cbf06341c3ee3b902df0452be36743710abb8 Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Tue, 2 Mar 2021 20:26:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?bug:14146=20=E4=B8=80=E5=BC=A0=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E6=9F=A5=E8=AF=A2=E4=BA=A7=E5=93=81=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E8=BF=BD=E6=BA=AF=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java     | 12 ++++++++++++
 .../cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java  | 11 +++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
index 0dce57a..ef86497 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
@@ -236,6 +236,18 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("物料版本号")
     private String versionNo;
 
+    @Transient
+    @ApiParam("配方内容")
+    private String formulaContent;
+
+    @Transient
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+
+    @Transient
+    @ApiParam("组内编号")
+    private Integer groupNo;
+
     public MesProduceSn() {
     }
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java
index 7f8ed36..22d2230 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java
@@ -8,12 +8,7 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -74,4 +69,8 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable {
     @Column(name = "PART_COLOR_VALUE")
     @ApiParam("零件色值")
     private String partColorValue;
+
+    @Transient
+    @ApiParam("物料名称")
+    private String partName;
 }

From 154307b2f0786410800d1f27b111f210197c979b 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: Wed, 3 Mar 2021 11:12:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E6=B3=B0=E5=9B=BD=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=8D=E4=BC=A0=E5=8F=82=E4=BF=AE=E6=94=B9=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java
index 178dfe9..90acf1a 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java
@@ -47,6 +47,14 @@ public class MesProdCfgDetail extends BaseBean implements Serializable {
     @ApiParam("是否虚零件")
     private Integer isVirtual;
 
+    @Column(name = "IS_LEFT_PART")
+    @ApiParam("是否左零件")
+    private Integer isLeftPart;
+
+    @Column(name = "PRINTER_NAME")
+    @ApiParam("打印机名称")
+    private String printerName;
+
     @Transient
     @ApiParam("零件名称")
     private String partName;