From 792dc0a1907870d80ee63be889b5067a4f2df9fb Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 23 Jul 2019 16:56:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?WMS=5FMOVE=5FTO=5FERP=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=B9=B4=E4=BB=BD?= 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 d8d2132..496a719 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 @@ -157,6 +157,10 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("关联单据行号") public String refItem; + @Column(name = "YEAR") + @ApiParam("年度") + public String year; + @ApiParam(value = "待出库数量", example = "0") @Transient private Long waitingCounts; From 7811157312f7eb0ccf9d5920c162cf6a3197883e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Tue, 23 Jul 2019 20:30:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 22 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 2 ++ 2 files changed, 24 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 d8d2132..0de9b2a 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 @@ -157,6 +157,10 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("关联单据行号") public String refItem; + @Column(name="IS_LOCK") + @ApiParam(value = "是否锁定", example = "2") + public Integer isLock= CommonEnumUtil.FALSE; + @ApiParam(value = "待出库数量", example = "0") @Transient private Long waitingCounts; @@ -168,6 +172,13 @@ public class WmsMoveToERP extends BaseBean { @Transient private Long shippingId; + @Transient + private Double transQtySum; + + public Double getTransQtySumVal() { + return this.transQtySum == null ? 0 : this.transQtySum.doubleValue(); + } + public Double getRejectQty(){ return this.rejectQty == null ? 0 : this.rejectQty.doubleValue(); } @@ -183,4 +194,15 @@ public class WmsMoveToERP extends BaseBean { public Long getFinishedCounts() { return finishedCounts == null ? 0L : this.finishedCounts; } + + public WmsMoveToERP() {} + + public WmsMoveToERP(String partNo, String partNameRdd, String vendorNo, String unit, String destAreaNo, Double transQtySum) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.vendorNo = vendorNo; + this.unit = unit; + this.destAreaNo = destAreaNo; + this.transQtySum = transQtySum; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 20e8a9e..c9f016b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -240,6 +240,8 @@ public class WmsStockSn extends BaseBean { this.partNo = partNo; } + public Integer getSnType() { return snType == null ? 0 : snType.intValue();} + public Double getQty() { return qty == null ? 0L : qty.doubleValue(); }