From f6d50bdfb77660525d14457a851e84ace84e374d Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 16 Nov 2019 13:56:42 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1167?= =?UTF-8?q?=EF=BC=8C=E4=BA=A7=E5=93=81=E6=89=B9=E9=87=8F=E6=89=93=E5=8C=85?= =?UTF-8?q?=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/pcn/bean/MesPackage.java | 7 ------- .../cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java | 9 ++++++--- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 4 ---- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java index 05f94b1..ca904d5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java @@ -111,13 +111,6 @@ public class MesPackage extends BaseBean { @ApiParam("是否封箱名称") private String isSealedName; - @Transient - @ApiParam("过程条码") - private String serialNumber; - - - - public MesPackage() { } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java index 3b99952..abc6f92 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java @@ -58,6 +58,12 @@ public class ProdPackageModel { @ApiParam("包装规格") private String packSpec; + @ApiParam("数量") + private Double qty; + + @ApiParam("特殊批次") + private String fixLotNo; + @ApiParam("包装集合") private List packageList; @@ -76,7 +82,4 @@ public class ProdPackageModel { @ApiParam("是否封箱名称") private String isSealedName; - @ApiParam("过程条码") - private String serialNumber; - } 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 451efae..36b3bf6 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 @@ -111,8 +111,4 @@ public class MesPackage extends BaseBean { @ApiParam("是否封箱名称") private String isSealedName; - @Transient - @ApiParam("过程条码") - private String serialNumber; - }