From db9a698c685ed186183b378782f1482bfd2e608c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Fri, 15 Nov 2019 23:17:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=AF=84=E5=94=AE=E7=9A=84=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 654dbd2..33d91a3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -175,6 +175,10 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("年度") public String year; + @Column(name = "IS_CONSIGNMENT") + @ApiParam("是否寄售") + public Integer isConsignment = 2; + @ApiParam(value = "待出库数量", example = "0") @Transient private Long waitingCounts; From 693ac2451e36d6f63679043c41b88fb3d912a2ce Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 16 Nov 2019 12:00:08 +0800 Subject: [PATCH 2/3] =?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 --- .../estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java | 16 ++++++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesPackageDetail.java | 8 ++++---- .../i3plus/pojo/mes/pcn/model/ProdPackageModel.java | 15 +++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 20 ++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesPackageDetail.java | 6 +++--- 5 files changed, 58 insertions(+), 7 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 4c34404..05f94b1 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 @@ -99,6 +99,22 @@ public class MesPackage extends BaseBean { @ApiParam("打印状态文字") private String printStrStatus; + @Transient + @ApiParam("客户代码名称") + private String custCodeName; + + @Transient + @ApiParam("包装层级名称") + private String packLevelName; + + @Transient + @ApiParam("是否封箱名称") + private String isSealedName; + + @Transient + @ApiParam("过程条码") + private String serialNumber; + diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java index d3864d0..883c12a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java @@ -24,7 +24,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PACKAGE_DETAIL") -@Api("包装规格") +@Api("包装规格明细") public class MesPackageDetail extends BaseBean { @Column(name = "PACKAGE_NO") @@ -32,15 +32,15 @@ public class MesPackageDetail extends BaseBean { private String packageNo; @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; @Column(name = "PART_NO") - @ApiParam("产品条码") + @ApiParam("物料编号") private String partNo; @Column(name = "PART_NAME_RDD") - @ApiParam("产品条码") + @ApiParam("物料名称") private String partNameRdd; @Column(name = "PACKAGE_NO2") 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 9a979a9..3b99952 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 @@ -64,4 +64,19 @@ public class ProdPackageModel { @ApiParam("工单集合") private List workOrderList; + @ApiParam("打印状态文字") + private String printStrStatus; + + @ApiParam("客户代码名称") + private String custCodeName; + + @ApiParam("包装层级名称") + private String packLevelName; + + @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 f6a4b95..451efae 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 @@ -95,4 +95,24 @@ public class MesPackage extends BaseBean { @ApiParam("封箱状态") private String sealStatus; + @Transient + @ApiParam("打印状态文字") + private String printStrStatus; + + @Transient + @ApiParam("客户代码名称") + private String custCodeName; + + @Transient + @ApiParam("包装层级名称") + private String packLevelName; + + @Transient + @ApiParam("是否封箱名称") + private String isSealedName; + + @Transient + @ApiParam("过程条码") + private String serialNumber; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index a6594ad..95483c1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -23,8 +23,8 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE") -@Api("包装规格") +@Table(name = "MES_PACKAGE_DETAIL") +@Api("包装规格明细") public class MesPackageDetail extends BaseBean { @Column(name = "PACKAGE_NO") @@ -32,7 +32,7 @@ public class MesPackageDetail extends BaseBean { private String packageNo; @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; @Column(name = "PART_NO") 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 3/3] =?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; - }