From b7c61893085e4d985a0019431fa1640b365b88eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 19 Nov 2019 12:38:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=B1=87=E6=8A=A5JOB?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=88=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E5=B1=9E=E6=80=A7=E5=80=BC=E5=B0=86=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E9=9B=86=E5=90=88=E8=BF=9B=E8=A1=8C=E5=88=86=E7=BB=84?= =?UTF-8?q?=E7=9A=84=E5=85=AC=E5=85=B1=E6=96=B9=E6=B3=95=EF=BC=89+?= =?UTF-8?q?=E6=A0=87=E5=87=86=E6=94=B6=E8=B4=A7=E9=80=9F=E5=BA=A6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8830%=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/model/wms/TransSnModle.java | 4 ++ .../pojo/wms/bean/WmsDocMovementDetails.java | 44 +++++++++++++++------- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java index c23700e..dae7847 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.wms.bean.WmsPart; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -41,4 +42,7 @@ public class TransSnModle extends BaseComponetsParam implements Serializable { * 供应商批次 */ public String dateCode; + + @ApiParam(value = "物料信息") + public WmsPart wmsPart; } 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 d204e7e..591b77b 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 @@ -104,7 +104,7 @@ public class WmsDocMovementDetails extends BaseBean { */ @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") private Integer itemStatus; /** @@ -112,7 +112,7 @@ public class WmsDocMovementDetails extends BaseBean { */ @Column(name = "IS_FREE") @ApiParam(value = "是否免费", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") public Integer isFree; @Column(name = "REMARK") @@ -176,25 +176,25 @@ public class WmsDocMovementDetails extends BaseBean { public Double inputMoveQty; @Transient - @ApiParam(value ="标准包装",example = "1") + @ApiParam(value = "标准包装", example = "1") private Double snp; @Transient - @ApiParam(value ="条码总数量",example = "1") + @ApiParam(value = "条码总数量", example = "1") private Double detailsSnCount; @Transient - @ApiParam(value ="余数",example = "1") + @ApiParam(value = "余数", example = "1") private Double restQty; @Transient @ApiParam("任务状态") - @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description") private Integer isTask; @Transient @ApiParam("主表单据状态") - @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") private Integer orderMasterStatus; @Transient @@ -206,17 +206,33 @@ public class WmsDocMovementDetails extends BaseBean { return recommondLot == null ? "无" : this.recommondLot; } - public Double getQty() {return qty == null ? 0D : this.qty.doubleValue(); } + public Double getQty() { + return qty == null ? 0D : this.qty.doubleValue(); + } + + public Double getOutQty() { + return outQty == null ? 0D : this.outQty.doubleValue(); + } - public Double getOutQty() {return outQty == null ? 0D : this.outQty.doubleValue(); } + public Double getPickQty() { + return pickQty == null ? 0D : this.pickQty.doubleValue(); + } - public Double getPickQty() {return pickQty == null ? 0D : this.pickQty.doubleValue(); } + public Double getActualQty() { + return actualQty == null ? 0D : this.actualQty.doubleValue(); + } - public Double getActualQty() {return actualQty == null ? 0D : this.actualQty.doubleValue(); } + public Double getRecQty() { + return recQty == null ? 0D : this.recQty.doubleValue(); + } - public Integer getIsTaskVal() {return isTask == null ? 0 : this.isTask.intValue();} + public Integer getIsTaskVal() { + return isTask == null ? 0 : this.isTask.intValue(); + } - public Integer getOrderMasterStatus() { return orderMasterStatus== null ? 0 : this.orderMasterStatus.intValue(); } + public Integer getOrderMasterStatus() { + return orderMasterStatus == null ? 0 : this.orderMasterStatus.intValue(); + } @Version @Column(name = "LOCK_VERSION") @@ -229,7 +245,7 @@ public class WmsDocMovementDetails extends BaseBean { @Transient @ApiParam("业务类型") - @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") public Integer busiType; @Column(name = "IS_SN") From 41a48b4b59ae818297a581569e4ad338ddb6ede4 Mon Sep 17 00:00:00 2001 From: 1111 Date: Tue, 19 Nov 2019 13:22:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E9=87=87=E8=B4=AD=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E3=80=91=20=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 +++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) 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 0f8069f..992e672 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 @@ -2808,7 +2808,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_PART_TYPE { - RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"); + RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"), CONTAINER_PRODUCT(40, "容器"); private int value; private String description; @@ -2848,8 +2848,9 @@ public class WmsEnumUtil { } + public enum WMS_PART_TYPE_STR { - RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"); + RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"),CONTAINER_PRODUCT("40", "容器"); private String value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java index c39a72c..3bef737 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java @@ -47,7 +47,7 @@ public class WmsPackageSpec extends BaseBean { @Column(name = "SPEC_LEVEL") @ApiParam(value = "规格层级") - private String specLevel; + private Integer specLevel; @Column(name = "IS_MIXED") @ApiParam(value = "是否混包") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 0c9c9bf..8318e95 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -137,6 +137,10 @@ public class WmsPoSn extends BaseBean { @ApiParam(value = "最晚收货时间") public String latestReceTime; + @Column(name = "FIX_LOT_NO", nullable = false) + @ApiParam(value = "特殊批次") + private String fixLotNo = ""; + public WmsPoSn(){} public WmsPoSn(String orderNo,String earliestReceTime,String latestReceTime){