From 8d6ffbb012386f10708b9c95ef0b2f41215640ea Mon Sep 17 00:00:00 2001 From: qianhs Date: Tue, 12 May 2020 10:39:58 +0800 Subject: [PATCH 01/12] bug:8268;8267;8266;8265 --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 +-- 1 file changed, 1 insertion(+), 2 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 0323dbd..043e753 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 @@ -3576,8 +3576,7 @@ public class WmsEnumUtil { public enum WMS_STOCK_TYPE { SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"), - CUST_SN(30, "客户条码"), - FIRST_MIDDLE_LAST(40, "首中末件"); + CUST_SN(30, "客户条码"); private int value; private String description; From 34a3598508b835ac31a2ce8e42e341c1fc000ca7 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 12 May 2020 16:04:41 +0800 Subject: [PATCH 02/12] 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 03/12] =?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; From e8dd3ab12f16ca33d9a7d066013815978e8a1346 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 13 May 2020 09:00:04 +0800 Subject: [PATCH 04/12] =?UTF-8?q?8481=20=E5=9F=BA=E7=A1=80=E6=95=B0?= =?UTF-8?q?=E6=8D=AE-=E5=BA=93=E4=BD=8D-=E5=AF=BC=E5=85=A5=E3=80=82?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8A=A5=E9=94=99,=E6=8F=90=E7=A4=BAcn.estsh?= =?UTF-8?q?.i3plus.pojo.base.enumutil.WmsEnumUtil$LOCATE=5FTYPE.descriptio?= =?UTF-8?q?nOfValue(java.lang.String)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 14 +- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 181 +++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsStockInitialize.java | 6 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 18 +- .../i3plus/pojo/wms/bean/WmsTestResultSummary.java | 2 + 5 files changed, 215 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 01ad320..f7847e2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -2212,6 +2212,16 @@ public class CommonEnumUtil { return tmp; } + public static int descriptionOfValue(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + public static FIELD_TYPE codeOf(Integer value) { for (int i = 0; i < values().length; i++) { if (values()[i].value == value) { @@ -2325,7 +2335,7 @@ public class CommonEnumUtil { return tmp; } - public static Integer valueOfDescription(String desc) { + public static Integer descriptionOfValue(String desc) { Integer tmp = 1; for (int i = 0; i < values().length; i++) { if (values()[i].description.equals(desc)) { @@ -2391,7 +2401,7 @@ public class CommonEnumUtil { } - public static Integer valueOfDescription(String desc) { + public static Integer descriptionOfValue(String desc) { Integer tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].description.equals(desc)) { 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..50366a9 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 @@ -538,6 +538,14 @@ public class WmsEnumUtil { return code; } + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + public static String valueOf(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -1085,6 +1093,10 @@ public class WmsEnumUtil { return valueOf(val); } + public static Integer descriptionOfValue(String desc) { + return descOf(desc); + } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { @@ -1250,6 +1262,9 @@ public class WmsEnumUtil { return tmp; } + public static Integer descriptionOfValue(String desc) { + return descOf(desc); + } public static String valueOfDescription(int val) { return valueOf(val); } @@ -3325,6 +3340,17 @@ public class WmsEnumUtil { } return tmp; } + + + public static String descriptionOfValue(String desc) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -4801,6 +4827,17 @@ public class WmsEnumUtil { } return tmp; } + + public static int descriptionOfValue(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } /** @@ -6574,4 +6611,148 @@ public class WmsEnumUtil { return valueOf(val); } } + + + /** + * BH检测结果类型 RepairOrPick + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BH_TEST_RESULT_TYPE { + PICK(10, "NORMAL", "挑选"), REPAIR(20, "ABNORMAL", "返修"); + private int value; + private String code; + private String description; + + BH_TEST_RESULT_TYPE(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); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static BH_TEST_RESULT_TYPE codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } + + + /** + * BH检测结果 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BH_TEST_RESULT_STATUS { + NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"); + private int value; + private String code; + private String description; + + BH_TEST_RESULT_STATUS(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); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static BH_TEST_RESULT_STATUS codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java index 515de40..d2ea6db 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java @@ -2,7 +2,7 @@ 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.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -89,7 +89,7 @@ public class WmsStockInitialize extends BaseBean { @Column(name = "QC_STATUS") @ApiParam(value = "质检状态", example = "0") @ColumnDefault("10") - @AnnoOutputColumn(refClass = CommonEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description", required = false) + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description", required = false) private Integer qcStatus; /** @@ -98,7 +98,7 @@ public class WmsStockInitialize extends BaseBean { @Column(name = "SN_STATUS") @ApiParam(value = "条码状态", example = "0") @ColumnDefault("30") - @AnnoOutputColumn(refClass = CommonEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description", required = false) + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description", required = false) private Integer snStatus; @Column(name = "USE_COUNT", nullable = true) 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 a0d1272..3be68de 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 @@ -14,7 +14,11 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.Date; import java.util.List; @@ -212,6 +216,18 @@ public class WmsStockSn extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WMS_STOCK_TYPE") private Integer snType = 10; + @Column(name = "USE_COUNT") + @ApiParam(value = "领用次数", example = "0") + @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer useCount; + + @Column(name = "SEQ_NO") + @ApiParam(value = "序号", example = "0") + @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer seqNo; + @ApiParam(value = "仓库名称") @Transient public String whNameRdd; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java index e564dc9..3ff22dd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java @@ -65,6 +65,7 @@ public class WmsTestResultSummary extends BaseBean { @Column(name = "REWORK_RESULT") @ApiParam("返修结果") + @AnnoOutputColumn(refClass = WmsEnumUtil.BH_TEST_RESULT_STATUS.class, refForeignKey = "value", value = "description") public Integer reworkResult; @Column(name = "PICK_STATUS") @@ -74,6 +75,7 @@ public class WmsTestResultSummary extends BaseBean { @Column(name = "PICK_RESULT") @ApiParam("挑选结果") + @AnnoOutputColumn(refClass = WmsEnumUtil.BH_TEST_RESULT_STATUS.class, refForeignKey = "value", value = "description") public Integer pickResult; } From c4510fb121e4727bc4e300c822f80c4cf9a86869 Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Wed, 13 May 2020 11:56:27 +0800 Subject: [PATCH 05/12] =?UTF-8?q?BUG=20#8485,=E4=BF=AE=E5=A4=8D=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90-=E6=9F=A5=E8=AF=A2=E5=90=AF?= =?UTF-8?q?=E7=94=A8=E7=A6=81=E7=94=A8=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 8 ++++++++ .../java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java | 16 ++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 7 ++++++- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index e85f93d..f51ab6a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -141,6 +141,14 @@ public abstract class BaseBean implements Serializable { //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc public transient Integer ascOrDesc = 1; + public int getIsValidVal() { + return this.isValid == null ? 0 : this.isValid.intValue(); + } + + public int getIsDeletedVal() { + return this.isDeleted == null ? 0 : this.isDeleted.intValue(); + } + //排序方式 public String orderBy(){ String result = ""; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java index c397de1..0abeacf 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java @@ -68,6 +68,22 @@ public class DdlPackBean { return result; } + /** + * 查询指定组织、指定是否有效的数据 + * @param organizeCode + * @param isValid + * @return + */ + public static DdlPackBean getDdlPackBean(String organizeCode, int isValid){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + DdlPreparedPack.getNumEqualPack(isValid,"isValid",result); + DdlPreparedPack.getNumEqualPack(organizeCode,"organizeCode",result); + + return result; + } + public static DdlPackBean getDdlPackBean(){ DdlPackBean result = new DdlPackBean(); diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index de193d7..de26317 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2700,7 +2700,12 @@ public class MesHqlPack { } public static DdlPackBean getDataAuthCondition(MesDataAuth dataAuth, String organizeCode) { - DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPackBean packBean; + if(dataAuth.getIsValidVal() == 0) { + packBean = DdlPackBean.getDdlPackBean(organizeCode); + } else { + packBean = DdlPackBean.getDdlPackBean(organizeCode, dataAuth.getIsValidVal()); + } if (!StringUtils.isEmpty(dataAuth.getDataObject())) { DdlPreparedPack.getStringLikerPack(dataAuth.getDataObject(), "dataObject", packBean); } From 6b9b2e8dd2f6c5a3f4266a60d34a5973cc97192c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 13 May 2020 13:22:55 +0800 Subject: [PATCH 06/12] =?UTF-8?q?BUG#8438=E3=80=9020011--=20=E5=85=AD?= =?UTF-8?q?=E5=90=88=E4=B8=80=E6=94=B9=E6=95=B0=E6=8C=89=E9=92=AE=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E9=94=99=E8=AF=AF=EF=BC=8C=E6=89=93=E5=BC=80=E6=94=B9?= =?UTF-8?q?=E6=95=B0=E6=8C=89=E9=92=AE=E6=97=B6=EF=BC=8C=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=90=8E=E6=95=B0=E9=87=8F=E4=BC=9A=E7=B4=AF?= =?UTF-8?q?=E5=8A=A0=E5=9C=A8=E4=B8=8B=E6=96=B9=E6=98=8E=E7=BB=86=E4=B8=AD?= =?UTF-8?q?=E5=B9=B6=E4=B8=94=E8=AE=A9=E7=94=A8=E6=88=B7=E5=86=8D=E6=AC=A1?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=95=B0=E9=87=8F--0515=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 edc5ba7..aa23984 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 @@ -1093,7 +1093,7 @@ public class WmsEnumUtil { return valueOf(val); } - public static Integer descriptionOfValue(String desc) { + public static int descriptionOfValue(String desc) { return descOf(desc); } @@ -1262,7 +1262,7 @@ public class WmsEnumUtil { return tmp; } - public static Integer descriptionOfValue(String desc) { + public static int descriptionOfValue(String desc) { return descOf(desc); } public static String valueOfDescription(int val) { From a4551a746a0bdb9b91276d506203d59b5a1e0c1c Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 13 May 2020 14:42:34 +0800 Subject: [PATCH 07/12] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?DdlPackBean=E6=9F=A5=E8=AF=A2=20->=20=E5=B7=A5=E5=8E=82?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=8F=AF=E4=BB=A5=E6=98=AF=E8=8B=B1=E6=96=87?= =?UTF-8?q?=E6=88=96=E4=B8=AD=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java index 0abeacf..8cc0971 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java @@ -63,7 +63,7 @@ public class DdlPackBean { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result); - DdlPreparedPack.getNumEqualPack(organizeCode,"organizeCode",result); + DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result); return result; } @@ -79,7 +79,7 @@ public class DdlPackBean { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); DdlPreparedPack.getNumEqualPack(isValid,"isValid",result); - DdlPreparedPack.getNumEqualPack(organizeCode,"organizeCode",result); + DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result); return result; } From f1d14c9e3a2b3bba6e226572445c0f20cac26d2b Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 13 May 2020 14:49:12 +0800 Subject: [PATCH 08/12] =?UTF-8?q?bug:=E3=80=908385=E3=80=91-=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5=E4=BA=8B=E5=8A=A1=E6=9F=A5=E8=AF=A2=E8=81=94=E8=B0=83?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java | 9 ++++++++- .../i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java | 11 +++++++++-- .../i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java | 11 +++++++++-- 3 files changed, 26 insertions(+), 5 deletions(-) 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 index 460ec08..2b2fed2 100644 --- 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 @@ -63,10 +63,16 @@ public class WmsReportTransDetailModel extends BaseBean { @ApiParam(value = "收货批次") private String lotNo; + @ApiParam(value = "查询开始时间") + private String startDateTime; + + @ApiParam(value = "查询结束时间") + private String endDateTime; + // , 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) { + String unit, Double qty, String dateCode, Double snp, String lotNo, String createDateTime) { this.organizeCode = organizeCode; this.lineNo = lineNo; this.reportLine = actualReportLine; @@ -83,6 +89,7 @@ public class WmsReportTransDetailModel extends BaseBean { this.dateCode = dateCode; this.snp = snp; this.lotNo = lotNo; + this.createDatetime = createDateTime; } public WmsReportTransDetailModel() { 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 index beca2d3..915567e 100644 --- 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 @@ -52,8 +52,14 @@ public class WmsVendorDelayDetailModel extends BaseBean { @ApiParam(value = "供应商名称") private String vendorName; + @ApiParam(value = "查询开始时间") + private String startDateTime; + + @ApiParam(value = "查询结束时间") + private String endDateTime; + 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) { + String planDate, String planTime, String recDate, String recTime, String vendorNo, String vendorName, String organizeCode, String createDateTime) { this.orderNo = orderNo; this.itemStatus = itemStatus; this.partNo = partNo; @@ -65,7 +71,8 @@ public class WmsVendorDelayDetailModel extends BaseBean { this.recTime = recTime; this.vendorNo = vendorNo; this.vendorName = vendorName; - setOrganizeCode(organizeCode); + this.organizeCode = organizeCode; + this.createDatetime = createDateTime; } 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 index d0b14b6..3166ac2 100644 --- 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 @@ -28,11 +28,18 @@ public class WmsVendorDelayMasterModel extends BaseBean { @ApiParam(value = "延迟次数") private Long delayCount; - public WmsVendorDelayMasterModel(String vendorNo, String vendorName, Long count, String organizeCode) { + @ApiParam(value = "查询开始时间") + private String startDateTime; + + @ApiParam(value = "查询结束时间") + private String endDateTime; + + public WmsVendorDelayMasterModel(String vendorNo, String vendorName, Long count, String organizeCode, String createDateTime) { this.vendorNo = vendorNo; this.vendorName = vendorName; this.delayCount = count; - setOrganizeCode(organizeCode); + this.organizeCode = organizeCode; + this.createDatetime = createDateTime; } public WmsVendorDelayMasterModel() { From 7778ce1afdbc5741c16c96429fc9c392aa071dbf Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 13 May 2020 20:16:50 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E7=B1=BB=E5=BA=8F=E5=88=97=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java | 1 + .../cn/estsh/i3plus/pojo/model/mes/ImportErrorModel.java | 1 + .../cn/estsh/i3plus/pojo/model/wms/ExcelImportModel.java | 1 + .../estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java | 1 + .../cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java | 1 + .../estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java | 1 + .../estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java | 1 + .../estsh/i3plus/pojo/wms/bean/WmsCustomerPartShipping.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java | 1 + .../cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java | 1 + .../i3plus/pojo/wms/bean/WmsProcurementPlanContract.java | 1 + .../estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java | 1 + .../cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java | 1 + .../cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java | 1 + .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java | 1 + .../cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPlanner.java | 1 + .../cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java | 1 + .../i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java | 2 +- .../java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java | 1 + .../cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java | 1 + .../i3plus/pojo/wms/engine/rule/EngineRulePersistence.java | 1 + .../pojo/wms/engine/script/EngineScriptPersistence.java | 12 ++++++------ .../wms/engine/script/EngineScriptPersistenceHistory.java | 1 + .../estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java | 1 + .../cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java | 1 + .../pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java | 1 + .../cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java | 2 +- .../estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java | 1 + .../i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java | 1 + .../i3plus/pojo/wms/modelbean/WmsReportTransMasterModel.java | 1 + .../cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java | 4 +++- .../i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java | 1 + .../i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java | 1 + 47 files changed, 55 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java index e0de0f3..f355ca3 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java @@ -21,6 +21,7 @@ import java.util.List; @Api("mes导入结果model") public class ExcelImportModel implements Serializable { + private static final long serialVersionUID = 3075276018074690913L; @ApiParam("结果") private boolean result; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ImportErrorModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ImportErrorModel.java index 85c63bd..c644a49 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ImportErrorModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ImportErrorModel.java @@ -20,6 +20,7 @@ import java.io.Serializable; @Api("mes导入异常结果model") public class ImportErrorModel implements Serializable { + private static final long serialVersionUID = 1212013821950324792L; @ApiParam("错误的行号") private int rowNum; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ExcelImportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ExcelImportModel.java index 609e87b..a8eb1fd 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ExcelImportModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ExcelImportModel.java @@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap; @Api("导入结果model") public class ExcelImportModel implements Serializable { + private static final long serialVersionUID = 1444427447244864339L; @ApiParam("结果") private boolean result; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java index 5940720..e4212d3 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java @@ -7,6 +7,7 @@ import java.io.Serializable; @Data public class WmsCSOrderDetailsModel implements Serializable { + private static final long serialVersionUID = 1035157716685531017L; @ApiParam("工厂代码") public String organizeCode; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java index 1ae6931..8dc8eed 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java @@ -19,6 +19,7 @@ import java.util.List; @Api("WMS列表菜单model") public class WmsListElementModel extends BaseBean { + private static final long serialVersionUID = -4040701771244617270L; @ApiParam(value = "功能菜单ID") private Long functionId; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java index 185bfe5..8183d1b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java @@ -19,6 +19,7 @@ import java.util.List; @Api("WMS列表搜索model") public class WmsSearchElementModel extends BaseBean { + private static final long serialVersionUID = -5429148439603308698L; @ApiParam(value = "功能菜单ID") private Long functionId; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java index 6be1fbb..6a4eee3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api("BH子检测项") public class WmsBhChildDetectionItem extends BaseBean { + private static final long serialVersionUID = -8005468634643773682L; @Column(name = "CHECK_TYPE") @ApiParam("检测大类") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java index 205c3d5..88525bb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java @@ -34,6 +34,7 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Api(value = "bom历史记录", description = "bom历史记录") public class WmsBomHistory extends BaseBean { + private static final long serialVersionUID = -2781401699752981565L; @Column(name = "PART_NO") @ApiParam(value = "父物料号") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java index f32d795..fa3d7d1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java @@ -31,6 +31,7 @@ import javax.persistence.Table; @Api("车辆信息") public class WmsCar extends BaseBean { + private static final long serialVersionUID = -905792638347428695L; @Column(name = "CAR_NO") @ApiParam(value = "车牌号") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) 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 90d32ae..95e581d 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 @@ -31,6 +31,7 @@ import javax.persistence.Table; @Api(value="客户窗口时间",description = "客户窗口时间") public class WmsCustWindow extends BaseBean { + private static final long serialVersionUID = -6544671103929721988L; @Column(name = "CUST_NO") @ApiParam(value = "客户编码") private String custNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPartShipping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPartShipping.java index 711858f..a071ed1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPartShipping.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPartShipping.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="客户物料发往地",description = "客户物料发往地") public class WmsCustomerPartShipping extends BaseBean { + private static final long serialVersionUID = 9091356911517332847L; @Column(name = "CUSTOMER_CODE") @ApiParam(value = "客户代码") private String customerCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java index 4686917..f48da84 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Table(name="WMS_DOCK") @Api("道口预约信息") public class WmsDock extends BaseBean { + private static final long serialVersionUID = 1084849307899138229L; @Column(name="DOCK_CODE") @ApiParam("道口代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java index f243e07..d8dd810 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java @@ -31,6 +31,7 @@ import javax.persistence.Transient; @Api("道口预约信息") public class WmsDockOrderInfo extends BaseBean { + private static final long serialVersionUID = -18500387985953214L; @Column(name="DOCK_CODE") @ApiParam("道口代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java index acdd899..4ccaabf 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api("道口窗口时间") public class WmsDockWindowTime extends BaseBean { + private static final long serialVersionUID = -3188113111546998811L; @Column(name="DOCK_CODE") @ApiParam("道口代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java index d96f8c2..2747b2b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api("物料检测大类") public class WmsPartCheckType extends BaseBean { + private static final long serialVersionUID = -5189386821943180930L; @Column(name = "WORK_CENTER_CODE") @ApiParam("产线代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java index 75d3389..aa6cdcf 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java @@ -33,6 +33,7 @@ import javax.persistence.Table; @Api("物料扩展属性表") public class WmsPartExtend extends BaseBean { + private static final long serialVersionUID = 353287580297379377L; @Column(name = "PART_NO") @ApiParam(value = "物料编码") private String partNo; 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 a0ef402..35dfe84 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 @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api("物料子检测项") public class WmsPartItemCheck extends BaseBean { + private static final long serialVersionUID = 2889708862689686630L; @Column(name = "WORK_CENTER_CODE") @ApiParam("产线代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java index 1d29b77..1a083df 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="物料关系表",description = "物料关系表") public class WmsPartRelation extends BaseBean { + private static final long serialVersionUID = -3532040201124896970L; @Column(name = "PART_NO") @ApiParam(value = "物料编码") private String partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProcurementPlanContract.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProcurementPlanContract.java index 34ecff1..e7c329b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProcurementPlanContract.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProcurementPlanContract.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("开口合同PO关系表") public class WmsProcurementPlanContract extends BaseBean { + private static final long serialVersionUID = 3966394697226562966L; @Column(name = "ORDER_NO") @ApiParam(value = "合同号") private String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java index f6db3d7..e415a70 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -20,6 +19,7 @@ import java.io.Serializable; @Api(value="生产退料导入模板",description = "生产退料导入模板") public class WmsProductReturnMovement implements Serializable{ + private static final long serialVersionUID = -4099139082544312496L; @ApiParam(value = "单号") @AnnoOutputColumn private String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java index 52d22b3..ed602bf 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Table(name = "WMS_PULL_RULE") @Api("拉动规则") public class WmsPullRule extends BaseBean { + private static final long serialVersionUID = -4259512587710548316L; @Column(name = "PULL_WAY") @ApiParam(value = "拉动类型", example = "10") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PULL_WAY_STATUS") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java index 094e240..0ef223b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java @@ -33,6 +33,7 @@ import javax.persistence.Table; @Api(value="条码操作记录表",description = "条码操作记录表") public class WmsSnOperateRecord extends BaseBean { + private static final long serialVersionUID = -8163029081131228416L; @Column(name = "SN") @ApiParam(value = "条码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java index d2ea6db..b63ebca 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java @@ -32,6 +32,7 @@ import javax.persistence.Table; @Api("库存初始化信息") public class WmsStockInitialize extends BaseBean { + private static final long serialVersionUID = -6653811290493674698L; @Column(name = "WH_NO") @ApiParam(value = "仓库代码") @AnnoOutputColumn(required = false) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java index 1bab8d2..dfe3b86 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java @@ -33,6 +33,7 @@ import javax.persistence.Table; @Api("替代料") public class WmsSubPart extends BaseBean { + private static final long serialVersionUID = -8864784324056827764L; @Column(name = "PART_NO") @ApiParam(value = "物料编码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java index 9e6d386..ffbfba7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java @@ -31,6 +31,7 @@ import javax.persistence.Table; @Api("驾驶员信息") public class WmsTmsDriver extends BaseBean { + private static final long serialVersionUID = 2083909056682628791L; @Column(name="DRIVER_NO") @ApiParam(value ="驾驶员编号") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java index bf0c626..befe9e5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java @@ -32,6 +32,7 @@ import java.util.List; @Api("装车单信息") public class WmsTmsShippingExt extends BaseBean { + private static final long serialVersionUID = -3261413137866351406L; @Column(name="MOVE_NO") @ApiParam(value ="移库单号") private String moveNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPlanner.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPlanner.java index 7b1e347..ee0536c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPlanner.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPlanner.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="供应商计划员",description = "供应商计划员") public class WmsVendorPlanner extends BaseBean { + private static final long serialVersionUID = 6444925010696953067L; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编号") private String vendorNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java index 3b3bc84..fa72ef5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="供应商父子关系",description = "供应商父子关系") public class WmsVendorRelation extends BaseBean { + private static final long serialVersionUID = 723387673958938803L; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编号") private String vendorNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java index bc65739..4902c6a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="供应商窗口时间",description = "供应商窗口时间") public class WmsVendorWindow extends BaseBean { + private static final long serialVersionUID = -8156667748890281030L; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编号") private String vendorNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index 2e3cffa..48203e8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; @@ -26,6 +27,7 @@ import javax.persistence.Table; @Table(name = "WMS_INTERFACE_DATA_MAPPER") @Api("接口数据映射") public class WmsInterfaceDataMapper extends BaseBean { + private static final long serialVersionUID = 4139044040492108498L; /** * 排序编号 */ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java index 49d975d..3b0840c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java @@ -4,12 +4,12 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import javax.persistence.Column; -import javax.persistence.Transient; import java.io.Serializable; @Data public class WmsCarDto extends BaseDto implements Serializable { + private static final long serialVersionUID = 1477585131669086208L; @Column(name="CAR_NO") @ApiParam(value ="车牌号") private String carNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java index ad84be5..47c76ff 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java @@ -16,6 +16,7 @@ import java.io.Serializable; @Data public class WmsTmsDriverDto extends BaseDto implements Serializable { + private static final long serialVersionUID = 1686388995931944419L; @Column(name="DRIVER_NO") @ApiParam(value ="驾驶员编号") private String driverNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java index 04c9772..79878f0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java @@ -18,6 +18,7 @@ import java.util.List; @Api("装车单批量入参") @Data public class WmsTmsShipBacthDto extends BaseDto implements Serializable { + private static final long serialVersionUID = -6901734563284429774L; @ApiParam("装车单集合") private List wmsTmsShipDtoList=new ArrayList<>(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java index bdd8cc6..07661de 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java @@ -17,6 +17,7 @@ import java.io.Serializable; @Data public class WmsTmsShipDto extends BaseDto implements Serializable { + private static final long serialVersionUID = -523839265877092396L; @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java index 95d0191..249a42b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java @@ -31,6 +31,7 @@ import javax.persistence.Table; @Table(name = "DROOLS_RULE_PERSISTENCE") @Api("系统动态业务规则") public class EngineRulePersistence extends BaseBean { + private static final long serialVersionUID = 5119552483383770556L; // 规则调用的唯一编号，例如：WMS_RECEIVE_0001 @Column(name = "RULE_NO", length = 50) private String ruleNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java index b41de8e..c7e9d7c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java @@ -7,13 +7,12 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.Type; -import javax.persistence.*; -import javax.script.CompiledScript; -import javax.script.ScriptContext; -import javax.script.ScriptEngine; -import javax.script.ScriptException; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import javax.persistence.Transient; /** * 脚本持久化实体类 @@ -30,6 +29,7 @@ import javax.script.ScriptException; @Table(name = "SCRIPT_PERSISTENCE") @Api("系统动态脚本") public class EngineScriptPersistence extends BaseBean { + private static final long serialVersionUID = 7893111140559759490L; // 脚本调用的唯一编号，例如：WMS_PDA_0001 @Column(name = "SCRIPT_NO", length = 50) private String scriptNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java index edefeab..4615324 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java @@ -30,6 +30,7 @@ import javax.persistence.Transient; @Api("系统动态脚本") public class EngineScriptPersistenceHistory extends BaseBean { + private static final long serialVersionUID = 7201021903118622899L; // 脚本调用的唯一编号，例如：WMS_PDA_0001 @Column(name = "SCRIPT_NO", length = 50) private String scriptNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java index bd413a9..30d2c3c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java @@ -18,6 +18,7 @@ import lombok.Data; @Api("供应商微服调用Model") public class WmsBasVendorModel extends BaseBean { + private static final long serialVersionUID = -4097250031510982530L; @ApiParam("供应商") private BasVendor basVendor; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java index 29d481e..f9d9951 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java @@ -18,6 +18,7 @@ import java.util.List; @Api("数据权限Model") public class WmsDataAuthModel extends BaseBean { + private static final long serialVersionUID = -1830754107669382563L; @ApiParam("角色编号") private String roleCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java index dd2b411..5fe1327 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java @@ -14,6 +14,7 @@ import lombok.Data; @Api("未完成订单模型") public class WmsMoveUnfinishedOrderModel extends BaseBean{ + private static final long serialVersionUID = 363976915707604557L; @ApiParam("物料编码") private String partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java index f842855..f375dfb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java @@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.wms.modelbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.common.Pager; -import cn.estsh.i3plus.pojo.wms.bean.BasVendor; import cn.estsh.i3plus.pojo.wms.bean.WmsPart; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -19,6 +18,7 @@ import lombok.Data; @Api("供应商微服调用Model") public class WmsPartModel extends BaseBean { + private static final long serialVersionUID = -4435519990466605445L; @ApiParam("物料") private WmsPart wmsPart; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java index 536f46c..d5b5feb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java @@ -18,6 +18,7 @@ import java.time.LocalTime; @Api("供应商收货看板") public class WmsPoAsnRecvModel extends BaseBean implements Comparable { + private static final long serialVersionUID = 7985236317993813219L; @ApiParam("订单号") private String orderNo; @ApiParam("供应商名称") 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 index 2b2fed2..62e107f 100644 --- 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 @@ -18,6 +18,7 @@ import javax.persistence.Entity; @Entity @Api("报工事务明细表model") public class WmsReportTransDetailModel extends BaseBean { + private static final long serialVersionUID = 1547988564672291041L; @ApiParam(value = "报工产线") private String lineNo; 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 index b4a467c..fb58af7 100644 --- 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 @@ -18,6 +18,7 @@ import javax.persistence.Entity; @Entity @Api("报工事务汇总表model") public class WmsReportTransMasterModel extends BaseBean { + private static final long serialVersionUID = 5696795930973637987L; @ApiParam(value = "实体线") private String lineNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java index 660d2a2..dfae656 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java @@ -18,7 +18,9 @@ import javax.persistence.Entity; @Entity @Api("静态盘点查询输出model") public class WmsStaticCsModel extends BaseBean { - public WmsStaticCsModel(String staticStr,String orderNo, String locateNo, String sn, double qty ) { + private static final long serialVersionUID = 9039981061448266666L; + + public WmsStaticCsModel(String staticStr, String orderNo, String locateNo, String sn, double qty) { this.orderNo = orderNo; this.locateNo = locateNo; this.sn = sn; 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 index 915567e..8757863 100644 --- 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 @@ -19,6 +19,7 @@ import javax.persistence.Entity; @Api("供应商延迟到货明细表model") public class WmsVendorDelayDetailModel extends BaseBean { + private static final long serialVersionUID = -1030326082916174340L; @ApiParam(value = "单据编号") private String orderNo; 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 index 3166ac2..4b6314c 100644 --- 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 @@ -19,6 +19,7 @@ import javax.persistence.Entity; @Api("供应商延迟到货汇总表model") public class WmsVendorDelayMasterModel extends BaseBean { + private static final long serialVersionUID = 1589775350017343999L; @ApiParam(value = "供应商代码") private String vendorNo; From e74f3d6d99e34df7822a8f7b3a9c73dff5c0bbf2 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 14 May 2020 09:00:51 +0800 Subject: [PATCH 10/12] =?UTF-8?q?BUG#8438=E3=80=9020011--=20=E5=85=AD?= =?UTF-8?q?=E5=90=88=E4=B8=80=E6=94=B9=E6=95=B0=E6=8C=89=E9=92=AE=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E9=94=99=E8=AF=AF=EF=BC=8C=E6=89=93=E5=BC=80=E6=94=B9?= =?UTF-8?q?=E6=95=B0=E6=8C=89=E9=92=AE=E6=97=B6=EF=BC=8C=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=90=8E=E6=95=B0=E9=87=8F=E4=BC=9A=E7=B4=AF?= =?UTF-8?q?=E5=8A=A0=E5=9C=A8=E4=B8=8B=E6=96=B9=E6=98=8E=E7=BB=86=E4=B8=AD?= =?UTF-8?q?=E5=B9=B6=E4=B8=94=E8=AE=A9=E7=94=A8=E6=88=B7=E5=86=8D=E6=AC=A1?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=95=B0=E9=87=8F--0515=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java index 348bb18..1995c1c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -41,7 +42,8 @@ public class WmsDataAuth extends BaseBean { return String.valueOf(dataObj); } - @Column(name = "DATA_OBJ_VALUE") + @Lob + @Column(name = "DATA_OBJ_VALUE", columnDefinition = "TEXT") @ApiParam(value = "数据对象值") private String dataObjValue; From 8d61db5ed51d3825902f71a2111d98eb2a01f643 Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 14 May 2020 11:00:57 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E4=BB=BB=E5=8A=A1:1786,1787,1788,1789?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 25 +++++++++++++--------- 1 file changed, 15 insertions(+), 10 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 592245d..6dd13e1 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 @@ -881,7 +881,7 @@ public class WmsEnumUtil { public static String getDes(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } @@ -2831,7 +2831,7 @@ public class WmsEnumUtil { // 根据枚举编号获取语言代码 public static String getCodeByIndex(Integer index) { for (LANGUAGE_TYPE languageType : LANGUAGE_TYPE.values()) { - if (languageType.getValue() == index.intValue()) { + if (languageType.getValue() == index) { return languageType.getDescription(); } } @@ -3298,7 +3298,7 @@ public class WmsEnumUtil { public static String getDes(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } @@ -3381,7 +3381,7 @@ public class WmsEnumUtil { } public static Map getEnumByName(String enumName) throws Exception { - Class innerClazz[] = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类 + Class[] innerClazz = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类 Class clazz; Enum[] enumConstants; @@ -3479,7 +3479,7 @@ public class WmsEnumUtil { public static String getDescription(String code) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == code) { + if (values()[i].value.equals(code)) { tmp = values()[i].description; } } @@ -3727,7 +3727,7 @@ public class WmsEnumUtil { public static String getDes(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } @@ -3767,7 +3767,7 @@ public class WmsEnumUtil { public static String getDes(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } @@ -3901,7 +3901,7 @@ public class WmsEnumUtil { public static String getDes(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } @@ -6655,6 +6655,11 @@ public class WmsEnumUtil { return tmp; } + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { @@ -6665,8 +6670,8 @@ public class WmsEnumUtil { return tmp; } - public static int descriptionOfValue(String desc) { - return descOf(desc); + public static String valueOfDescription(int val) { + return valueOf(val); } } From 373808e20def5f8868511b9cd731760daaf924a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 14 May 2020 13:12:05 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9A=E3=80=901928?= =?UTF-8?q?=E3=80=91-=E6=B7=BB=E5=8A=A0=E6=A3=80=E6=B5=8B=E5=8D=95-?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E7=B1=BB=E5=9E=8B=E6=9E=9A=E4=B8=BE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9code=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index e560fb7..eba9bab 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -2564,11 +2564,11 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_QC_CHECK_TYPE { - INCOMING_CHECK(5, "IN_MATERIAL_CHECK", "来料检验"), + INCOMING_CHECK(5, "INCOMING_CHECK", "来料检验"), FIRST_CHECK(10, "FIRST_CHECK", "首检"), ON_SITE_CHECK(20, "ON_SITE_CHECK", "巡检"), END_CHECK(30, "END_CHECK", "末检"), - RC_CHECK(40, "EDELIVERY_CHECK", "发货检验"); + RC_CHECK(40, "RC_CHECK", "发货检验"); private int value; private String code;