From 2303186fc42a132bbdd1a9b0f340afe36b2ae844 Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 22 Apr 2020 18:57:12 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90657=E3=80=91=E3=80=90=E4=B8=AD?= =?UTF-8?q?=E8=88=AAWMS=E7=9C=8B=E6=9D=BF=EF=BC=8D=E6=88=90=E5=93=81?= =?UTF-8?q?=E5=8F=91=E8=BF=90=E7=8E=87=E7=9C=8B=E6=9D=BF=E3=80=91=20?= =?UTF-8?q?=E3=80=90658=E3=80=91=E3=80=90=E4=B8=AD=E8=88=AAWMS=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=EF=BC=8D=E5=8F=91=E8=BF=90=E7=AA=97=E5=8F=A3=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=9C=8B=E6=9D=BF=E3=80=91=20=E3=80=90656=E3=80=91?= =?UTF-8?q?=E3=80=90=20=E4=B8=AD=E8=88=AAWMS=E7=9C=8B=E6=9D=BF=EF=BC=8D?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=AE=8C=E6=88=90=E7=8E=87=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E3=80=91=20=E3=80=90655=E3=80=91=E3=80=90=20=E4=B8=AD=E8=88=AA?= =?UTF-8?q?WMS=E7=9C=8B=E6=9D=BF=EF=BC=8D=E4=BB=93=E5=BA=93=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E7=9C=8B=E6=9D=BF=E3=80=91=20=E3=80=90654=E3=80=91?= =?UTF-8?q?=E3=80=90=E4=B8=AD=E8=88=AAWMS=E7=9C=8B=E6=9D=BF=EF=BC=8D?= =?UTF-8?q?=EF=BC=93=EF=BC=90=E5=A4=A9=E4=BE=9B=E5=BA=94=E5=95=86=E5=BB=B6?= =?UTF-8?q?=E6=9C=9F=E5=88=B0=E8=B4=A7=E8=B7=9F=E8=B8=AA=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 21 +++--- .../estsh/i3plus/pojo/wms/bean/WmsCustWindow.java | 3 + .../pojo/wms/bean/WmsDocMovementDetails.java | 15 ++++- .../i3plus/pojo/wms/dto/WmsCustWindowDto.java | 57 ++++++++++++++++ .../wms/dto/WmsMoveMovementEffectivenessDto.java | 45 +++++++++++++ .../estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java | 75 ++++++++++++++++++++++ .../pojo/wms/dto/WmsSupplierExtensionDto.java | 35 ++++++++++ .../pojo/wms/dto/WmsWarehouseWarningDto.java | 62 ++++++++++++++++++ .../pojo/wms/modelbean/WmsTmsShippingExtModel.java | 2 +- 9 files changed, 302 insertions(+), 13 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCustWindowDto.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsMoveMovementEffectivenessDto.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsWarehouseWarningDto.java 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 cf7ca41..1b3c5ae 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 @@ -304,6 +304,7 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_DETAILS_STATUS { CREATE(10, "CREATE", "创建"), + PROCESSING(50, "PROCESSING", "发运中"), RECEIPTED(20, "FINISHED", "已完成"), CANCEL(30, "CANCLE", "行取消"), PRINTED(40, "PRINTED", "已打印"); @@ -6095,16 +6096,16 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WEEK_TYPE { - MONDAY(10, "星期一"), - TUESDAY(20, "星期二"), - WEDNESDAY(30, "星期三"), - THURSDAY(40, "星期四"), - FRIDAY(50, "星期五"), - SATURDAY(60, "星期六"), - SUNDAY(70, "星期七"); - - private int value; - private String description; + MONDAY(20, "星期一"), + TUESDAY(30, "星期二"), + WEDNESDAY(40, "星期三"), + THURSDAY(50, "星期四"), + FRIDAY(60, "星期五"), + SATURDAY(70, "星期六"), + SUNDAY(10, "星期日"); + + private final int value; + private final String description; WEEK_TYPE(int value, String description) { this.value = value; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java index 65a6608..f250b58 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -38,6 +40,7 @@ public class WmsCustWindow extends BaseBean { private String custWindowTime; @Column(name = "WEEKS") + @AnnoOutputColumn(refClass = WmsEnumUtil.WEEK_TYPE.class, refForeignKey = "value", value = "description") @ApiParam(value = "星期") private String weeks; 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 0b173cb..5458927 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 @@ -11,8 +11,12 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; -import java.util.Objects; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; +import javax.persistence.Version; /** * @Description :移库单明细实体(用于转储类业务) @@ -108,6 +112,13 @@ public class WmsDocMovementDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") private Integer itemStatus; + + /** + * 已创建，已收货，已发运，已拣货 + */ + @Transient + @ApiParam(value = "状态中文") + private String itemStatusStr; /** * 是否免费:0=计费,1=免费 */ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCustWindowDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCustWindowDto.java new file mode 100644 index 0000000..f26fe08 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCustWindowDto.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +/** + * @Description :窗口输出类 + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-21 2:37 下午 + * @Modify: + **/ +@Entity +@Data +@Api("窗口输出类") +public class WmsCustWindowDto { + + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name = "ID") + @ApiParam(value = "主键", example = "0") + public Long id; + + + @ApiParam(value = "窗口时间") + private String custWindowTime; + + @ApiParam(value = "星期一客户") + private String mondayCust; + + @ApiParam(value = "星期二客户") + private String tuesdayCust; + + @ApiParam(value = "星期三客户") + private String wednesdayCust; + + @ApiParam(value = "星期四客户") + private String thursdayCust; + + @ApiParam(value = "星期五客户") + private String fridayCust; + + @ApiParam(value = "星期六客户") + private String saturdayCust; + + @ApiParam(value = "星期日客户") + private String sundayCust; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsMoveMovementEffectivenessDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsMoveMovementEffectivenessDto.java new file mode 100644 index 0000000..479bc1f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsMoveMovementEffectivenessDto.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +/** + * @Description :移动单效率(出参) + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-10 3:21 下午 + * @Modify: + **/ +@Data +@Entity +@Api("移动单效率(出参)") +public class WmsMoveMovementEffectivenessDto { + + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name = "ID") + @ApiParam(value = "主键", example = "0") + public Long id; + + @ApiParam(value = "日期") + private String date; + + @ApiParam(value = "比列") + private Double percentage; + + public WmsMoveMovementEffectivenessDto(String date, Double percentage) { + this.date = date; + this.percentage = percentage; + } + + public WmsMoveMovementEffectivenessDto() { + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java new file mode 100644 index 0000000..ffaf492 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +/** + * @Description :装车单打印输出model(出参) + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-10 3:21 下午 + * @Modify: + **/ +@Data +@Entity +@Api("静态盘点查询输出实体类") +public class WmsStockSnDto { + + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name = "ID") + @ApiParam(value = "主键", example = "0") + public Long id; + + @ApiParam(value = "库位") + private String locateNo; + @ApiParam(value = "物料号") + private String partNo; + @ApiParam(value = "物料名称") + private String partNameRdd; + @ApiParam(value = "数量") + private Double qty; + @ApiParam(value = "生产批次") + private String dateCode; + + @ApiParam(value = "规格") + private String partSpec; + + @ApiParam(value = "存储区") + private String zoneNo; + + public WmsStockSnDto(String locateNo, String partNo, String partNameRdd, Double qty, String dateCode) { + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.dateCode = dateCode; + } + + public WmsStockSnDto(String locateNo, String partNo, String partNameRdd, Double qty, String dateCode, String partSpec) { + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.dateCode = dateCode; + this.partSpec = partSpec; + } + + public WmsStockSnDto(String locateNo, String partNo, String partNameRdd, Double qty, String dateCode, String partSpec, String zoneNo) { + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.dateCode = dateCode; + this.partSpec = partSpec; + this.zoneNo = zoneNo; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java new file mode 100644 index 0000000..680c401 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description :供应商延期输出实体类(出参) + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-10 3:21 下午 + * @Modify: + **/ +@Data +@Api("供应商延期输出实体类") +public class WmsSupplierExtensionDto { + + @ApiParam(value = "序号") + private Integer rn; + + @ApiParam(value = "供应商编号") + private String vendorNo; + + @ApiParam(value = "数量") + private Integer num; + + public WmsSupplierExtensionDto() { + + } + + public WmsSupplierExtensionDto(String vendorNo, Integer num) { + this.vendorNo = vendorNo; + this.num = num; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsWarehouseWarningDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsWarehouseWarningDto.java new file mode 100644 index 0000000..d025df0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsWarehouseWarningDto.java @@ -0,0 +1,62 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 中航WMS看板－仓库预警看板(出参) + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-10 3:21 下午 + * @Modify: + **/ +@Data +@Api("中航WMS看板－仓库预警看板(出参)") +public class WmsWarehouseWarningDto { + + @ApiParam(value = "零件号") + private String partNo; + + @ApiParam(value = "存储区") + private String zoneNo; + + @ApiParam(value = "零件号名称") + private String partNameRdd; + + @ApiParam(value = "库存") + private Double qty; + + @ApiParam(value = "最大库存") + private Double maxqty; + + @ApiParam(value = "最小库存") + private Double minqty; + + @ApiParam(value = "库存状态") + private String stockStatus; + + @ApiParam(value = "库位") + private String locateNo; + + @ApiParam(value = "颜色") + private String color; + + public WmsWarehouseWarningDto(String partNo, String zoneNo, String partNameRdd, Double qty, Double maxqty, + Double minqty, String stockStatus, String locateNo, String color) { + this.partNo = partNo; + this.zoneNo = zoneNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.maxqty = maxqty; + this.minqty = minqty; + this.stockStatus = stockStatus; + this.locateNo = locateNo; + this.color = color; + } + + public WmsWarehouseWarningDto() { + + } + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java index 7ab26ec..e1103b4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java @@ -10,7 +10,7 @@ import java.util.ArrayList; import java.util.List; /** - * @Description :装车单打印输出model + * @Description :装车单打印输出model(出参) * @Reference : * @Author :QianHuaSheng * @CreateDate : 2020-04-10 3:21 下午