From 92e8364b5892cf879a842a1c60df63e06b40ba6c Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 3 Sep 2020 16:24:50 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=901140=2009=201.2.1.1.1=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E5=8F=91=E8=BF=90=E8=BD=A6=E8=BE=86=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java | 17 ++++++++++++++++- .../i3plus/pojo/wms/modelbean/WmsRecommendCarModel.java | 4 +++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java index 0e99f0f..ebdce7a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java @@ -91,7 +91,22 @@ public class WmsCar extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double volume; - @ApiParam(value = "需要(辆)") @Transient + @ApiParam(value = "需要(辆)") private Integer carQty; + + @Transient + @ApiParam(value = "车辆序号") + private Integer seq; + + public WmsCar() { + } + + public WmsCar(WmsCar car, Integer seq, String carDesc) { + this.id = car.id; + this.organizeCode = car.organizeCode; + this.volume = car.volume; + this.carNo = seq.toString(); + this.carDesc = carDesc; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsRecommendCarModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsRecommendCarModel.java index 35bdbc5..ec0fc07 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsRecommendCarModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsRecommendCarModel.java @@ -31,7 +31,8 @@ public class WmsRecommendCarModel extends BaseBean implements Serializable { @ApiParam(value = "物料号") String partNo; - public WmsRecommendCarModel(String partNo, Double partNoSum, Double vol, Double snp,Double partTotalVol,String organizeCode,Long id) { + public WmsRecommendCarModel(String partNo, Double partNoSum, Double vol, Double snp,Double partTotalVol, + String organizeCode,Long id,String planTimeStart) { this.partNo = partNo; this.partNoSum = partNoSum; this.vol = vol; @@ -39,6 +40,7 @@ public class WmsRecommendCarModel extends BaseBean implements Serializable { this.partTotalVol = partTotalVol; this.organizeCode = organizeCode; this.id = id; + this.planTimeStart = planTimeStart; } // @ApiParam(value = "车辆编号")