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 34c8f2b..d350c54 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 @@ -170,6 +170,18 @@ public class MesPackage extends BaseBean implements Serializable { public MesPackage() { } + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public double getQty2Val() { + return this.qty2 == null ? 0.0d : this.qty2; + } + + public double getPackSpecQtyVal() { + return this.packSpecQty == null ? 0.0d : this.packSpecQty; + } + public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty) { this.packageNo = packageNo; this.partNo = partNo; 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;