From 34a3598508b835ac31a2ce8e42e341c1fc000ca7 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 12 May 2020 16:04:41 +0800 Subject: [PATCH 1/2] bug:8385 --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 45 +++++++++++ .../i3plus/pojo/wms/bean/WmsPartItemCheck.java | 2 +- .../wms/modelbean/WmsReportTransDetailModel.java | 91 ++++++++++++++++++++++ .../wms/modelbean/WmsReportTransMasterModel.java | 57 ++++++++++++++ .../wms/modelbean/WmsVendorDelayDetailModel.java | 74 ++++++++++++++++++ .../wms/modelbean/WmsVendorDelayMasterModel.java | 41 ++++++++++ 6 files changed, 309 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransMasterModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.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 043e753..38335fd 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 @@ -6574,4 +6574,49 @@ public class WmsEnumUtil { return valueOf(val); } } + + /** + * BatchHold 物料检测标准值 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BH_PART_CHECK_STD { + NUMBER(1, "NORMAL", "合格"), + TEXT(2, "ABNORMAL", "不合格"); + + private int value; + private String code; + private String description; + + BH_PART_CHECK_STD(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java index fce1683..a0ef402 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java @@ -62,7 +62,7 @@ public class WmsPartItemCheck extends BaseBean { @Column(name = "STANDARD") @ApiParam("标准值") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BH_PART_CHECK_STD") private Integer standard; @Column(name = "MAX") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java new file mode 100644 index 0000000..460ec08 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Entity; + +/** + * @Description : 报工事务明细表model + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-05-11 + * @Modify: + **/ +@Data +@Entity +@Api("报工事务明细表model") +public class WmsReportTransDetailModel extends BaseBean { + @ApiParam(value = "报工产线") + private String lineNo; + + @ApiParam(value = "实际报工产线") + private String reportLine; + + @ApiParam(value = "班组名称") + private String shiftNo; + + @ApiParam(value = "班组描述") + private String shiftName; + + @ApiParam(value = "报工库区") + private String zoneNo; + + @ApiParam(value = "报工库位") + private String locateNo; + + @ApiParam(value = "报工条码") + private String reportSn; + + @ApiParam(value = "零件号") + private String partNo; + + @ApiParam(value = "零件名称") + private String partName; + + @ApiParam(value = "客户代码") + private String custNo; + + @ApiParam(value = "单位") + private String unit; + + @ApiParam(value = "数量") + private Double qty; + + @ApiParam(value = "包规") + private String dateCode; + + @ApiParam(value = "供应商批次") + private Double snp; + + @ApiParam(value = "收货批次") + private String lotNo; + + // , String createUser, String createDateTime + public WmsReportTransDetailModel(String organizeCode, String lineNo, String actualReportLine, String shiftNo, String shiftName, + String zoneNo, String locateNo, String sn, String partNo, String partNameRdd, String custNo, + String unit, Double qty, String dateCode, Double snp, String lotNo) { + this.organizeCode = organizeCode; + this.lineNo = lineNo; + this.reportLine = actualReportLine; + this.shiftNo = shiftNo; + this.shiftName = shiftName; + this.zoneNo = zoneNo; + this.locateNo = locateNo; + this.reportSn = sn; + this.partNo = partNo; + this.partName = partNameRdd; + this.custNo = custNo; + this.unit = unit; + this.qty = qty; + this.dateCode = dateCode; + this.snp = snp; + this.lotNo = lotNo; + } + + public WmsReportTransDetailModel() { + + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransMasterModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransMasterModel.java new file mode 100644 index 0000000..b4a467c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransMasterModel.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Entity; + +/** + * @Description : 报工事务汇总表model + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-05-11 + * @Modify: + **/ +@Data +@Entity +@Api("报工事务汇总表model") +public class WmsReportTransMasterModel extends BaseBean { + @ApiParam(value = "实体线") + private String lineNo; + + @ApiParam(value = "班组名称") + private String shiftNo; + + @ApiParam(value = "班组描述") + private String shiftName; + + @ApiParam(value = "报工库区") + private String zoneNo; + + @ApiParam(value = "零件号") + private String partNo; + + @ApiParam(value = "零件名称") + private String partName; + + @ApiParam(value = "报工数量") + private Double qty; + + public WmsReportTransMasterModel(String organizeCode, String lineNo, String shiftNo, String shiftName, + String zoneNo, String partNo, String partNameRdd, Double qty) { + this.organizeCode = organizeCode; + this.lineNo = lineNo; + this.shiftNo = shiftNo; + this.shiftName = shiftName; + this.zoneNo = zoneNo; + this.partNo = partNo; + this.partName = partNameRdd; + this.qty = qty; + } + + public WmsReportTransMasterModel() { + + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java new file mode 100644 index 0000000..beca2d3 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java @@ -0,0 +1,74 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Entity; + +/** + * @Description : 供应商延迟到货明细表model + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-05-11 + * @Modify: + **/ +@Data +@Entity +@Api("供应商延迟到货明细表model") +public class WmsVendorDelayDetailModel extends BaseBean { + + @ApiParam(value = "单据编号") + private String orderNo; + + @ApiParam(value = "完成状态") + private Integer itemStatus; + + @ApiParam(value = "零件号") + private String partNo; + + @ApiParam(value = "零件名称") + private String partName; + + @ApiParam(value = "总数量") + private Double qty; + + @ApiParam(value = "预交日期") + private String planDate; + + @ApiParam(value = "预交时间") + private String planTime; + + @ApiParam(value = "收货日期") + private String recDate; + + @ApiParam(value = "收货时间") + private String recTime; + + @ApiParam(value = "供应商代码") + private String vendorNo; + + @ApiParam(value = "供应商名称") + private String vendorName; + + public WmsVendorDelayDetailModel(String orderNo, Integer itemStatus, String partNo, String partName, Double qty, + String planDate, String planTime, String recDate, String recTime, String vendorNo, String vendorName, String organizeCode) { + this.orderNo = orderNo; + this.itemStatus = itemStatus; + this.partNo = partNo; + this.partName = partName; + this.qty = qty; + this.planDate = planDate; + this.planTime = planTime; + this.recDate = recDate; + this.recTime = recTime; + this.vendorNo = vendorNo; + this.vendorName = vendorName; + setOrganizeCode(organizeCode); + } + + public WmsVendorDelayDetailModel() { + + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java new file mode 100644 index 0000000..d0b14b6 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Entity; + +/** + * @Description : 供应商延迟到货汇总表model + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-05-11 + * @Modify: + **/ +@Data +@Entity +@Api("供应商延迟到货汇总表model") +public class WmsVendorDelayMasterModel extends BaseBean { + + @ApiParam(value = "供应商代码") + private String vendorNo; + + @ApiParam(value = "供应商名称") + private String vendorName; + + @ApiParam(value = "延迟次数") + private Long delayCount; + + public WmsVendorDelayMasterModel(String vendorNo, String vendorName, Long count, String organizeCode) { + this.vendorNo = vendorNo; + this.vendorName = vendorName; + this.delayCount = count; + setOrganizeCode(organizeCode); + } + + public WmsVendorDelayMasterModel() { + + } +} From 5d9f37ee3388def46a5f2d1dd03ad59e6e42bb78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 12 May 2020 16:14:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=88=86=E7=BB=84=E6=9F=A5=E8=AF=A2=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E7=BB=84=E4=BB=B6SQL=20=EF=BC=9A=E5=85=BC=E5=AE=B9SQL?= =?UTF-8?q?server=E6=95=B0=E6=8D=AE=E5=BA=93=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java index d43b2d8..28efa4f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java @@ -59,6 +59,7 @@ public class WmsActionModule extends BaseBean { @AnnoOutputColumn public Integer isShowInfo; + @Column(name = "OP_TYPE_NAME", columnDefinition = "varchar(225) default ''") @ApiParam(value = "作业类型名称") public String opTypeName;