diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 89b2f51..674a987 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -795,7 +795,6 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OUT_MOVEMENT_BUSI_TYPE { PRODUCTION_MATERIAS(10, "PROD_MATERIALS", "生产领料"), - BUSI_TYPE_NEW(480, "BUSI_TYPE_NEW", "新增业务类型"), CUSTOMER_SHPING(20, "CUS_SHPING", "客户发运"), OUTWARD_SHIPMENT(30, "OUT_SHIPMENT", "委外发运"), ALLOCATION(40, "ALLOCATION", "调拨"), @@ -842,6 +841,7 @@ public class WmsEnumUtil { KT_PURCHASE_RC(450, "KT_PURCHASE_RC", "采购收货"), KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"), FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"), + FINISH_PRODUCT_SHPING_NEW(480, "FINISH_PRODUCT_SHPING_NEW", "成品发运-新业务类型"), KT_PICK_RC(480, "KT_PICK_RC", "坤泰拣货"), PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"), UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"), 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 1ef109a..3d469ee 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 @@ -381,6 +381,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "最早需求时间") private String firstTime; + @Transient + @ApiParam(value = "实际发运时间") + private String actualPlanTime; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; @@ -461,6 +465,15 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("窗口领料结束时间") private String windowPickEndTime; + @Transient + @ApiParam("项目编号") + String prodCfgTypeCode; + + @Transient + @ApiParam("项目名称") + String prodCfgTypeName; + + public WmsDocMovementDetails (String custNo,String planDate,String planTime,String orderNo,String projectNo,String partNo,Integer itemStatus) { this.custNo = custNo; this.orderNo = orderNo; @@ -671,4 +684,22 @@ public WmsDocMovementDetails (String partNo,String orderNo) { } + public WmsDocMovementDetails(String erpSrcNo, String orderNo, String prodCfgTypeCode, String prodCfgTypeName, + Double qty, String planDate, String planTime, String custNo) { + this.erpSrcNo = erpSrcNo; + this.orderNo = orderNo; + this.prodCfgTypeCode = prodCfgTypeCode; + this.prodCfgTypeName = prodCfgTypeName; + this.qty = qty; + this.planDate = planDate; + this.planTime = planTime; + this.custNo = custNo; + } + + public WmsDocMovementDetails(String orderNo, Double pickQty, String prodCfgTypeCode) { + this.orderNo = orderNo; + this.pickQty = pickQty; + this.prodCfgTypeCode = prodCfgTypeCode; + } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index d82174b..f115c0a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -359,6 +359,12 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", this.modifyUser = modifyUser; } + public WmsMoveDetails(String refSrc, String prodCfgTypeCode, String createDatetime) { + this.refSrc = refSrc; + this.prodCfgTypeCode = prodCfgTypeCode; + this.createDatetime = createDatetime; + } + public Double getTransQty() { return this.transQty == null ? 0 : this.transQty.doubleValue(); }