From ceb882cef4dfcb26daeaa5844ac16f3b8be6c097 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 21 Oct 2020 12:31:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E6=B4=A5MGN=E4=BF=AE=E5=A4=8DBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java | 2 +- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java index bf65f0b..344757d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java @@ -72,7 +72,7 @@ public class BasCustomer extends BaseBean { private String custFax; @Column(name = "SAFETY_STOCK") - @ApiParam(value = "safetyStock") + @ApiParam(value = "安全库存") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private Double safetyStock; } 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 f65a06b..bc69da7 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 @@ -198,6 +198,10 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("结束时间") private String planEndDate; + @Transient + @ApiParam("erp单号") + private String erpSrcNo; + /** * 状态:1=新建,10=收货中,20=收货完成, @@ -274,9 +278,10 @@ public class WmsPOMasterDetails extends BaseBean { this.qty = qty; } - public WmsPOMasterDetails(String orderNo, String partNo, Double qty, + public WmsPOMasterDetails(String orderNo, String erpSrcNo, String partNo, Double qty, Double rcQty, Integer itemStatus) { this.orderNo = orderNo; + this.erpSrcNo = erpSrcNo; this.partNo = partNo; this.qty = qty; this.rcQty = rcQty;