From 31c3fcd86804eb699b9e58dfedde907b6a18557d Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 21 Jul 2020 11:03:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B3=B0=E5=9B=BD=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java | 9 +++++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java index 4ab91b7..025d045 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * @Description : 任务单模型 @@ -35,6 +36,9 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam(value = "关联单据业务类型代码") private String busiTypeCode; + @ApiParam(value = "关联单据业务类型代码集合") + private List busiTypeCodeLst; + @ApiParam(value = "计划日期") private String zdate; @@ -107,4 +111,9 @@ public class WmsTaskInfoModel implements Serializable { this.srcZoneNo = srcZoneNo; this.createUser = createUser; } + + public WmsTaskInfoModel(String organizeCode, String busiTypeCode) { + this.organizeCode = organizeCode; + this.busiTypeCode = busiTypeCode; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java index 31cf362..8b08f24 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java @@ -60,6 +60,7 @@ public class WmsPackage extends BaseBean { @Column(name="PRINT_STATUS") @ApiParam(value = "打印状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class) public Integer printStatus; @Column(name="PACK_LEVEL") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java index 9132494..67fd34b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -112,6 +112,10 @@ public class WmsTaskInfo extends BaseBean { @ApiParam("工厂集合") private List organizeCodeList; + @Transient + @ApiParam("业务类型代码") + public String busiTypeCode; + public WmsTaskInfo(){}; public WmsTaskInfo(String orderNo ,Integer taskStatus , String zdate ,String ztime,String custNo,String vendorNo){ From 076c6c1b4fc7510ad59a8b11522b1dea9889d761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 21 Jul 2020 16:29:14 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=89=AD=E7=9F=A9=E4=BA=8C=E5=90=88?= =?UTF-8?q?=E4=B8=80=E6=9F=A5=E8=AF=A2=E5=85=B3=E9=94=AE=E4=BB=B6=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96--=E7=9B=AE?= =?UTF-8?q?=E5=89=8D=E6=A0=B9=E6=8D=AE=20=E9=98=9F=E5=88=97=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E9=98=9F=E5=88=97=E6=98=8E=E7=BB=86=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E8=BD=A6=E5=9E=8B=E6=95=A3=E4=BB=B6=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=B8=85=E5=8D=95=EF=BC=8C=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=A1=A8=E3=80=82=E5=8A=A0=E4=B8=8A=E6=9D=A1=E4=BB=B6=E3=80=90?= =?UTF-8?q?=E4=B8=80=E7=99=BE=E4=BD=8D=E6=9D=A1=E7=A0=81=E3=80=91,?= =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E5=9E=8B=E7=9B=B8=E5=90=8C=EF=BC=8C=E8=BD=A6?= =?UTF-8?q?=E5=9E=8B=E7=9B=B8=E5=90=8C=20=E5=86=85=E8=81=94=E6=9F=A5?= =?UTF-8?q?=E5=87=BA=E6=89=80=E6=9C=89=E7=9A=84=E5=85=B3=E9=94=AE=E4=BB=B6?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E2=80=94=E2=80=94>=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E6=95=A3=E4=BB=B6=E9=85=8D=E7=BD=AE=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E4=B8=AD=E7=9A=84=E9=9B=B6=E4=BB=B6=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=20=E5=B7=A5=E4=BD=8D=E7=9B=91=E6=8E=A7=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9:=E4=BA=A7=E7=BA=BF=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E7=9B=91=E6=8E=A7=E6=A8=A1=E5=BC=8F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E4=B8=BA=E7=A9=BA=E6=88=9610=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E4=B9=8B=E5=89=8D=E9=80=BB=E8=BE=91=EF=BC=8C=E4=B8=BA?= =?UTF-8?q?20=E6=97=B6=E4=B8=8D=E9=9C=80=E8=A6=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=90=8E=E9=9D=A2?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=B8=8D=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 46 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesWorkCenter.java | 5 +++ 2 files changed, 51 insertions(+) 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 ef26467..8d1abad 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 @@ -4492,4 +4492,50 @@ public class MesPcnEnumUtil { } } + + /** + * 工作中心 工位监控模式 10=工单作业，20=标准作业 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_CENTER_MONITOR_TYPE { + + ORDER_WORK(10, "工单作业"), + STANDARD_WORK(20, "标准作业"); + + private int value; + private String description; + + WORK_CENTER_MONITOR_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; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java index c67110f..a80febf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java @@ -66,6 +66,11 @@ public class MesWorkCenter extends BaseBean implements Serializable { @ApiParam("条码生成模式") private Integer generateType; + // 10=工单作业，20=标准作业 + @Column(name = "MONITOR_TYPE") + @ApiParam("工位监控模式") + private Integer monitorType; + @Transient @ApiParam(value = "子集列表") private List childTreeList; From 4df8a743a7520f044beaaca4a847f22c5e5c0fb9 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 21 Jul 2020 18:28:44 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=209735=2019048-=E7=89=A9=E6=96=99=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=96=B7=E6=B6=82=E5=BF=85=E9=9C=80=E4=BF=A1=E6=81=AF=E7=9A=84?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4-2020-07-21?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 27 ++++------------------ 1 file changed, 4 insertions(+), 23 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 faf97ff..7f802e0 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 @@ -4276,15 +4276,6 @@ public class MesEnumUtil { return tmp; } - public static String valueOfDescription2(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description; - } - } - return tmp; - } } /** @@ -4908,16 +4899,6 @@ public class MesEnumUtil { } return tmp; } - - public static String valueOfDescription2(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description; - } - } - return tmp; - } } /** @@ -5003,11 +4984,11 @@ public class MesEnumUtil { return tmp; } - public static String valueOfDescription2(int val) { - String tmp = null; + public static Integer descriptionOfValue(String description) { + Integer tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description; + if (values()[i].description.equals(description)) { + tmp = values()[i].value; } } return tmp; From a1af94fe70eb62a2a63967ed5d4de8b86ed7e978 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 21 Jul 2020 22:03:58 +0800 Subject: [PATCH 4/4] Fix Bug #9760 --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2744f4d..ffe13b9 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 @@ -1232,7 +1232,7 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(numberRule.getNumberRule(), "numberRule", packBean); } if (!StringUtils.isEmpty(numberRule.getPrefix())) { - DdlPreparedPack.getNumEqualPack(numberRule.getPrefix(), "prefix", packBean); + DdlPreparedPack.getStringLikerPack(numberRule.getPrefix(), "prefix", packBean); } if (null != numberRule.getIsCycle()) { DdlPreparedPack.getNumEqualPack(numberRule.getIsCycle(), "isCycle", packBean);