From afa2ac746a5c16e1cb455865c6d307a1888f113e Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 27 Mar 2019 10:48:53 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8=E4=BF=A1=E6=81=AF=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 158664c..9ac8347 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1440,8 +1440,8 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PRINT_ORDER_TYPE { PO(10, "PO"), - MOVEMENT(20, "MOVEMENT"), - ASN(30, "ASN"); + ASN(20, "ASN"), + MOVEMENT(30, "MOVEMENT"); private int value; private String description; From b41e06f412dd0654d6977166f6b1754e490effff Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Wed, 27 Mar 2019 10:59:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?wmsPOMasterDetails=20erpWhNo---=E3=80=8B=20?= =?UTF-8?q?erpAeraNo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 364199b..76b4942 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -81,9 +81,9 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("计划交货时间") public String planTime; - @Column(name = "ERP_WH_NO") + @Column(name = "ERP_AREA_NO") @ApiParam("默认收货库存地") - public String erpWhNo; + public String erpAreaNo; /** * 状态:10 N=正常,20 C=行取消 From 130343ea6bd255e0db6d694411a2ccc1ee9bfee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Wed, 27 Mar 2019 11:42:27 +0800 Subject: [PATCH 3/4] =?UTF-8?q?PO=E6=98=8E=E7=BB=86=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 364199b..e354862 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : PO订单明细信息 @@ -45,6 +46,8 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam(value = "需求数量", example = "0") public Double qty; + public Double getQty(){ return this.qty == null ? 0 : this.qty; } + @Column(name = "UNIT") @ApiParam("单位") public String unit; @@ -58,21 +61,29 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam(value = "条码打印数量", example = "0") public Double printQty; + public Double getPrintQty(){ return this.printQty == null ? 0 : this.printQty; } + @Column(name = "RC_QTY") @ColumnDefault("0") @ApiParam(value = "收货数量", example = "0") public Double rcQty; + public Double getRcQty(){ return this.rcQty == null ? 0 : this.rcQty; } + @Column(name = "PASS_QTY") @ColumnDefault("0") @ApiParam(value = "质检合格数量", example = "0") public Double passQty; + public Double getPassQty(){ return this.passQty == null ? 0 : this.passQty; } + @Column(name = "NG_QTY") @ColumnDefault("0") @ApiParam(value = "质检不合格数量", example = "0") public Double ngQty; + public Double getNgQty(){ return this.ngQty == null ? 0 : this.ngQty; } + @Column(name = "PLAN_DATE") @ApiParam("计划交货日期") public String planDate; @@ -102,4 +113,11 @@ public class WmsPOMasterDetails extends BaseBean { @Column(name = "IS_FREE") @ApiParam(value = "是否免费", example = "1") public Integer isFree; + + @Transient + @ApiParam(value = "散件收货输入数量", example = "0") + public Double inputRcQty; + + + public Double getInputRcQty(){ return this.inputRcQty == null ? 0 : this.inputRcQty; } } From 9a7c26338a0f6a13d6684f32e7dcb308d72d3562 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 27 Mar 2019 14:22:00 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=89=93=E5=8D=B0?= =?UTF-8?q?=EF=BC=8C=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 8 -------- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 8 -------- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 8 -------- 3 files changed, 24 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index 42905ae..c61f2c7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -83,14 +83,6 @@ public class WmsASNMaster extends BaseBean { private String sendUser; @Transient - @ApiParam(value = "收货人") - private String rcUser; - - @Transient @ApiParam(value = "发货日期") private String sendDate; - - @Transient - @ApiParam(value = "收货日期") - private String rcDate; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index c462531..56da324 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -126,14 +126,6 @@ public class WmsDocMovementMaster extends BaseBean { private String sendUser; @Transient - @ApiParam(value = "收货人") - private String rcUser; - - @Transient @ApiParam(value = "发货日期") private String sendDate; - - @Transient - @ApiParam(value = "收货日期") - private String rcDate; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 5734f05..1d95450 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -101,14 +101,6 @@ public class WmsPOMaster extends BaseBean { private String sendUser; @Transient - @ApiParam(value = "收货人") - private String rcUser; - - @Transient @ApiParam(value = "发货日期") private String sendDate; - - @Transient - @ApiParam(value = "收货日期") - private String rcDate; }