From 77f66de188d0509688018a0b7e5a13023bd03c00 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: Fri, 9 Apr 2021 17:18:54 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=9014930=2020027-=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=AB=AF=E7=94=9F=E4=BA=A7=E5=8C=85=E8=A3=85=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0=E4=BA=A7=E5=93=81=E4=BA=8C=E7=BB=B4?=
 =?UTF-8?q?=E7=A0=81=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=A0=B9=E6=8D=AE=E4=BA=A7=E5=93=81=E4=BA=8C=E7=BB=B4?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=87=BA=E5=8C=85=E8=A3=85=E6=9D=A1=E7=A0=81?=
 =?UTF-8?q?-20210409=E3=80=91=20=E3=80=9014884=2020027--=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92--=E7=BC=96=E8=BE=91=E4=B8=AD=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E4=B8=80=E8=A1=8C=E6=95=B0=E6=8D=AE=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=90=8E=EF=BC=8C=E4=B8=8D=E5=81=9A=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E6=9B=B4=E6=96=B0=E3=80=82-2021-04-06=E3=80=91=20?=
 =?UTF-8?q?=E3=80=9014848=2020027--=E6=8E=A7=E5=88=B6=E8=AE=A1=E5=88=92--?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=B8=AD=E8=BE=93=E5=85=A5=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E6=9D=A1=E4=BB=B6=E6=B2=A1=E6=9C=89=E7=94=9F?=
 =?UTF-8?q?=E6=95=88=EF=BC=8C=E7=82=B9=E5=87=BB=E6=9F=A5=E8=AF=A2=EF=BC=8C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9C=89=E6=8C=89=E7=85=A7=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6=E6=98=BE=E7=A4=BA=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C-2021-04-02=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
index 89307ed..d0ed327 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
@@ -207,6 +207,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("工序名称")
     private String processName;
 
+    @Transient
+    @ApiParam("产品条码")
+    private String productSn;
+
     public MesPackage() {
     }
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java
index 4dab68a..d3f4b25 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java
@@ -40,6 +40,9 @@ public class MesControlPlanModel {
     @ApiParam("是否启用")
     private Integer isEnable;
 
+    @ApiParam("是否删除")
+    private Integer isCutOut;
+
     @ApiParam("质量标准数组")
     private List<MesQualityStandardModel> standardList;