From e60256e291a7b452daeefb67e435f7f40070ed57 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 15 Nov 2019 16:59:36 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1167?= =?UTF-8?q?=EF=BC=8C=E5=8C=85=E8=A3=85=E7=89=B9=E6=AE=8A=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E5=B7=A5=E6=AD=A5=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/pcn/bean/MesPackage.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java | 2 +- .../java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java | 2 +- 5 files changed, 13 insertions(+), 2 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 88a3791..4c34404 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 @@ -55,6 +55,10 @@ public class MesPackage extends BaseBean { @ApiParam("批号") private String lotNo; + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批号") + private String fixLotNo; + @Column(name = "PACK_SPEC") @ApiParam("包装规格") private String packSpec; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java index 89e6f89..19bd5d9 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java @@ -32,7 +32,7 @@ public class MesPackageTravel extends BaseBean { private String packageNo; @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; @Column(name = "OP_TYPE") 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 1ff7261..9a979a9 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 @@ -34,6 +34,9 @@ public class ProdPackageModel { @ApiParam("班次") private String shiftCode; + @ApiParam("班次名称") + private String shiftName; + @ApiParam("物料号") private String partNo; 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 ce04c3d..f6a4b95 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 @@ -55,6 +55,10 @@ public class MesPackage extends BaseBean { @ApiParam("批号") private String lotNo; + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批号") + private String fixLotNo; + @Column(name = "PACK_SPEC") @ApiParam("包装规格") private String packSpec; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index 4ac7024..76a808b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -32,7 +32,7 @@ public class MesPackageTravel extends BaseBean { private String packageNo; @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; @Column(name = "OP_TYPE")