From 4d383dda1b80653c72df9985ae2acd18fde97490 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 21 Apr 2020 17:34:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=8B=E5=8A=A1?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 12 +++++++++ .../i3plus/pojo/wms/dto/VendorDelayArrivedDto.java | 19 ++++++++++++++ .../i3plus/pojo/wms/dto/VendorDelayQueryDto.java | 30 ++++++++++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayArrivedDto.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayQueryDto.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index 65e800d..44e8a69 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -138,4 +138,16 @@ public class WmsDocFgDetail extends BaseBean { @ApiParam(value = "BOM生效日期") @Column(name = "EFF_START_TIME") private String effStartTime; + + @Column(name = "SHIFT_CODE") + @ApiParam("班次代码") + private String shiftCode; + + @Column(name = "ACTUAL_REPORT_LINE") + @ApiParam("实际报工产线") + private String actualReportLine; + + @Column(name = "BATCH_NO") + @ApiParam("批号") + private String batchNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayArrivedDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayArrivedDto.java new file mode 100644 index 0000000..88f5c79 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayArrivedDto.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class VendorDelayArrivedDto { + @ApiParam(value = "供应商代码") + private String vendorNo; + + @ApiParam(value = "供应商名称") + private String vendorName; + + @ApiParam(value = "延迟次数") + private Integer delayCount; + + @ApiParam(value = "工厂代码") + private String organizeCode; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayQueryDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayQueryDto.java new file mode 100644 index 0000000..28ad833 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayQueryDto.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class VendorDelayQueryDto extends Pager { + + @ApiParam(value = "工厂代码") + private String organizeCode; + + @ApiParam(value = "供应商代码") + private String vendorNo; + + @ApiParam(value = "零件号") + private String partNo; + + @ApiParam(value = "完成状态") + private String completeStatus; + + @ApiParam(value = "单据编号") + private String orderNo; + + @ApiParam(value = "开始时间") + private String startDateTime; + + @ApiParam(value = "结束时间") + private String endDateTime; +} From 2303186fc42a132bbdd1a9b0f340afe36b2ae844 Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 22 Apr 2020 18:57:12 +0800 Subject: [PATCH 2/4] =?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 下午 From 7b2a4fdea7abc44f52e65ffb0113f8429bf4d9f5 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 22 Apr 2020 19:18:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=90=88=E5=B9=B6dev=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/dto/VendorDelayArrivedDto.java | 19 -------------- .../i3plus/pojo/wms/dto/VendorDelayQueryDto.java | 30 ---------------------- 2 files changed, 49 deletions(-) delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayArrivedDto.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayQueryDto.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayArrivedDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayArrivedDto.java deleted file mode 100644 index 88f5c79..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayArrivedDto.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.dto; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -@Data -public class VendorDelayArrivedDto { - @ApiParam(value = "供应商代码") - private String vendorNo; - - @ApiParam(value = "供应商名称") - private String vendorName; - - @ApiParam(value = "延迟次数") - private Integer delayCount; - - @ApiParam(value = "工厂代码") - private String organizeCode; -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayQueryDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayQueryDto.java deleted file mode 100644 index 28ad833..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayQueryDto.java +++ /dev/null @@ -1,30 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.dto; - -import cn.estsh.i3plus.pojo.base.common.Pager; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -@Data -public class VendorDelayQueryDto extends Pager { - - @ApiParam(value = "工厂代码") - private String organizeCode; - - @ApiParam(value = "供应商代码") - private String vendorNo; - - @ApiParam(value = "零件号") - private String partNo; - - @ApiParam(value = "完成状态") - private String completeStatus; - - @ApiParam(value = "单据编号") - private String orderNo; - - @ApiParam(value = "开始时间") - private String startDateTime; - - @ApiParam(value = "结束时间") - private String endDateTime; -} From f3e53ff1eb5575826a5fc188129c4fc5f8f28faa Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 22 Apr 2020 19:54:30 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=908150=2020011--=20=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E6=98=8E=E7=BB=86=E7=95=8C=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=AE=A2=E6=88=B7=E6=A0=87=E7=AD=BE=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E3=80=91=20=E3=80=908151=2020011--=20=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E6=98=8E=E7=BB=86=E7=95=8C=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=AE=A2=E6=88=B7=E6=A0=87=E7=AD=BE=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E9=87=8D=E6=89=93=E6=8C=89=E9=92=AE=EF=BC=8C?= =?UTF-8?q?=E8=A1=A5=E6=89=93=E5=AE=A2=E6=88=B7=E6=A0=87=E7=AD=BE=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E4=B8=89=E4=B8=AA=E6=8C=89=E9=92=AE=E7=89=9B?= =?UTF-8?q?=E5=9D=87=E6=97=A0=E6=B3=95=E6=89=93=E5=87=BA=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=8F=B7=E3=80=82=E5=85=B3=E8=81=94bug7501--?= =?UTF-8?q?-0429=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/wms/WmsMoveDetailsBySnModel.java | 28 +++++++ .../i3plus/pojo/model/wms/WmsPoSnPrintModel.java | 4 + .../java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java | 4 +- .../java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java | 97 ++++++++++++++++++++++ .../pojo/wms/bean/WmsDocMovementDetails.java | 8 ++ .../i3plus/pojo/wms/bean/WmsDocMovementSn.java | 10 ++- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 9 ++ .../pojo/wms/repository/QadBopRepository.java | 2 + .../pojo/wms/repository/SodDetRepository.java | 17 ++++ 9 files changed, 176 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsBySnModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SodDetRepository.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsBySnModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsBySnModel.java new file mode 100644 index 0000000..4d0778d --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsBySnModel.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-22 19:46 + * @Modify: + **/ +@Data +public class WmsMoveDetailsBySnModel implements Serializable { + + private static final long serialVersionUID = -3023644672955363786L; + + @ApiParam("明细数据") + private List detailsList; + + @ApiParam("分页") + private Pager pager; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsPoSnPrintModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsPoSnPrintModel.java index c198e17..44c8c9a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsPoSnPrintModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsPoSnPrintModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.wms.bean.WmsPoSn; import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -22,4 +23,7 @@ public class WmsPoSnPrintModel implements Serializable { @ApiParam("打印条码") private List wmsStockSnList; + + @ApiParam("单据条码") + private List wmsPoSnList; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java index dba988a..59f3f84 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java @@ -18,7 +18,7 @@ import javax.persistence.*; import java.io.Serializable; /** - * @Description : 包材BOM信息 + * @Description : QAD_BOP信息 * @Reference : * @Author : jimmy.zeng * @CreateDate : 2020-01-09 14:40 @@ -29,7 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name="QAD_BOP") -@Api("包材BOM信息") +@Api("QAD_BOP信息") public class QadBop implements Serializable { private static final long serialVersionUID = 4673217061075875734L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java new file mode 100644 index 0000000..e33e3c1 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java @@ -0,0 +1,97 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description : SOD_DET信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-22 16:12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="SOD_DET") +@Api("SOD_DET信息") +public class SodDet implements Serializable { + + private static final long serialVersionUID = 539607553249262854L; + + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name="ID") + @ApiParam(value = "主键",example = "0") + @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn(hidden = true) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + public Long id; + + //get单独处理 + public Long getId() { + if(id != null) { + return id.longValue(); + }else{ + return id; + } + } + + /** + * MonogoDB _id映射 + * @param id + */ + @JSONField(name="_id") + public void setId(Long id) { + this.id = id; + } + + @Column(name="COLUMN_GROUP") + @ApiParam("分组列名") + public String columnGroup; + + @Column(name="COLUMN_GROUP_VALUE") + @ApiParam("分组列名值") + public String columnGroupValue; + + @Column(name="PROPERTIES_NAME") + @ApiParam("参数名") + public String propertiesName; + + @Column(name="PROPERTIES_VALUE") + @ApiParam("参数值") + public String propertiesValue; + + @Column(name="table_name") + @ApiParam("表名") + public String tableName; + + @Transient + private String dockcode; + + @Transient + private String storagelocation; + + @Transient + private String requerimentCode; +} 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..57ebad4 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 @@ -245,6 +245,14 @@ public class WmsDocMovementDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_EXECUTE_STATUS.class, refForeignKey = "value", value = "description") private Integer executeStatus; + @Transient + @ApiParam(value = "客户发往地编号") + private String flagNo; + + @Transient + @ApiParam("执行") + private Integer isMakeUp; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 9e8d916..9bba40c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -127,7 +127,6 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam("父层级packcode对应的可回用零件号") private String parentReturnPart; - @Transient @ApiParam("打印模板") private String templateNo; @@ -136,6 +135,15 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam("剩余箱数量") private Long countBox; + @Transient + private String dockcode; + + @Transient + private String storagelocation; + + @Transient + private String requerimentCode; + public WmsDocMovementSn(){} public WmsDocMovementSn(Long countBox,String partNo) { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 917f0a0..c9fdc27 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -340,6 +340,15 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "箱数") private Long boxQtys; + @Transient + private String dockcode; + + @Transient + private String storagelocation; + + @Transient + private String requerimentCode; + public WmsStockSn() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java index f6c8ef8..c271680 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.QadBop; +import org.springframework.stereotype.Repository; /** * @Description : @@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.wms.bean.QadBop; * @CreateDate : 2020-01-09 15:06 * @Modify: **/ +@Repository public interface QadBopRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SodDetRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SodDetRepository.java new file mode 100644 index 0000000..f5cf661 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SodDetRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.QadBop; +import cn.estsh.i3plus.pojo.wms.bean.SodDet; +import org.springframework.stereotype.Repository; + +/** + * @Description : SOD_DET信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-01-09 15:06 + * @Modify: + **/ +@Repository +public interface SodDetRepository extends BaseRepository { +}