From 0f5ab7b14458025751fca9aa485d1b6ce320fec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 19 Nov 2020 14:06:09 +0800 Subject: [PATCH] BUG#12609 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) 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 344757d..85012a9 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 @@ -75,4 +75,8 @@ public class BasCustomer extends BaseBean { @ApiParam(value = "安全库存") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private Double safetyStock; + + public double getSafetyStockVal() { + return this.safetyStock == null ? 0.0d : this.safetyStock; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index 3c9b438..ffde294 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -110,7 +110,8 @@ public class WmsQCDetails extends BaseBean { Double qty, String unit, String orderNo, Integer itemStatus, String remark, Double factQty, Double passQty, Double rejectQty, - Integer orderStatus, String vendorNo, String vendorDesc) { + Integer orderStatus, String vendorNo, String vendorDesc, + String createUser, String createDatetime,String modifyUser,String modifyDatetime) { this.organizeCode = organizeCode; this.partNo = partNo; this.partNameRdd = partNameRdd; @@ -126,6 +127,10 @@ public class WmsQCDetails extends BaseBean { this.orderStatus = orderStatus; this.vendorNo = vendorNo; this.vendorDesc = vendorDesc; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; } public WmsQCDetails(String partNo, String partNameRdd, String item,