diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index aa46876..f04cc9c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -90,9 +90,9 @@ public class WmsMoveMaster extends BaseBean { private String partNo; @Transient - @ApiParam("状态") - @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") - private Integer itemStatus; + @ApiParam("明细状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class) + private String itemStatus; @Transient @ApiParam("erp库存地") @@ -135,10 +135,14 @@ public class WmsMoveMaster extends BaseBean { private String srcZoneNo; @Transient - @ApiParam("处理数量") + @ApiParam("需求数量") private Double transQty; @Transient + @ApiParam("处理数量") + private Double handledQty; + + @Transient @ApiParam("不合格处理数量") private Double rejectQty; @@ -197,7 +201,7 @@ public class WmsMoveMaster extends BaseBean { this.errorMessage = errorMessage; this.busiTypeCode = busiTypeCode; this.partNo = partNo; - this.itemStatus = itemStatus; + this.itemStatus = itemStatus.toString(); this.refOrderNo = refOrderNo; this.carNo = carNo; this.refSrc = refSrc; @@ -220,7 +224,7 @@ public class WmsMoveMaster extends BaseBean { this.partNameRdd = partNameRdd; this.transTypeCode = transTypeCode; this.transTypeName = transTypeName; - this.itemStatus = itemStatus; + this.itemStatus = itemStatus.toString(); this.unit = unit; this.srcWhNo = srcWhNo; this.srcZoneNo = srcZoneNo; @@ -237,22 +241,25 @@ public class WmsMoveMaster extends BaseBean { this.modifyDatetime = modifyDatetime; } - public WmsMoveMaster(String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer itemStatus, - String unit, String srcWhNo, String srcZoneNo, String destWhNo, String destZoneNo, Double transQty, Double rejectQty, String fixId, Integer busiTypeCode, - String createDatetime, String createUser, String modifyUser, String modifyDatetime, String refSrc) { + public WmsMoveMaster(String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode, + String transTypeName, Integer itemStatus,String unit, String srcWhNo, String srcZoneNo, + String destWhNo, String destZoneNo, Double transQty,Double handledQty,Double rejectQty, + String fixId, Integer busiTypeCode,String createDatetime, String createUser, String modifyUser, + String modifyDatetime, String refSrc) { this.orderNo = orderNo; this.organizeCode = organizeCode; this.partNo = partNo; this.partNameRdd = partNameRdd; this.transTypeCode = transTypeCode; this.transTypeName = transTypeName; - this.itemStatus = itemStatus; + this.itemStatus = itemStatus.toString(); this.unit = unit; this.srcWhNo = srcWhNo; this.srcZoneNo = srcZoneNo; this.destWhNo = destWhNo; this.destZoneNo = destZoneNo; this.transQty = transQty; + this.handledQty = handledQty; this.rejectQty = rejectQty; this.fixId = fixId; this.busiTypeCode = busiTypeCode; @@ -272,7 +279,7 @@ public class WmsMoveMaster extends BaseBean { this.partNameRdd = partNameRdd; this.transTypeCode = transTypeCode; this.transTypeName = transTypeName; - this.itemStatus = itemStatus; + this.itemStatus = itemStatus.toString(); this.unit = unit; this.srcWhNo = srcWhNo; this.srcZoneNo = srcZoneNo;