From 46cc056a432504d6c027701cd7ebc03ceadcbb67 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 27 Nov 2020 15:03:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A9=E6=B4=A5BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java | 5 +++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 12 ++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java index 56e1cb7..1cf909c 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java @@ -3,9 +3,7 @@ package cn.estsh.i3plus.pojo.model.dynamic.table; import lombok.Data; import java.io.Serializable; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; /** @@ -31,6 +29,9 @@ public class DynTableRow implements Serializable { // 行Size private Integer cellSize = 0; + //时间 + private String createDatetime; + // 行数据 private Map cellMap = new HashMap<>(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index cb532b0..88f58f3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -385,6 +385,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "实际发运时间") private String actualPlanTime; + @Transient + @ApiParam(value = "目的库位名称") + public String destLocateName; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; @@ -715,4 +719,12 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.custNo = custNo; } + public WmsDocMovementDetails(String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo, String locateName) { + this.orderNo = orderNo; + this.srcZoneNo = srcZoneNo; + this.destZoneNo = destZoneNo; + this.destLocateNo = destLocateNo; + this.destLocateName = locateName; + } + }