From 3c42131f2bd16711fd8160de4f1a0feba43d886e Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Thu, 24 Jun 2021 19:19:31 +0800
Subject: [PATCH] =?UTF-8?q?16436=2019081-PCN-=E8=BF=94=E5=B7=A5=E8=BF=94?=
 =?UTF-8?q?=E4=BF=AE-=E9=9A=94=E7=A6=BB-=E5=9F=BA=E4=BA=8E=E6=9D=A1?=
 =?UTF-8?q?=E7=A0=81=E6=9F=A5=E8=AF=A2=E9=9B=B6=E4=BB=B6=E6=97=B6-?=
 =?UTF-8?q?=E6=95=A3=E4=BB=B6=E6=B8=85=E5=8D=95=E5=92=8C=E7=89=A9=E6=96=99?=
 =?UTF-8?q?bom=EF=BC=8C=E5=92=8C=E5=A2=9E=E5=8A=A0=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java           | 3 +++
 .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java  | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java
index 6095463..dc0a116 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java
@@ -108,6 +108,9 @@ public class MesBom extends BaseBean implements Serializable {
     @ApiParam("报废数")
     private Double wasteQty = 0d;
 
+    @Transient
+    @ApiParam("客户零件号")
+    private String custPartNo;
 
 
     public double getQtyVal() {
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java
index 46a5850..bdf9ab3 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java
@@ -85,4 +85,8 @@ public class MesQuarantineRecord extends BaseBean {
     @Column(name = "REPAIR_NAME")
     @ApiParam("维修名称")
     private String repairName;
+
+    @Column(name = "IS_CANCEL_REPAIR")
+    @ApiParam("取消报废")
+    private Integer isCancelScrap;
 }