From ebf03920578ee850c211e24418f5345a0aa7e517 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 12 Oct 2020 14:44:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99optionT?= =?UTF-8?q?ype=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 46 ---------------------- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 46 ---------------------- .../model/excel/mgnbj/SparePartsImportModel.java | 2 +- 3 files changed, 1 insertion(+), 93 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 32fd382..3af6f5c 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 @@ -6059,52 +6059,6 @@ public class MesEnumUtil { } /** - * MES_车型散件配置清单 选配类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_OPTION_TYPE { - - OPTION_PART(1, "选配件"), - BOM_DISASSEMBLY(2, "BOM拆解"); - - private int value; - private String description; - - MES_OPTION_TYPE(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public static String valueOfDescription(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 Integer descriptionOfValue(String description) { - Integer tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].description.equals(description)) { - tmp = values()[i].value; - } - } - return tmp; - } - } - - /** * 数据格式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 8e8a55f..99133a8 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -4358,52 +4358,6 @@ public class MesPcnEnumUtil { } /** - * MES_生产队列散件清单 选配类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_OPTION_TYPE { - - OPTION_PART(1, "选配件"), - BOM_DISASSEMBLY(2, "BOM拆解"); - - private int value; - private String description; - - MES_OPTION_TYPE(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public static String valueOfDescription(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 Integer descriptionOfValue(String description) { - Integer tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].description.equals(description)) { - tmp = values()[i].value; - } - } - return tmp; - } - } - - /** * 绑定模式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java index d649fd4..91fb090 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java @@ -53,7 +53,7 @@ public class SparePartsImportModel { private String custPartNo; @ApiParam("用量") - private Double qty; + private Integer qty; @ApiParam("单元格编号") private Map cellNoMap = new HashMap<>(); From 4b65842d6ff5b4301834125de1efe56fe607da54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 12 Oct 2020 17:46:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3=E9=A1=B9=E7=9B=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 +++ 1 file changed, 3 insertions(+) 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 da89988..fcc4640 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 @@ -2246,6 +2246,9 @@ public class MesHqlPack { if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeEnd())) { DdlPreparedPack.getStringSmallerPack(mesProduceSnTravel.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean); } + if (!StringUtils.isEmpty(mesProduceSnTravel.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkCenterCode(), "workCenterCode", packBean); + } if (!StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder( mesProduceSnTravel.getCreateDateTimeStart(), From 7a29b8584896ab2b6c0dd9da5cc1727e5bc7395b Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 12 Oct 2020 19:33:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?Fix=20Bug=20#11733=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E8=B4=A7=E8=BF=9B=E5=BA=A6=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E7=BC=96=E8=BE=91=E5=8E=9F=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index 00036f6..64708ec 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -75,6 +75,10 @@ public class WmsASNMaster extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description") public Integer isTask; + @Column(name = "REASON") + @ApiParam(value = "原因", example = "1") + public String reason; + @ApiParam("ASN详情列表") @Transient public List asnMasterDetailsList; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index ee49f3e..64ae284 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -199,6 +199,10 @@ public class WmsPOMaster extends BaseBean { @ApiParam(value = "部门名称", example = "1") public Integer departName; + @Column(name = "REASON") + @ApiParam(value = "原因", example = "1") + public String reason; + @Transient @ApiParam("周总数") private Integer weekRcCount;