From 053b3ae0e457a0e125ef58febf1fbb81074cf754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 7 Nov 2019 17:19:53 +0800 Subject: [PATCH 01/34] =?UTF-8?q?LAC=20=E5=89=8D=E7=AB=AF=E8=81=94?= =?UTF-8?q?=E8=B0=83=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/LacEnumUtil.java | 70 ++++++++++++++++++++++ .../i3plus/pojo/lac/bean/LacCommandStackStep.java | 8 ++- .../cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java | 4 -- 3 files changed, 76 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java index e5ad0f4..be98ac7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java @@ -180,4 +180,74 @@ public class LacEnumUtil { } } + /** + * 返回方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RETURN_METHOD{ + SYNC(1,"同步"), + ASYNC(2,"异步"); + + private int value; + private String description; + + RETURN_METHOD(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; + } + } + + /** + * 参数值类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PARAM_VALUE_TYPE{ + NUMBER(1,"数字"), + STRING(2,"字符串"); + + private int value; + private String description; + + PARAM_VALUE_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; + } + } + } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java index 41be18c..8471c44 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java @@ -56,12 +56,16 @@ public class LacCommandStackStep extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long templateId; - @Column(name="STEP_NAME") + @Column(name="TEMPLATE_NAME_RDD") @ApiParam(value ="模板名称") + private String templateNameRdd; + + @Column(name="STEP_NAME") + @ApiParam(value ="步骤名称") private String stepName; @Column(name="STEP_CODE") - @ApiParam(value ="模板代码") + @ApiParam(value ="步骤代码") private String stepCode; @Column(name="STEP_SORT") diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java index c821de0..9caa3b2 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java @@ -81,10 +81,6 @@ public class LacSuitCase extends BaseBean { @ApiParam(value ="返回类型") private Integer returnMethod; - @Column(name="SUTI_CASE_STATUS") - @ApiParam(value ="适配器状态") - private Integer sutiCaseStatus; - @Column(name="SUIT_CASE_DESCRIPTION") @ApiParam(value ="适配器描述") private String suitCaseDescription; From 3425b443c88917e281cf849ca6ab6e4c913efc88 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 11 Nov 2019 21:21:50 +0800 Subject: [PATCH 02/34] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E4=BC=98=E5=8C=96=206283?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java index 05fc3ed..a853af3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java @@ -201,7 +201,7 @@ public class MesWorkOrder extends BaseBean { @Transient @ApiParam("mes生产工单页面按钮控制") - private MesButtonFlagModel workOrderButtonModel; + private MesButtonFlagModel mesButtonFlagModel; public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; From 9b491b742e48054ebdd2957311bb30510f5c12b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 12 Nov 2019 11:22:48 +0800 Subject: [PATCH 03/34] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 +++-- 1 file changed, 3 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 75fc5ec..e5ab358 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 @@ -638,8 +638,9 @@ public class WmsEnumUtil { KT_REWORK(380, "KT_REWORK", "KT返工"), KT_MISCALCULATION(390, "KT_MISCALCULATION", "KT误判"), KT_SORTING(400, "KT_SORTING", "KT分选"), - VDA_STATIC_CS(400,"VDA_STATIC_CS", "静态盘点"), - VDA_CS_SEARCH(410,"VDA_CS_SEARCH", "VDA盘点查询"); + VDA_STATIC_CS(410,"VDA_STATIC_CS", "静态盘点"), + VDA_CS_SEARCH(420,"VDA_CS_SEARCH", "VDA盘点查询"), + KT_DEFINITE(430,"KT_DEFINITE", "KT合格"); private int value; From 6536109b66eda4975b6fa0b0a16b0a55a9db6ba1 Mon Sep 17 00:00:00 2001 From: qianhs Date: Tue, 12 Nov 2019 11:33:52 +0800 Subject: [PATCH 04/34] =?UTF-8?q?=E3=80=90=09EU=E7=BC=96=E7=BB=84=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91=E3=80=90=20334-=20EU=E7=BC=96=E7=BB=84?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=BB=84=E4=BB=B6=E5=92=8C=E5=87=BD?= =?UTF-8?q?=E6=95=B0=E5=A4=8D=E7=94=A8=E3=80=91=E3=80=901172EU=E7=BC=96?= =?UTF-8?q?=E7=BB=84=E7=AE=A1=E7=90=86-=E7=BB=84=E4=BB=B6=E5=92=8C?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E5=A4=8D=E7=94=A8=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 6 ++++-- 1 file changed, 4 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 e5ab358..648c79d 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 @@ -640,7 +640,8 @@ public class WmsEnumUtil { KT_SORTING(400, "KT_SORTING", "KT分选"), VDA_STATIC_CS(410,"VDA_STATIC_CS", "静态盘点"), VDA_CS_SEARCH(420,"VDA_CS_SEARCH", "VDA盘点查询"), - KT_DEFINITE(430,"KT_DEFINITE", "KT合格"); + KT_DEFINITE(430,"KT_DEFINITE", "KT合格"), + VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理"); private int value; @@ -822,7 +823,8 @@ public class WmsEnumUtil { VDA_SN_("VDA_SN_MERGE", "VDA条码合并"), VDA_SCAN_QUERY("VDA_SCAN_QUERY", "VDA扫描查询"), VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY","VDA事务查询"), - VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"); + VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"), + VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"); private String value; private String description; From a294c1ccb035603db978d4479a4962dbc20e75be Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 12 Nov 2019 11:52:30 +0800 Subject: [PATCH 05/34] =?UTF-8?q?=E5=AE=89=E7=81=AF=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonManageQueue.java | 4 + .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 119 ++++++++++++++++++++- 2 files changed, 121 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index 6f0f112..82ff8c5 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -181,6 +181,10 @@ public class AndonManageQueue extends BaseManageQueue { @ApiParam(value = "放行说明") private String openInfo; + @Column(name = "IS_OVER_TIME") + @ApiParam(value = "是否超时") + private Integer overTimeFlag; + @Transient @ApiParam(value = "安灯状态集合") private List statusCodeList; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 7699fbe..627a36c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -12,6 +12,123 @@ import org.apache.commons.lang3.StringUtils; **/ public class AndonEnumUtil { /** + * 通知超时标识 + * 10 - 一级，20 - 二级，30 - 三级 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum NOTICE_OVER_TIME_FLAG{ + CALL(1,"呼叫超时"), + SIGN(2,"响应超时"); + + private int value; + private String description; + + NOTICE_OVER_TIME_FLAG(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 int descriptionOfValue(String val) { + int tmp = -1; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 广播内容占位符 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BROADCAST_CUSTOM_CONDITION { + CALL("{A}","workCenterCode","产线"), + SIGN("{B}","workCellCode","工位"), + RESOLVE("{C}","alarmCode","安灯类型"); + + private String value; + private String code; + private String description; + + BROADCAST_CUSTOM_CONDITION(String value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getCode(){ return code; } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value, val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String codeOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].code, val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String desc) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String descriptionOfCode(String desc) { + String tmp = ""; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, desc)) { + tmp = values()[i].code; + } + } + return tmp; + } + } + + + /** * 按灯状态 * 10-是，20-否 */ @@ -517,8 +634,6 @@ public class AndonEnumUtil { } } - - /** * 优先级别 * 10 - 一级，20 - 二级，30 - 三级 From 45d14fe3e2a3016d09150df248a8dd84e8cc6920 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Tue, 12 Nov 2019 13:07:14 +0800 Subject: [PATCH 06/34] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E5=A2=9E=E5=8A=A0=20?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=A8=A1=E5=BC=8F=E5=8F=82=E6=95=B0=20=20682?= =?UTF-8?q?3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 34 ++++++++++++++++++++++ 1 file changed, 34 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 b7a1607..d045e4a 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 @@ -1969,4 +1969,38 @@ public class MesPcnEnumUtil { } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCT_PATTERN_PARAMS { + + MATCH_WORK_ORDER(10, "匹配工单"), + API_WORK_ORDER(20, "读取接口工单"), + SN_WORK_ORDER(30, "获取条码对应工单"); + + private int value; + private String description; + + PRODUCT_PATTERN_PARAMS(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; + } + } + } From 577b2c462a3d943796815bf7872f6582f3c850cc Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 12 Nov 2019 13:53:31 +0800 Subject: [PATCH 07/34] =?UTF-8?q?=E6=8C=89=E7=85=A7=E5=AE=89=E7=81=AF?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=BB=9F=E8=AE=A1=E5=BD=93=E5=A4=A9=E5=8F=91?= =?UTF-8?q?=E7=94=9F=E7=9A=84=E5=AE=89=E7=81=AF=E6=80=BB=E6=AC=A1=E6=95=B0?= =?UTF-8?q?=E5=92=8C=E5=AE=89=E7=81=AF=E8=B6=85=E6=97=B6=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/model/AndonBoardModel.java | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java new file mode 100644 index 0000000..58f9d5d --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-11-12-10:21 + * @Modify: + **/ +@Data +public class AndonBoardModel { + + @ApiParam("安灯类型") + private String alarmCode; + + @ApiParam("安灯类型名称") + private String alarmName; + + @ApiParam("安灯正常处理的次数") + private Integer inTime; + + @ApiParam("安灯超时次数") + private Integer overTime; + + @ApiParam("安灯总次数") + private Integer totalTime; + + public int getTotalTimeVal() { + return totalTime == null ? 0 : totalTime; + } + + public int getOverTimeVal() { + return overTime == null ? 0 : overTime; + } + + public int getInTime() { + return inTime == null ? 0 : inTime; + } + + +} From aa22d18645912581868e1b34727657604bab7e92 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 12 Nov 2019 13:55:44 +0800 Subject: [PATCH 08/34] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java index 58f9d5d..cee23af 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java @@ -6,7 +6,7 @@ import lombok.Data; import java.io.Serializable; /** - * @Description: + * @Description: 按照安灯类型统计分组统计当天发生的安灯总次数和安灯超时次数 model * @Reference: * @Author: Crish * @CreateDate:2019-11-12-10:21 From c1476f83c00b11ecbd39f8bab97e97c5954cb99c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 12 Nov 2019 15:26:31 +0800 Subject: [PATCH 09/34] =?UTF-8?q?=E5=85=B3=E9=97=AD=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 125 ++++++++++----------- 1 file changed, 62 insertions(+), 63 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 75fc5ec..ed592e6 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 @@ -896,7 +896,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TASK_INFO_STATUS { - CREATE(10, "创建"), FINISH(20, "处理中"), FAIL(30, "已处理"); + CREATE(10, "创建"), FINISH(20, "处理中"), FAIL(30, "已处理") + , CLOSE(40, "已关闭"); private int value; private String description; @@ -929,24 +930,27 @@ public class WmsEnumUtil { } } + + /** - * 单据是否生成任务状态 + * 业务表：库存条码状态 + * 1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum IS_GENERAL_TASK { - CREATE(10, "CREATE", "创建"), - INIT(20, "INIT", "初始化"), - IS_GENERAL(30, "IS_GENERAL", "已生成"), - NO_GENERAL(40, "NO_GENERAL", "不生成"), - CANCEL(50, "CANCEL", "撤销"); + public enum STOCK_SN_STATUS { + CREATE(10, "创建"), + QUALITY_CONTROL(20, "质检中"), + PRE_INSTOCK(30, "待入库"), + INSTOCKED(40, "入库"), + PICKED(50, "配料"), + OUT_STOCK(60, "出库"), + COMMING(80, "在途"); private int value; - private String code; private String description; - IS_GENERAL_TASK(int value, String code, String description) { + STOCK_SN_STATUS(int value, String description) { this.value = value; - this.code = code; this.description = description; } @@ -958,10 +962,6 @@ public class WmsEnumUtil { return description; } - public String getCode() { - return code; - } - public static String valueOf(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -972,6 +972,10 @@ public class WmsEnumUtil { return tmp; } + public static String valueOfDescription(int val) { + return valueOf(val); + } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { @@ -981,32 +985,25 @@ public class WmsEnumUtil { } return tmp; } - - public static String valueOfDescription(int val) { - return valueOf(val); - } } - - /** - * 业务表：库存条码状态 - * 1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途 + * 单据是否生成任务状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum STOCK_SN_STATUS { - CREATE(10, "创建"), - QUALITY_CONTROL(20, "质检中"), - PRE_INSTOCK(30, "待入库"), - INSTOCKED(40, "入库"), - PICKED(50, "配料"), - OUT_STOCK(60, "出库"), - COMMING(80, "在途"); + public enum IS_GENERAL_TASK { + CREATE(10, "CREATE", "创建"), + INIT(20, "INIT", "初始化"), + IS_GENERAL(30, "IS_GENERAL", "已生成"), + NO_GENERAL(40, "NO_GENERAL", "不生成"), + CANCEL(50, "CANCEL", "撤销"); private int value; + private String code; private String description; - STOCK_SN_STATUS(int value, String description) { + IS_GENERAL_TASK(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -1018,6 +1015,10 @@ public class WmsEnumUtil { return description; } + public String getCode() { + return code; + } + public static String valueOf(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -1028,10 +1029,6 @@ public class WmsEnumUtil { return tmp; } - public static String valueOfDescription(int val) { - return valueOf(val); - } - public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { @@ -1041,8 +1038,11 @@ public class WmsEnumUtil { } return tmp; } - } + public static String valueOfDescription(int val) { + return valueOf(val); + } + } /** * 业务表：库存条码质检状态 */ @@ -1354,20 +1354,22 @@ public class WmsEnumUtil { } + /** - * 质检业务类型 + * 质检业务状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum QC_INFO_TYPE { - FEED(10, "进料检验"), - ONLINE(20, "在线检验"), - EMDPRODUCT(30, "成品检验"), - SHIPMENTS(40, "出货检验"); + public enum QC_INFO_STATUS { + CREATE(10, "新建"), + FINISH(20, "处理中"), + FAIL(30, "已完成"), + CLOSE(40, "已关闭"), + CANCEL(50, "已取消"); private int value; private String description; - QC_INFO_TYPE(int value, String description) { + QC_INFO_STATUS(int value, String description) { this.value = value; this.description = description; } @@ -1389,27 +1391,20 @@ public class WmsEnumUtil { } return tmp; } - - public static String valueOfDescription(int val) { - return valueOf(val); - } } /** - * 质检业务状态 + * 质检明细状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum QC_INFO_STATUS { - CREATE(10, "新建"), - FINISH(20, "处理中"), - FAIL(30, "已完成"), - CLOSE(40, "已关闭"), - CANCEL(50, "已取消"); + public enum QC_ITEM_STATUS { + NORMAL(10, "正常"), + CANCELLATION(20, "已处理"); private int value; private String description; - QC_INFO_STATUS(int value, String description) { + QC_ITEM_STATUS(int value, String description) { this.value = value; this.description = description; } @@ -1432,19 +1427,20 @@ public class WmsEnumUtil { return tmp; } } - /** - * 质检明细状态 + * 质检业务类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum QC_ITEM_STATUS { - NORMAL(10, "正常"), - CANCELLATION(20, "已处理"); + public enum QC_INFO_TYPE { + FEED(10, "进料检验"), + ONLINE(20, "在线检验"), + EMDPRODUCT(30, "成品检验"), + SHIPMENTS(40, "出货检验"); private int value; private String description; - QC_ITEM_STATUS(int value, String description) { + QC_INFO_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -1466,8 +1462,11 @@ public class WmsEnumUtil { } return tmp; } - } + public static String valueOfDescription(int val) { + return valueOf(val); + } + } /** * 作业记录参数状态 */ From 75701682d2dc73672f97a3aabe942f8221b828a1 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 12 Nov 2019 17:03:36 +0800 Subject: [PATCH 10/34] =?UTF-8?q?=E3=80=90EU-=E7=94=9F=E4=BA=A7=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5=E6=92=A4=E9=94=80=E3=80=91=E3=80=90353=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E6=8A=A5=E5=B7=A5=E6=92=A4=E9=94=80-4.1=09=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=8A=A5=E5=B7=A5=E6=92=A4=E9=94=80=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E3=80=91=E3=80=901191=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=92=A4=E9=94=80-4.1=09=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=92=A4=E9=94=80=E6=9D=A1=E7=A0=81=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 bddc752..4284c43 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 @@ -3747,7 +3747,8 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SN_OPERATE_TYPE { REPORT(10, "REPORT", "生产报工"), - BOXING_ERROR_PROOFING(20, "BOXING_ERROR_PROOFING", "装箱防错"); + BOXING_ERROR_PROOFING(20, "BOXING_ERROR_PROOFING", "装箱防错"), + REPORT_CANCEL(30, "REPORT_CANCEL", "报工撤销"); private int value; private String code; From 3eeaff50b3c4c590b1f0379d8dfa59934ee7e64c Mon Sep 17 00:00:00 2001 From: jokelone Date: Tue, 12 Nov 2019 17:50:41 +0800 Subject: [PATCH 11/34] =?UTF-8?q?=E3=80=90bug=EF=BC=9A5957=E5=B7=A5?= =?UTF-8?q?=E5=8E=82=E5=88=9D=E5=A7=8B=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 1 - .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 87 ++++++++++++++++++++++ 2 files changed, 87 insertions(+), 1 deletion(-) 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 9fd5314..60a7aab 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 @@ -26,7 +26,6 @@ public class MesEnumUtil { MES_PCN_SYNC_CFG("MesPcnSyncCfg", "MES_PCN_SYNC_CFG", "同步配置"), MES_BUTTON_STATUS("MesButtonStatus", "MES_BUTTON_STATUS", "按钮状态配置表"), MES_WORK_CELL_PARAM("MesWorkCellParam", "MES_WORK_CELL_PARAM", "工作单元参数"), - MES_STATUS_CFG("MesStatusCfg", "MES_STATUS_CFG", "状态配置"), MES_EVENT("MesEvent", "MES_EVENT", "事件清单"), MES_METHOD("MesMethod", "MES_METHOD", "方法清单"), MES_ACTION("MesAction", "MES_ACTION", "动作"), 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 8f58397..527f46b 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 @@ -13,6 +13,93 @@ import org.apache.commons.lang3.StringUtils; public class MesPcnEnumUtil { /** + * 条码类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_PRODUCE_SN_TYPE { + + NORMAL(10, "正常件"), + FIRST_INSPECTION(20, "首检件"); + + private int value; + private String description; + + MES_PRODUCE_SN_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; + } + } + + /** + * pcn 操作类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_OPERATE_TYPE { + + WORKSTATION_SCAN(10, "工位扫描"), + QUALITY_JUDGEMENT(20, "质量判定"), + MATERIAL_DISMANTLING(30, "物料拆解"), + REWORK(40, "返修作业"), + WORKSTATION_MONITORING(50, "工位监控"); + + private int value; + private String description; + + MES_OPERATE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + // 根据value返回枚举类型,主要在switch中使用 + public static MES_OPERATE_TYPE getByValue(int value) { + for (MES_OPERATE_TYPE mesInsertExcel : values()) { + if (mesInsertExcel.getValue() == value) { + return mesInsertExcel; + } + } + return null; + } + + + 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; + } + + } + + /** * MesProductEncodeCfg 匹配类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) From a30f4aae831ed7e7eb17481c9186485d8531c330 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 12 Nov 2019 17:53:44 +0800 Subject: [PATCH 12/34] =?UTF-8?q?andon=E5=B9=BF=E6=92=AD=E9=9F=B3=E9=87=8F?= =?UTF-8?q?=E5=8F=AF=E9=85=8D=E7=BD=AE=EF=BC=8C=20=E5=AE=89=E7=81=AF?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonMessageRecord.java | 77 +++++++++++++++++++ .../i3plus/pojo/andon/bean/AndonResponse.java | 46 ++++++++++++ .../repository/IAndonMessageRecordRepository.java | 16 ++++ .../andon/repository/IAndonResponseRepository.java | 16 ++++ .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 34 ++++++++- .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 86 +++++++++++++++++++++- 6 files changed, 269 insertions(+), 6 deletions(-) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponse.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonMessageRecordRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonResponseRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java new file mode 100644 index 0000000..387e5e9 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java @@ -0,0 +1,77 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description: 安灯通知记录表 + * @Reference: + * @Author: Crish + * @CreateDate:2019-11-11-14:23 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_MESSAGE_RECORD") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("通知记录") +public class AndonMessageRecord extends BaseBean { + + @Column(name = "ANDON_ORDER_NO") + @ApiParam(value = "安灯队列编号") + private String andonOrderNo; + + @Column(name = "ALARM_CODE") + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") + @ApiParam(value = "安灯类型") + private String alarmCode; + + @Column(name = "STATUS_CODE") + @AnnoOutputColumn(refClass = AndonEnumUtil.ANDON_ACTION_TAG.class,refForeignKey = "code",value = "description") + @ApiParam(value = "安灯状态代码") + private String statusCode; + + @Column(name = "RP_OBJECT_CODE") + @ApiParam(value = "通知对象代码") + private String rpObjectCode; + + @Transient + @ApiParam(value = "通知对象名称") + private String rpObjectName; + + @Column(name = "RP_CODE") + @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description") + @ApiParam(value = "通知方式") + private String rpCode; + + @Column(name = "RP_NAME") + @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description") + @ApiParam(value = "通知方式名称") + private String rpName; + + @Column(name = "RP_LEVEL") + @ApiParam(value = "通知等级") + private String rpLevel; + + @Column(name = "IS_SUCCEED") + @ApiParam(value = "成功标识") + private String isSucceed; + + @Column(name = "MEMO") + @ApiParam(value = "备注") + private String memo; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponse.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponse.java new file mode 100644 index 0000000..fee0346 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponse.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description: + * @Reference: 通知方式 + * @Author: Crish + * @CreateDate:2019-11-11-14:23 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_RESPONSE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("通知方式") +public class AndonResponse extends BaseBean { + + @Column(name = "RESPONSE_CODE") + @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description") + @ApiParam(value = "通知方式") + private String responseCode; + + @Column(name = "RESPONSE_NAME") + @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description") + @ApiParam(value = "通知名称") + private String responseName; + + @Column(name = "RESPONSE_CONTENT") + @ApiParam(value = "通知内容") + private String responseContent; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonMessageRecordRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonMessageRecordRepository.java new file mode 100644 index 0000000..5bf36cf --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonMessageRecordRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonMessageRecord; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-11-12-14:24 + * @Modify: + **/ +@Repository +public interface IAndonMessageRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonResponseRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonResponseRepository.java new file mode 100644 index 0000000..b14dd1a --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonResponseRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonResponse; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description: 通知方式 + * @Reference: + * @Author: Crish + * @CreateDate:2019-11-11-15:12 + * @Modify: + **/ +@Repository +public interface IAndonResponseRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index 9362815..4bc0eba 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -20,7 +20,38 @@ import org.apache.commons.lang3.StringUtils; * @Modify: **/ public class AndonHqlPack { - /***************** crish 工作单元呼叫原因配置， 处理方法配置， 处理事件原因配置， 事件现象配置 Start ***********/ + + /** + * 安灯通知方式查询封装 + * @param andonResponse + * @return + */ + public static DdlPackBean getAndonResponse(AndonResponse andonResponse) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getStringEqualPack(andonResponse.getOrganizeCode(), "organizeCode", packBean); + DdlPreparedPack.getStringEqualPack(andonResponse.getResponseCode(), "responseCode", packBean); + return packBean; + } + + /** + * 安灯通知记录查询条件封装 + * @param andonMessageRecord + * @return + */ + public static DdlPackBean getAndonMessageRecord(AndonMessageRecord andonMessageRecord) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getStringEqualPack(andonMessageRecord.getOrganizeCode(), "organizeCode", packBean); + DdlPreparedPack.getStringEqualPack(andonMessageRecord.getAlarmCode(), "alarmCode", packBean); + DdlPreparedPack.getStringEqualPack(andonMessageRecord.getAndonOrderNo(), "andonOrderNo", packBean); + DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpCode(), "rpCode", packBean); + DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpObjectCode(), "rpObjectCode", packBean); + DdlPreparedPack.getStringEqualPack(andonMessageRecord.getStatusCode(), "statusCode", packBean); + if(StringUtils.isNotBlank(andonMessageRecord.getCreateDateTimeStart()) || StringUtils.isNotBlank(andonMessageRecord.getCreateDateTimeEnd())){ + DdlPreparedPack.timeBuilder(andonMessageRecord.getCreateDateTimeStart(), andonMessageRecord.getCreateDateTimeEnd(), "createDatetime", packBean, true); + } + return packBean; + } + /** * 工作单元呼叫原因配置查询条件封装 * @param andonCellAlarmCause @@ -137,7 +168,6 @@ public class AndonHqlPack { DdlPreparedPack.getNumEqualPack(andonQueueAttach.getIsValid(),"isValid",packBean); return packBean; } - /***************** crish 工作单元呼叫原因配置， 处理方法配置， 处理事件原因配置， 事件现象配置 End ************/ /** diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 627a36c..46733f3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -12,8 +12,78 @@ import org.apache.commons.lang3.StringUtils; **/ public class AndonEnumUtil { /** + * 成功失败标识 + * + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ANDON_SUCCESS_FLAG{ + SUCCESS(1, "1","成功"), + FAIL(2, "2","失败"); + + private int value; + private String code; + private String description; + + ANDON_SUCCESS_FLAG(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode(){ return code; } + + 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 String codeOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].code, val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descriptionOfValue(String val) { + int tmp = -1; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String descriptionOfCode(String val) { + String tmp = ""; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].code; + } + } + return tmp; + } + } + + /** * 通知超时标识 - * 10 - 一级，20 - 二级，30 - 三级 + * */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum NOTICE_OVER_TIME_FLAG{ @@ -62,9 +132,17 @@ public class AndonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum BROADCAST_CUSTOM_CONDITION { - CALL("{A}","workCenterCode","产线"), - SIGN("{B}","workCellCode","工位"), - RESOLVE("{C}","alarmCode","安灯类型"); + LINE("{A}","workCenterCode","产线代码"), + LINE_NAME("{B}","workCenterName","产线名称"), + CELL("{C}","workCellCode","工位代码"), + CELL_NAME("{D}","workCellName","工位名称"), + ALARM_CODE("{E}","alarmCode","安灯类型代码"), + ALARM_NAME("{F}","alarmName","安灯类型名称"), + CALL_USER("{G}","callUser","呼叫人名称"), + ALARM_DETAIL("{H}","alarmDetailCode","安灯子类型"), + ALARM_DETAIL_NAME("{L}","alarmDetailNameRdd","安灯子类型名称"), + AC_CODE("{J}","acCode","事件描述代码"), + AC_NAME("{K}","acNameRdd","事件描述名称"); private String value; private String code; From 423d8d2c03998c68c21bf54502352dbeaf13ea06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 12 Nov 2019 20:08:05 +0800 Subject: [PATCH 13/34] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=BC=80=E5=85=B3=20la?= =?UTF-8?q?c=E4=BC=98=E5=8C=96=20OPC=20UA=E5=B7=A5=E5=85=B7=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 1 - .../main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 3 ++- .../java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java | 4 +--- .../cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 1 + 6 files changed, 7 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 6c2d59d..e312525 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 @@ -1128,7 +1128,6 @@ public class CommonEnumUtil { } } - // 数据有效的静态常量 public static final int VALID = CommonEnumUtil.IS_VAILD.VAILD.getValue(); // 数据未删除的静态常量 diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 561ce58..ce67a7d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1023,7 +1023,8 @@ public class ImppEnumUtil { MAIL(3, "邮件配置"), CONTACT(4, "联系人"), BASIS(5, "基础"), - CONFIG(6, "系统配置"); + CONFIG(6, "系统配置"), + LOG(7, "日志配置"); private int value; private String description; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java index b44528b..3ed31a6 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java @@ -91,7 +91,7 @@ public class LacSuitTaskParamAdapter extends BaseBean { @Column(name="TRANSFER_PARAM_VALUE_TYPE") @ApiParam(value ="转换后参数值类型") - private String transferParamValueType; + private Integer transferParamValueType; @Column(name="DEFAULT_VALUE") @ApiParam(value ="参数默认值") diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java index 9a42293..e39f612 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java @@ -94,6 +94,8 @@ public class LacHqlPack { public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getNumEqualPack(bean.getParamType(),"paramType",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean); return ddlPackBean; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java index 3ab55af..3a9268b 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java @@ -1,14 +1,12 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; @@ -57,7 +55,7 @@ public class SysConfig extends BaseBean { private String configValue; @Column(name="CONFIG_VALUE_OPTION") - @ApiParam(value ="参数值选项（参数类型为多选时使用），格式：{key:'',value:''}") + @ApiParam(value ="参数值选项（参数类型为多选时使用），格式：{\"key\":\"value\"}") private String configValueOption; @Column(name="CONFIG_DESCRIPTION") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index 5ea76e3..79dfe71 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -334,6 +334,7 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCode(),"suitCaseCode",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitRecord.getProcessState(),"processState",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean); DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true); From c1c00213e1635c5a3608538a17060b45336136bf Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Tue, 12 Nov 2019 22:37:52 +0800 Subject: [PATCH 14/34] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=206283?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/pcn/bean/MesProduceSnTravel.java | 6 ++++- .../i3plus/pojo/mes/pcn/model/StepParamsModel.java | 29 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesProduceSnTravel.java | 6 ++++- .../i3plus/pojo/mes/model/StepParamsModel.java | 29 ++++++++++++++++++++++ 4 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java index e162d62..bd8d086 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java @@ -29,9 +29,13 @@ import javax.persistence.Transient; @Api("产品条码履历表") public class MesProduceSnTravel extends BaseBean { @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java new file mode 100644 index 0000000..7b2296f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/11/12 3:50 下午 + * @Description: 下拉工步参数对象 + **/ +@Data +@Api("下拉工步参数对象") +public class StepParamsModel implements Serializable { + private static final long serialVersionUID = -6361645141217616499L; + + @ApiParam("参数代码") + private String paramCode; + + @ApiParam("参数代码") + private Map paramValues; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index 4eed687..d3d073b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -29,9 +29,13 @@ import javax.persistence.Transient; @Api("产品条码履历表") public class MesProduceSnTravel extends BaseBean { @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java new file mode 100644 index 0000000..2a90b5e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/11/12 3:50 下午 + * @Description: 下拉工步参数对象 + **/ +@Data +@Api("下拉工步参数对象") +public class StepParamsModel implements Serializable { + private static final long serialVersionUID = -6361645141217616499L; + + @ApiParam("参数代码") + private String paramCode; + + @ApiParam("参数代码") + private Map paramValues; + + +} From 4bd4ca874527ad5dd23e9e500ef4201c4b8d92e3 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Wed, 13 Nov 2019 10:54:31 +0800 Subject: [PATCH 15/34] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=EF=BC=8C=20=E9=80=9A=E7=9F=A5=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java index 387e5e9..5c81250 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java @@ -30,6 +30,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Api("通知记录") public class AndonMessageRecord extends BaseBean { + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心") + private String workCenterCode; @Column(name = "ANDON_ORDER_NO") @ApiParam(value = "安灯队列编号") From 2077c651e76874048b5029315039b2716fd4a40d Mon Sep 17 00:00:00 2001 From: 1111 Date: Wed, 13 Nov 2019 15:07:37 +0800 Subject: [PATCH 16/34] =?UTF-8?q?=E3=80=90=E9=87=87=E8=B4=AD=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=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 +++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java | 1 - 2 files changed, 3 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 75fc5ec..d5d99c5 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 @@ -639,7 +639,9 @@ public class WmsEnumUtil { KT_MISCALCULATION(390, "KT_MISCALCULATION", "KT误判"), KT_SORTING(400, "KT_SORTING", "KT分选"), VDA_STATIC_CS(400,"VDA_STATIC_CS", "静态盘点"), - VDA_CS_SEARCH(410,"VDA_CS_SEARCH", "VDA盘点查询"); + VDA_CS_SEARCH(410,"VDA_CS_SEARCH", "VDA盘点查询"), + KT_PURCHASE_RC(420,"KT_PURCHASE_RC", "采购收货");; + private int value; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java index 78f240d..def0261 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java @@ -32,7 +32,6 @@ import javax.persistence.Transient; @Api("容器类型") public class WmsContainerType extends BaseBean { private static final long serialVersionUID = 4849044986767609347L; - @Column(name = "CT_CODE",unique = true) @ApiParam(value = "容器类型代码") private String ctCode; From 60ec41e1498acf9255e6fe411ce4590436ca52a3 Mon Sep 17 00:00:00 2001 From: 1111 Date: Wed, 13 Nov 2019 15:10:57 +0800 Subject: [PATCH 17/34] =?UTF-8?q?=E3=80=90=E9=87=87=E8=B4=AD=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 4284c43..0f8069f 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 @@ -641,7 +641,8 @@ public class WmsEnumUtil { VDA_STATIC_CS(410,"VDA_STATIC_CS", "静态盘点"), VDA_CS_SEARCH(420,"VDA_CS_SEARCH", "VDA盘点查询"), KT_DEFINITE(430,"KT_DEFINITE", "KT合格"), - VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理"); + VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理"), + KT_PURCHASE_RC(450,"KT_PURCHASE_RC", "采购收货"); private int value; From 9b8d4c900b328688c400836d2a902c1a20e0a01e Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 13 Nov 2019 15:23:00 +0800 Subject: [PATCH 18/34] =?UTF-8?q?=E3=80=90=E4=BA=8B=E7=89=A9=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E3=80=91bug6294?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 31afeb8..96ffb91 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -233,13 +233,13 @@ public class WmsMoveSn extends BaseBean { this.refSrc = refSrc; } - public WmsMoveSn(String partNo, String srcLocateNo, String destLocateNo, String createUser, String createDatetime, Integer busiTypeCode, Double destQty) { + public WmsMoveSn(String partNo, String srcLocateNo, String destLocateNo, String createUser, String createDatetime, String transTypeName, Double destQty) { this.partNo = partNo; this.srcLocateNo = srcLocateNo; this.destLocateNo = destLocateNo; this.createUser = createUser; this.createDatetime = createDatetime; - this.busiTypeCode = busiTypeCode; + this.transTypeName = transTypeName; this.destQty = destQty; } From 49637cb23f6950805c96175cfc9f047b5eb08b73 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 13 Nov 2019 16:33:10 +0800 Subject: [PATCH 19/34] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82:1167,?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=89=93=E5=8C=85=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 78 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java | 2 +- .../pojo/mes/pcn/model/ProdPackageModel.java | 64 ++++++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 5 +- 4 files changed, 144 insertions(+), 5 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java 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 527f46b..38268c7 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 @@ -2072,6 +2072,46 @@ public class MesPcnEnumUtil { } } + /** + * 工位程序交互时的数据类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STATION_DATA_TYPE { + TABLE("table", "表格"), + TEXT("text", "正常文本"), + EXP_TEXT("exp_text", "异常文本"), + FILE("file", "定制内容文件"), + IMAGE("image", "图片"), + BUTTON("button", "按钮"); + + private String value; + private String description; + + STATION_DATA_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (val.equals(values()[i].value)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ONLINE_SEND_TYPE { @@ -2141,6 +2181,44 @@ public class MesPcnEnumUtil { } } + /** + * 包装层级 MES_PACKAGE + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PACKAGE_PACKLEVEL { + + FIRST(1, "第一层"), + SECOND(2, "第二层"), + THIRD(3, "第三层"), + FOURTH(4, "第四层"); + + private int value; + private String description; + + PACKAGE_PACKLEVEL(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; + } + } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PRODUCT_PATTERN_PARAMS { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java index 182a1d5..6c4e5d3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java @@ -48,7 +48,7 @@ public class MesPackage extends BaseBean { private Double packSpecQty; @Column(name = "UNIT") - @ApiParam("包装规格数量") + @ApiParam("danwei") private String unit; @Column(name = "LOT_NO") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java new file mode 100644 index 0000000..1ff7261 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackage; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrder; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @Author: wangjie + * @CreateDate: 2019/9/23 8:06 PM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("产品包装model") +public class ProdPackageModel { + + @ApiParam("工单号") + private String workOrderNo; + + @ApiParam("生产线") + private String workCenterCode; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("班次") + private String shiftCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("单位") + private String unit; + + @ApiParam("工单数量") + private Double workOrderQty; + + @ApiParam("完成数量") + private Double completeQty; + + @ApiParam("包装规格数量") + private Double packSpecQty; + + @ApiParam("包装规格") + private String packSpec; + + @ApiParam("包装集合") + private List packageList; + + @ApiParam("工单集合") + private List workOrderList; + +} 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 a7666ba..5be1786 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 @@ -973,9 +973,6 @@ public class MesHqlPack { if (!StringUtils.isEmpty(packSpec.getSpecName())) { DdlPreparedPack.getStringLikerPack(packSpec.getSpecName(), "specName", packBean); } -// if (!StringUtils.isEmpty(packSpec.getSpecCode())) { -// DdlPreparedPack.getStringEqualPack(packSpec.getSpecCode(), "parentSpec", packBean); -// } return packBean; } @@ -1670,7 +1667,7 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(mesProdPack.getPartNo(), "partNo", packBean); } if (!StringUtils.isEmpty(mesProdPack.getCustomerCode())) { - DdlPreparedPack.getStringEqualPack(mesProdPack.getCustomerCode(), "customerCode", packBean); + DdlPreparedPack.getStringLikerPack(mesProdPack.getCustomerCode(), "customerCode", packBean); } if (!StringUtils.isEmpty(mesProdPack.getPackSpec())) { DdlPreparedPack.getStringLikerPack(mesProdPack.getPackSpec(), "packSpec", packBean); From 246726a67d81adfeab8985ddea4bf5d1591f34c4 Mon Sep 17 00:00:00 2001 From: jokelone Date: Wed, 13 Nov 2019 16:45:51 +0800 Subject: [PATCH 20/34] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1193?= =?UTF-8?q?=20=E6=8E=A5=E5=8F=A3=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 38 ++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesActionIf.java | 38 ++++++++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesIf.java | 46 +++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesKeyAction.java | 46 +++++++++++++ .../pojo/mes/repository/MesActionIfRepository.java | 14 ++++ .../pojo/mes/repository/MesIfRepository.java | 14 ++++ .../mes/repository/MesKeyActionRepository.java | 14 ++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 80 ++++++++++++++++++++++ 8 files changed, 290 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionIf.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesIf.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyAction.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesActionIfRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesIfRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKeyActionRepository.java 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 60a7aab..a5b5ece 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 @@ -13,6 +13,44 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { + + /** + * MesIf 交互方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IF_CONNECT_TYPE { + + DB("10", "DB"), + WEBSERVICE("20", "webservice "), + RESTFUL("30", "restful"); + + private String value; + private String description; + + IF_CONNECT_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + /** * Mes 工厂初始化数据 */ diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionIf.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionIf.java new file mode 100644 index 0000000..bbd7782 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionIf.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ACTION_IF") +@Api("动作接口配置") +public class MesActionIf extends BaseBean { + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesIf.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesIf.java new file mode 100644 index 0000000..1845202 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesIf.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:43 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_IF") +@Api("接口清单") +public class MesIf extends BaseBean { + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; + + @Column(name = "IF_NAME") + @ApiParam("接口名称") + private String ifName; + + @Column(name = "IF_CONNECT_TYPE") + @ApiParam("交互方式") + private String ifConnectType; + + @Column(name = "IF_CLASS") + @ApiParam("接口实现类") + private String ifClass; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyAction.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyAction.java new file mode 100644 index 0000000..d140412 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyAction.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:40 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_KEY_ACTION") +@Api("关键动作") +public class MesKeyAction extends BaseBean { + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "ACTION_NAME") + @ApiParam("动作名称") + private String actionName; + + @Column(name = "ACTION_DESC") + @ApiParam("动作描述") + private String actionDesc; + + @Column(name = "ACTION_CLASS") + @ApiParam("动作关联类") + private String actionClass; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesActionIfRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesActionIfRepository.java new file mode 100644 index 0000000..a12d42e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesActionIfRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesActionIf; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:53 + * @Modify: + **/ +public interface MesActionIfRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesIfRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesIfRepository.java new file mode 100644 index 0000000..89b9220 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesIfRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesIf; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:51 + * @Modify: + **/ +public interface MesIfRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKeyActionRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKeyActionRepository.java new file mode 100644 index 0000000..ee0a07e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKeyActionRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesKeyAction; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:50 + * @Modify: + **/ +public interface MesKeyActionRepository extends BaseRepository { +} 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 a7666ba..b71b09c 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 @@ -1746,4 +1746,84 @@ public class MesHqlPack { "createDatetime", packBean, true); return packBean; } + + /** + * 模板配置 + * @param mesLabelTemplate + * @param organizeCode + * @return + */ + public static DdlPackBean getMesLabelTemplate(MesLabelTemplate mesLabelTemplate, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesLabelTemplate, organizeCode); + if (!StringUtils.isEmpty(mesLabelTemplate.getTemplateCode())) { + DdlPreparedPack.getStringLikerPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean); + } + if (!StringUtils.isEmpty(mesLabelTemplate.getTemplateName())) { + DdlPreparedPack.getStringLikerPack(mesLabelTemplate.getTemplateName(), "codeType", packBean); + } + return packBean; + } + + /** + * 关键动作 + * @param mesKeyAction + * @param organizeCode + * @return + */ + public static DdlPackBean getMesKeyAction(MesKeyAction mesKeyAction, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesKeyAction, organizeCode); + if (!StringUtils.isEmpty(mesKeyAction.getActionCode())) { + DdlPreparedPack.getStringLikerPack(mesKeyAction.getActionCode(), "actionCode", packBean); + } + if (!StringUtils.isEmpty(mesKeyAction.getActionName())) { + DdlPreparedPack.getStringLikerPack(mesKeyAction.getActionName(), "actionName", packBean); + } + if (!StringUtils.isEmpty(mesKeyAction.getActionDesc())) { + DdlPreparedPack.getStringLikerPack(mesKeyAction.getActionDesc(), "actionDesc", packBean); + } + if (!StringUtils.isEmpty(mesKeyAction.getActionClass())) { + DdlPreparedPack.getStringLikerPack(mesKeyAction.getActionClass(), "actionClass", packBean); + } + return packBean; + } + + /** + * 动作接口配置 + * @param mesActionIf + * @param organizeCode + * @return + */ + public static DdlPackBean getMesActionIf(MesActionIf mesActionIf, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesActionIf, organizeCode); + if (!StringUtils.isEmpty(mesActionIf.getActionCode())) { + DdlPreparedPack.getStringLikerPack(mesActionIf.getActionCode(), "actionCode", packBean); + } + if (!StringUtils.isEmpty(mesActionIf.getIfCode())) { + DdlPreparedPack.getStringLikerPack(mesActionIf.getIfCode(), "ifCode", packBean); + } + return packBean; + } + + /** + * 接口清单 + * @param mesIf + * @param organizeCode + * @return + */ + public static DdlPackBean getMesIf(MesIf mesIf, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesIf, organizeCode); + if (!StringUtils.isEmpty(mesIf.getIfCode())) { + DdlPreparedPack.getStringLikerPack(mesIf.getIfCode(), "ifCode", packBean); + } + if (!StringUtils.isEmpty(mesIf.getIfName())) { + DdlPreparedPack.getStringLikerPack(mesIf.getIfName(), "ifName", packBean); + } + if (!StringUtils.isEmpty(mesIf.getIfConnectType())) { + DdlPreparedPack.getStringLikerPack(mesIf.getIfConnectType(), "ifConnectType", packBean); + } + if (!StringUtils.isEmpty(mesIf.getIfClass())) { + DdlPreparedPack.getStringLikerPack(mesIf.getIfClass(), "ifClass", packBean); + } + return packBean; + } } From bcc7c282ca72a140e2032fd6588d566881f85352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Wed, 13 Nov 2019 17:54:48 +0800 Subject: [PATCH 21/34] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E5=8D=95=E7=94=9F=E6=88=90=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) 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 75fc5ec..94d0925 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 @@ -4101,4 +4101,39 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 生产质检单的方式 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CREATE_QC_ORDER_TYPE { + BY_MOVE(10, "按库存移动单"), BY_PART(20, "按物料编号"); + + private int value; + private String description; + + CREATE_QC_ORDER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } } \ No newline at end of file From ebb59cbb647cf9055e5e0af97965d06ecf6d23b9 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 13 Nov 2019 18:47:52 +0800 Subject: [PATCH 22/34] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82:1167,?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=89=93=E5=8C=85=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java | 12 ++++++++---- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 12 ++++++++---- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java | 8 ++++---- .../java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 8 ++++++-- 5 files changed, 30 insertions(+), 14 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java index 6c4e5d3..2f6d04b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java @@ -63,10 +63,6 @@ public class MesPackage extends BaseBean { @ApiParam("是否封箱") private Integer isSealed; - @Transient - @ApiParam("封箱状态") - private String sealStatus; - @Column(name = "PRINT_STATUS") @ApiParam("打印状态10：未打印 20：已打印") private Integer printStatus; @@ -87,6 +83,14 @@ public class MesPackage extends BaseBean { @ApiParam("备注") private String memo; + @Transient + @ApiParam("封箱状态") + private String sealStatus; + + @Transient + @ApiParam("客户代码") + private String custCode; + public MesPackage() { } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java index 5f3fc77..18efe0e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java @@ -43,6 +43,10 @@ public class MesProdPack extends BaseBean { @ApiParam("产品标签模板") private String prodLabelTemplate; + @Column(name = "PACK_LABEL_TEMPLATE") + @ApiParam("包装标签模板") + private String packLabelTemplate; + @Column(name = "PACK_LABEL_TEMPLATE2") @ApiParam("包装标签模板2") private String packLabelTemplate2; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 3314cf6..6d4f2f2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -63,10 +63,6 @@ public class MesPackage extends BaseBean { @ApiParam("是否封箱") private Integer isSealed; - @Transient - @ApiParam("封箱状态") - private String sealStatus; - @Column(name = "PRINT_STATUS") @ApiParam("打印状态10：未打印 20：已打印") private Integer printStatus; @@ -87,4 +83,12 @@ public class MesPackage extends BaseBean { @ApiParam("备注") private String memo; + @Transient + @ApiParam("封箱状态") + private String sealStatus; + + @Transient + @ApiParam("客户代码") + private String custCode; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java index 50b9ecf..f8808b2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java @@ -43,14 +43,14 @@ public class MesProdPack extends BaseBean { @ApiParam("产品标签模板") private String prodLabelTemplate; - @Column(name = "PACK_LABEL_TEMPLATE2") - @ApiParam("包装标签模板2") - private String packLabelTemplate2; - @Column(name = "PACK_LABEL_TEMPLATE") @ApiParam("包装标签模板") private String packLabelTemplate; + @Column(name = "PACK_LABEL_TEMPLATE2") + @ApiParam("包装标签模板2") + private String packLabelTemplate2; + @Column(name = "PACK_LABEL_TEMPLATE3") @ApiParam("包装标签模板3") private String packLabelTemplate3; 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 d3489e6..bc3eab8 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 @@ -1175,8 +1175,12 @@ public class MesHqlPack { */ public static DdlPackBean getMesPcnTask(MesPcnTask mesPcnTask, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesPcnTask, organizeCode); - DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean); - DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean); + if (!StringUtils.isEmpty(mesPcnTask.getTaskCode())) { + DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean); + } + if (!StringUtils.isEmpty(mesPcnTask.getTaskName())) { + DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean); + } packBean.setOrderByStr(mesPcnTask.orderBy()); return packBean; } From 137e473543aeabb36d4843fa8e06c546ea2d2687 Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 13 Nov 2019 19:42:28 +0800 Subject: [PATCH 23/34] =?UTF-8?q?=E3=80=90=09EU=E7=BC=96=E7=BB=84=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91=E3=80=90=20334-=20EU=E7=BC=96=E7=BB=84?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=BB=84=E4=BB=B6=E5=92=8C=E5=87=BD?= =?UTF-8?q?=E6=95=B0=E5=A4=8D=E7=94=A8=E3=80=91=E3=80=901172EU=E7=BC=96?= =?UTF-8?q?=E7=BB=84=E7=AE=A1=E7=90=86-=E7=BB=84=E4=BB=B6=E5=92=8C?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E5=A4=8D=E7=94=A8=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) 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 0f8069f..af4689b 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 @@ -4105,4 +4105,42 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 编组管理操作类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PACKAGE_OPERATE_TYPE { + PACKAGE_ADD("PACKAGE_ADD", "新增"), + PACKAGE_ADDITIONAL("PACKAGE_ADDITIONAL", "追加"), + PACKAGE_DELETE("PACKAGE_DELETE", "删除"), + PACKAGE_CLEAR("PACKAGE_CLEAR", "清空"); + + private String value; + private String description; + + PACKAGE_OPERATE_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String getDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (val.equals(values()[i].value)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } \ No newline at end of file From aab18be0e6f0846af4611b7fb6ad7fdae66302d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 13 Nov 2019 20:04:32 +0800 Subject: [PATCH 24/34] =?UTF-8?q?Lac=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= =?UTF-8?q?=20OPC=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java index be98ac7..d64eb01 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java @@ -62,7 +62,8 @@ public class LacEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum HARDWARE_TYPE { OPC_READ(10, "读OPC"), - OPC_WRITE(20, "写OPC"); + OPC_WRITE(20, "写OPC"), + OPC_SUBSCRIPTION(30, "订阅OPC"); private int value; private String description; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java index 8471c44..e9cacb4 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java @@ -77,7 +77,7 @@ public class LacCommandStackStep extends BaseBean { private Double stepExecCond; @Column(name="STEP_DESCRIPTION") - @ApiParam(value ="步骤执行条件") + @ApiParam(value ="步骤描述") private String stepDescription; @Transient diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java index e39f612..6bb3a32 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java @@ -67,6 +67,9 @@ public class LacHqlPack { public static DdlPackBean packHqlLacSuitTask(LacSuitTask bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getStringLikerPack(bean.getTaskName(),"taskName",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getTaskCode(),"taskCode",ddlPackBean); + return ddlPackBean; } From 360f908ae464a37db08cc9ecffa1ee091a14fa41 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Wed, 13 Nov 2019 22:05:13 +0800 Subject: [PATCH 25/34] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=206283?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java | 5 +++++ .../cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java | 9 +++++++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java | 3 +++ 6 files changed, 28 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java index bf19863..0a93045 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java @@ -40,4 +40,8 @@ public class MesCustomerPart extends BaseBean { @ApiParam("客户零件号") private String customerPartNo; + @Column(name = "CUSTOMER_PART_NAME") + @ApiParam("客户零件描述") + private String customerPartName; + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java index 182a1d5..13d3a53 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java @@ -87,6 +87,11 @@ public class MesPackage extends BaseBean { @ApiParam("备注") private String memo; + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + public MesPackage() { } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java index 385a651..2d627aa 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java @@ -44,4 +44,13 @@ public class StepPrintSnModel extends MesProduceSn { @ApiParam("包装规格") private String packageSpec; + + @ApiParam("供应商") + private String supplier; + + @ApiParam("客户名称") + private String customerName; + + @ApiParam("客户物料名称") + private String customerPartName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java index 31e9109..b66a21c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java @@ -40,4 +40,7 @@ public class MesCustomerPart extends BaseBean { @ApiParam("客户零件号") private String customerPartNo; + @Column(name = "CUSTOMER_PART_NAME") + @ApiParam("客户零件描述") + private String customerPartName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 3314cf6..36e391c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -87,4 +87,8 @@ public class MesPackage extends BaseBean { @ApiParam("备注") private String memo; + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java index 3dafd66..49f72e3 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java @@ -32,6 +32,9 @@ public class StationRequestBean implements Serializable { @ApiParam("组织代码") private String organizeCode; + @ApiParam("组织名称") + private String organizeName; + @ApiParam("工作中心代码") private String workCenterCode; From 21375ed6f46d7f652d6dcd2b0964317f45b2eba7 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 14 Nov 2019 13:11:42 +0800 Subject: [PATCH 26/34] =?UTF-8?q?=E3=80=90=E8=B6=85=E7=BA=A7=E7=A7=BB?= =?UTF-8?q?=E5=BA=93=E3=80=91bug6295?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 5 +++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 7dc5ac8..d204e7e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -197,6 +197,11 @@ public class WmsDocMovementDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description") private Integer orderMasterStatus; + @Transient + @ApiParam("打印状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description") + private Integer printStatus; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 82bfeeb..5705251 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -126,6 +126,11 @@ public class WmsDocMovementMaster extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") private Integer isPart; + @Column(name = "PRINT_STATUS") + @ApiParam("打印状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description") + private Integer printStatus; + @Column(name = "SRC_WH_NO") @ApiParam("源仓库代码") public String assignSrcWhNo; From 58b0f4a531e0db47e3de0cd2f392808b37fe061a Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 14 Nov 2019 13:27:49 +0800 Subject: [PATCH 27/34] =?UTF-8?q?=E6=96=B0=E5=A2=9EBOM=E6=A0=91=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E8=8E=B7=E5=8F=96=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/aps/annotation/FieldAnnotation.java | 4 +- .../pojo/aps/bean/AssistResourceSetTime.java | 4 +- .../cn/estsh/i3plus/pojo/aps/bean/BaseRule.java | 2 + .../cn/estsh/i3plus/pojo/aps/bean/BomTree.java | 46 + .../cn/estsh/i3plus/pojo/aps/bean/DataLink.java | 8 +- .../estsh/i3plus/pojo/aps/bean/DynamicSetTime.java | 17 +- .../cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 13 +- .../estsh/i3plus/pojo/aps/bean/FieldSetRule.java | 5 +- .../i3plus/pojo/aps/bean/FurnaceCapacity.java | 46 + .../cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java | 13 + .../estsh/i3plus/pojo/aps/bean/FurnaceSetting.java | 42 + .../estsh/i3plus/pojo/aps/bean/HeuristicRule.java | 2 + .../estsh/i3plus/pojo/aps/bean/ImportDetail.java | 5 +- .../cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java | 9 +- .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 13 +- .../i3plus/pojo/aps/bean/MaterialSetTime.java | 2 + .../cn/estsh/i3plus/pojo/aps/bean/OperInput.java | 5 +- .../estsh/i3plus/pojo/aps/bean/OperResource.java | 5 +- .../cn/estsh/i3plus/pojo/aps/bean/Operation.java | 6 +- .../cn/estsh/i3plus/pojo/aps/bean/OrderTree.java | 52 + .../i3plus/pojo/aps/bean/OvertimeCalendar.java | 4 +- .../estsh/i3plus/pojo/aps/bean/ProductOrder.java | 7 +- .../estsh/i3plus/pojo/aps/bean/ProductRouting.java | 1 + .../estsh/i3plus/pojo/aps/bean/PurchaseOrder.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java | 8 +- .../cn/estsh/i3plus/pojo/aps/bean/Resource.java | 23 +- .../cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java | 8 +- .../cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java | 4 +- .../estsh/i3plus/pojo/aps/bean/ShippingTime.java | 1 + .../estsh/i3plus/pojo/aps/bean/StandOperation.java | 15 +- .../cn/estsh/i3plus/pojo/aps/bean/SysParam.java | 6 +- .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 13 +- .../cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 17 +- .../estsh/i3plus/pojo/aps/bean/WorkRelation.java | 8 +- .../estsh/i3plus/pojo/aps/bean/WorkResource.java | 5 +- .../cn/estsh/i3plus/pojo/aps/common/BeanInfo.java | 33 +- .../estsh/i3plus/pojo/aps/enums/CALENDAR_TYPE.java | 13 - .../estsh/i3plus/pojo/aps/enums/CALENDAR_WEEK.java | 21 - .../i3plus/pojo/aps/enums/CONSTRAINT_TYPE.java | 15 - .../i3plus/pojo/aps/enums/DATA_LINK_TYPE.java | 8 - .../cn/estsh/i3plus/pojo/aps/enums/DIRECTION.java | 13 - .../i3plus/pojo/aps/enums/DYNAMIC_SET_CALC.java | 7 - .../i3plus/pojo/aps/enums/DYNAMIC_SET_TYPE.java | 7 - .../cn/estsh/i3plus/pojo/aps/enums/EDIT_TYPE.java | 28 - .../i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java | 14 +- .../cn/estsh/i3plus/pojo/aps/enums/FIELD_TYPE.java | 27 - .../i3plus/pojo/aps/enums/IMPORT_DETAIL_TYPE.java | 6 - .../pojo/aps/enums/MATERIAL_ASSIGN_LIMIT.java | 22 - .../estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java | 15 - .../i3plus/pojo/aps/enums/ORDER_DEL_LIMIT.java | 16 - .../cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java | 15 - .../estsh/i3plus/pojo/aps/enums/PREPARE_TYPE.java | 14 - .../i3plus/pojo/aps/enums/REPLENISHMENT_TYPE.java | 14 - .../pojo/aps/enums/RESOURCE_CHOISE_RULE.java | 22 - .../i3plus/pojo/aps/enums/RESOURCE_CLASS.java | 14 - .../i3plus/pojo/aps/enums/RESOURCE_LOCK_TYPE.java | 7 - .../estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java | 13 - .../i3plus/pojo/aps/enums/RES_COMB_LOCK_TYPE.java | 14 - .../i3plus/pojo/aps/enums/RES_COMB_TIME_TYPE.java | 18 - .../i3plus/pojo/aps/enums/ROUTING_VALID_TYPE.java | 14 - .../cn/estsh/i3plus/pojo/aps/enums/RULE_TYPE.java | 8 - .../cn/estsh/i3plus/pojo/aps/enums/TAIL_DEAL.java | 14 - .../i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java | 14 - .../cn/estsh/i3plus/pojo/aps/enums/USE_TYPE.java | 18 - .../i3plus/pojo/aps/enums/WORK_PLAN_TYPE.java | 7 - .../i3plus/pojo/aps/enums/WORK_RELATION_TYPE.java | 13 - .../i3plus/pojo/aps/enums/WORK_SORT_RULE.java | 31 - .../i3plus/pojo/aps/enums/WORK_SPLIT_TYPE.java | 8 - .../estsh/i3plus/pojo/aps/enums/WORK_STATUS.java | 17 - .../cn/estsh/i3plus/pojo/aps/enums/WORK_TYPE.java | 13 - .../estsh/i3plus/pojo/aps/holders/EBaseOrder.java | 3 + .../cn/estsh/i3plus/pojo/aps/model/BomModel.java | 24 + .../pojo/aps/model/ExchangeBeanOrderNumber.java | 19 + .../aps/repository/IFurnaceCapacityRepository.java | 9 + .../aps/repository/IFurnaceSettingRepository.java | 9 + .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 1001 ++++++++++++++++++++ 76 files changed, 1421 insertions(+), 597 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CALENDAR_TYPE.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CALENDAR_WEEK.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CONSTRAINT_TYPE.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DATA_LINK_TYPE.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DIRECTION.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_CALC.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_TYPE.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EDIT_TYPE.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/FIELD_TYPE.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/IMPORT_DETAIL_TYPE.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_ASSIGN_LIMIT.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/ORDER_DEL_LIMIT.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PREPARE_TYPE.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/REPLENISHMENT_TYPE.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CLASS.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_LOCK_TYPE.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RES_COMB_LOCK_TYPE.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RES_COMB_TIME_TYPE.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/ROUTING_VALID_TYPE.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RULE_TYPE.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TAIL_DEAL.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/USE_TYPE.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_PLAN_TYPE.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_RELATION_TYPE.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SPLIT_TYPE.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_STATUS.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_TYPE.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/BomModel.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ExchangeBeanOrderNumber.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IFurnaceCapacityRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IFurnaceSettingRepository.java create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java index 48942c2..1c14524 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java @@ -1,6 +1,6 @@ package cn.estsh.i3plus.pojo.aps.annotation; -import cn.estsh.i3plus.pojo.aps.enums.EDIT_TYPE; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -24,7 +24,7 @@ public @interface FieldAnnotation { boolean mainkey() default false; // 是否为主键 String defaultValue() default ""; // 字段的默认值 boolean popSearch() default false; // 弹出选择对象时是否显示 - EDIT_TYPE editType() default EDIT_TYPE.NONE; // 定义字段的编辑类型 + ApsEnumUtil.EDIT_TYPE editType() default ApsEnumUtil.EDIT_TYPE.NONE; // 定义字段的编辑类型 Class multiEnumClass() default Object.class; // 多选枚举的类型。 String typeName() default ""; // 定义字段类型的简单名称，对于多选关联对象时有用。 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java index 43a7d40..21dd6e1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; -import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -28,7 +28,7 @@ public class AssistResourceSetTime extends BaseAPS { @Column(name="TYPE") @ApiParam(value ="副资源使用类型") - private USE_TYPE type; + private ApsEnumUtil.USE_TYPE type; @Column(name="PREV_RESOURCE") @ApiParam(value ="前资源编码") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java index ff8a94e..456ed09 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -21,5 +22,6 @@ import javax.persistence.MappedSuperclass; public class BaseRule extends BaseAPS { @Column(name="CODE") @ApiParam(value ="规则编码") + @FieldAnnotation(popSearch = true, mainkey = true) private String code; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java new file mode 100644 index 0000000..a802118 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description :BOM树 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ +@Data +@Api("BOM树") +public class BomTree extends BaseAPS { + + @ApiParam(value ="物料类型") + private ApsEnumUtil.MATERIAL_TYPE type; + + @ApiParam(value ="备料类型") + private ApsEnumUtil.PREPARE_TYPE prepareType; + + @ApiParam(value ="补充类型") + private ApsEnumUtil.REPLENISHMENT_TYPE replType; + + @ApiParam(value ="采购提前期") + private String purchaseLeadTime; + + @ApiParam(value ="制造提前期") + private String manufLeadTime; + + @ApiParam(value ="配送提前期") + private String shipmentLeadTime; + + @ApiParam(value ="单位采购量") + private Integer unitPurchase; + + @ApiParam(value ="单位制造量") + private Integer unitManuf; + + @ApiParam(value ="单位配送量") + private Integer unitShipment; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java index 3486531..1f2edb3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; -import cn.estsh.i3plus.pojo.aps.enums.DATA_LINK_TYPE; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -22,13 +22,13 @@ import javax.persistence.Table; @Table(name = "APS_DATA_LINK") @Api("数据集成数据连接信息") public class DataLink extends BaseAPS { - @Column(name="NAME") + @Column(name="CODE") @ApiParam(value ="编码") - private String name; + private String code; @Column(name="TYPE") @ApiParam(value ="链接类型") - private DATA_LINK_TYPE type; + private ApsEnumUtil.DATA_LINK_TYPE type; @Column(name="PATH") @ApiParam(value ="IP/文件路径") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java index cef57c9..34c1a8e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java @@ -1,8 +1,8 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; -import cn.estsh.i3plus.pojo.aps.enums.DYNAMIC_SET_CALC; -import cn.estsh.i3plus.pojo.aps.enums.DYNAMIC_SET_TYPE; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -29,7 +29,8 @@ public class DynamicSetTime extends BaseAPS { @Column(name="TYPE") @ApiParam(value ="应用工作计划类型") - private DYNAMIC_SET_TYPE type; + @FieldAnnotation(defaultValue = "ALL") + private ApsEnumUtil.DYNAMIC_SET_TYPE type; @Column(name="CONSIDER_ASS_RES") @ApiParam(value ="是否启用副资源动态设置时间") @@ -41,17 +42,21 @@ public class DynamicSetTime extends BaseAPS { @Column(name="ASS_RES_CALC") @ApiParam(value ="副资源动态设置计算方式") - private DYNAMIC_SET_CALC assResCalc; + @FieldAnnotation(defaultValue = "MAX") + private ApsEnumUtil.DYNAMIC_SET_CALC assResCalc; @Column(name="MATERIAL_CALC") @ApiParam(value ="物料动态设置时间计算方式") - private DYNAMIC_SET_CALC materialCalc; + @FieldAnnotation(defaultValue = "MAX") + private ApsEnumUtil.DYNAMIC_SET_CALC materialCalc; @Column(name="STATIC_CALC") @ApiParam(value ="与静态设置时间计算方式") - private DYNAMIC_SET_CALC staticCalc; + @FieldAnnotation(defaultValue = "MAX") + private ApsEnumUtil.DYNAMIC_SET_CALC staticCalc; @Column(name="PRIORITY") @ApiParam(value ="优先级") + @FieldAnnotation(defaultValue = "10") private int priority; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index e155d1e..30da6eb 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java @@ -1,9 +1,8 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseCode; -import cn.estsh.i3plus.pojo.aps.enums.EDIT_TYPE; -import cn.estsh.i3plus.pojo.aps.enums.FIELD_TYPE; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -39,7 +38,7 @@ public class FieldInfo extends BaseCode { @Column(name="TYPE") @ApiParam(value ="类型") - private FIELD_TYPE type; + private ApsEnumUtil.FIELD_TYPE type; @Column(name="TYPE_NAME") @ApiParam(value ="类型名称") @@ -73,9 +72,9 @@ public class FieldInfo extends BaseCode { @ApiParam(value ="表达式") private String expression; - @Column(name="POSITION") - @ApiParam(value ="位置") - private Integer position; + @Column(name="ORDER_NUMBER") + @ApiParam(value ="序号") + private Integer orderNumber; @Column(name="MAIN_KEY") @ApiParam(value ="主键标识") @@ -95,7 +94,7 @@ public class FieldInfo extends BaseCode { @Column(name="EDIT_TYPE") @ApiParam(value ="字段编辑类型") - private EDIT_TYPE editType; + private ApsEnumUtil.EDIT_TYPE editType; @ApiParam(value ="枚举项内容") private transient Enum[] enumItems; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java index 529fbf2..4e3677d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -20,9 +21,9 @@ import javax.persistence.Table; @Table(name = "APS_FIELD_SET_RULE") @Api("属性赋值规则") public class FieldSetRule extends BaseRule { - @Column(name="BEAN_NAME") + @Column(name="BEAN") @ApiParam(value ="实体名") - private String beanName; + private ApsEnumUtil.FIELD_SET_BEAN bean; @Column(name="FILTER") @ApiParam(value ="筛选") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java new file mode 100644 index 0000000..cdf99a2 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :炉资源容量限制 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-10-22 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="APS_FURNACE_CAPACITY") +@Api("炉容量") +public class FurnaceCapacity extends BaseAPS { + + @Column(name="RES_CODES") + @ApiParam(value ="资源编码") + private String resCodes; + + @Column(name="STAND_CODE") + @ApiParam(value ="标准工序编码") + private String standCode; + + @Column(name="MATERIAL_CODE") + @ApiParam(value ="物料编码") + private String materialCode; + + @Column(name="CAPACITY") + @ApiParam(value ="容量限制") + private Double capacity; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java index 0d0a2fa..ae52fcc 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java @@ -1,14 +1,20 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EFurnacePlan; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description :炉资源计划信息，用来关联组在一起的工作计划 @@ -25,4 +31,11 @@ import javax.persistence.Table; @Table(name="APS_FURNACE_PLAN") @Api("炉资源计划") public class FurnacePlan extends BaseAPS { + + @Column(name="CAPACITY") + @ApiParam(value ="已占用的能力") + private Double capacity; + + @JsonBackReference + public List getWorkPlans() { return BeanRelation.list(this, EFurnacePlan.WorkPlans); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java new file mode 100644 index 0000000..af4ca6f --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :炉资源计划信息，用来关联组在一起的工作计划 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-10-22 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="APS_FURNACE_SETTING") +@Api("组炉设置") +public class FurnaceSetting extends BaseAPS { + + @Column(name="RES_CODES") + @ApiParam(value ="资源编码") + private String resCodes; + + @Column(name="SAME_MATERIAL") + @ApiParam(value ="相同物料组炉") + private Boolean sameMaterial; + + @Column(name="SAME_STAND_OPERATION") + @ApiParam(value ="相同标准工序组炉") + private Boolean sameStandOperation; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java index 69785bf..e65c965 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -34,6 +35,7 @@ public class HeuristicRule extends BaseRule { @Column(name="INSERT_IDLE") @ApiParam(value ="是否插入空闲") + @FieldAnnotation(defaultValue = "true") private Boolean insertIdle; @Column(name="BATCH_PERIOD") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java index 0cfc671..872c9e3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java @@ -3,8 +3,8 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; -import cn.estsh.i3plus.pojo.aps.enums.IMPORT_DETAIL_TYPE; import cn.estsh.i3plus.pojo.aps.holders.EImportDetail; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -27,7 +27,8 @@ import javax.persistence.Table; public class ImportDetail extends BaseAPS { @Column(name="TYPE") @ApiParam(value ="导入类型") - private IMPORT_DETAIL_TYPE type; + @FieldAnnotation(defaultValue = "REPLACE") + private ApsEnumUtil.IMPORT_DETAIL_TYPE type; @Column(name="OUT_NAME") @ApiParam(value ="外部表名") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java index b350517..31e3941 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java @@ -1,12 +1,10 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; -import cn.estsh.i3plus.pojo.aps.enums.EDIT_TYPE; -import cn.estsh.i3plus.pojo.aps.enums.ORDER_DEL_LIMIT; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import org.hibernate.annotations.Fetch; import javax.persistence.Column; import javax.persistence.Entity; @@ -38,12 +36,13 @@ public class MatCalcRule extends BaseRule { @Column(name="DEL_AUTO") @ApiParam(value ="自动删除补充订单") + @FieldAnnotation(defaultValue = "true") private Boolean delAuto; @Column(name="DEL_LIMIT") @ApiParam(value ="删除补充订单限制条件") @FieldAnnotation(defaultValue = "NONE") - private ORDER_DEL_LIMIT delLimit; + private ApsEnumUtil.ORDER_DEL_LIMIT delLimit; @Column(name="KEEP_RELATION") @ApiParam(value ="保持关联") @@ -59,7 +58,7 @@ public class MatCalcRule extends BaseRule { @Column(name="ASSIGN_LIMIT") @ApiParam(value ="物料分配制约") - @FieldAnnotation(editType = EDIT_TYPE.MULTI_ENUM, defaultValue = "NONE") + @FieldAnnotation(multiEnumClass = ApsEnumUtil.MATERIAL_ASSIGN_LIMIT.class) private Integer assignLimit; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index 7b7ba76..66199b2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -4,10 +4,8 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; -import cn.estsh.i3plus.pojo.aps.enums.MATERIAL_TYPE; -import cn.estsh.i3plus.pojo.aps.enums.PREPARE_TYPE; -import cn.estsh.i3plus.pojo.aps.enums.REPLENISHMENT_TYPE; import cn.estsh.i3plus.pojo.aps.holders.EMaterial; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -31,18 +29,19 @@ import java.util.List; @Api("物料") public class Material extends BaseCode { @Column(name="TYPE") - @ApiParam(value ="类型") + @ApiParam(value ="物料类型") @FieldAnnotation(defaultValue = "PRODUCT") - private MATERIAL_TYPE type; + private ApsEnumUtil.MATERIAL_TYPE type; @Column(name="PREPARE_TYPE") @ApiParam(value ="备料类型") @FieldAnnotation(defaultValue = "SELF_MAKE") - private PREPARE_TYPE prepareType; + private ApsEnumUtil.PREPARE_TYPE prepareType; @Column(name="REPL_TYPE") @ApiParam(value ="补充类型") - private REPLENISHMENT_TYPE replType; + @FieldAnnotation(defaultValue = "ONEBYONE") + private ApsEnumUtil.REPLENISHMENT_TYPE replType; @Column(name="PURCHASE_LEAD_TIME") @ApiParam(value ="采购提前期") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java index d437b48..facf9b4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -39,5 +40,6 @@ public class MaterialSetTime extends BaseAPS { @Column(name="PRIORITY") @ApiParam(value ="优先级") + @FieldAnnotation(defaultValue = "10") private int priority; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java index ef5aac9..3f4d265 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java @@ -3,8 +3,8 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; -import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE; import cn.estsh.i3plus.pojo.aps.holders.EOperInput; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -41,7 +41,8 @@ public class OperInput extends BaseAPS { @Column(name="CONS_TYPE") @ApiParam(value ="接续方式") - private CONSTRAINT_TYPE consType; + @FieldAnnotation(defaultValue = "ES") + private ApsEnumUtil.CONSTRAINT_TYPE consType; @Column(name="MAX_SPACE_TIME") @ApiParam(value ="最大时间间隔") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java index 483dac0..a877505 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java @@ -3,8 +3,8 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; -import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE; import cn.estsh.i3plus.pojo.aps.holders.EOperResource; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -29,7 +29,8 @@ import java.util.List; public class OperResource extends BaseAPS { @Column(name="USE_TYPE") @ApiParam(value ="使用类型") - private USE_TYPE useType; + @FieldAnnotation(defaultValue = "MAIN") + private ApsEnumUtil.USE_TYPE useType; @Column(name="PREV_TIME") @ApiParam(value ="前设置时间") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java index e14540e..5b1d730 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java @@ -3,9 +3,8 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; -import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE; -import cn.estsh.i3plus.pojo.aps.enums.TAIL_DEAL; import cn.estsh.i3plus.pojo.aps.holders.EOperation; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -59,7 +58,8 @@ public class Operation extends BaseAPS { @Column(name="CONS_TYPE") @ApiParam(value ="接续方式") - private CONSTRAINT_TYPE consType; + @FieldAnnotation(defaultValue = "ES") + private ApsEnumUtil.CONSTRAINT_TYPE consType; @Column(name="MAX_SPACE_TIME") @ApiParam(value ="最大时间间隔") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java new file mode 100644 index 0000000..b1a449a --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; +import java.util.Date; + + +/** + * @Description :订单树 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ +@Data +@Api("订单树") +public class OrderTree extends BaseAPS { + @ApiParam(value ="物料编码") + private String material; + + @ApiParam(value ="数量") + private Double count; + + @ApiParam(value ="最晚结束时刻") + private Date let; + + @ApiParam(value ="最早开始时刻计算值") + private Date calcEst; + + @ApiParam(value ="最晚结束时刻计算值") + private Date calcLet; + + @ApiParam(value ="计划开始") + private Date planBegin; + + @ApiParam(value ="计划结束") + private Date planEnd; + + @ApiParam(value ="接单日期") + private Date receiveDate; + + @ApiParam(value ="优先级") + private Integer priority; + + @ApiParam(value ="专料号") + private String specifyMaterialNum; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java index 1c17473..884adbd 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; -import cn.estsh.i3plus.pojo.aps.enums.CALENDAR_TYPE; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -37,5 +37,5 @@ public class OvertimeCalendar extends BaseAPS { @Column(name="TYPE") @ApiParam(value ="类型") - private CALENDAR_TYPE type; + private ApsEnumUtil.CALENDAR_TYPE type; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index a006cdf..7175b15 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -40,11 +40,11 @@ public class ProductOrder extends BaseOrder { private Date specifyLet; @Column(name="LOW_EST") - @ApiParam(value ="低阶最早开始时间") + @ApiParam(value ="底阶最早开始时间") private Date lowEst; @Column(name="SPECIFY_LOW_EST") - @ApiParam(value ="指定低阶最早开始时间") + @ApiParam(value ="指定底阶最早开始时间") private Date specifyLowEst; @Column(name="SPECIFY_ROUTING") @@ -53,10 +53,12 @@ public class ProductOrder extends BaseOrder { @Column(name="RESYNCHRONIZE") @ApiParam(value ="是否同步") + @FieldAnnotation(defaultValue = "true") private Boolean resynchronize; @Column(name="RECALC_COUNT") @ApiParam(value ="是否重新计算数量") + @FieldAnnotation(defaultValue = "true") private Boolean recalcCount; @Column(name="SPECIFY_TOP_ORDER") @@ -92,6 +94,7 @@ public class ProductOrder extends BaseOrder { @Column(name="AUTO_SUPPLY") @ApiParam(value ="物料计算时自动补充") + @FieldAnnotation(defaultValue = "true") private Boolean autoSupply; @Column(name="PRODUCT_ROUTING_ID") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java index 92c4fa2..74a3b60 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java @@ -37,6 +37,7 @@ public class ProductRouting extends BaseCode { @Column(name="PRIORITY") @ApiParam(value ="优先级") + @FieldAnnotation(defaultValue = "10") private Integer priority; @Column(name="MATERIAL_ID") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java index f784093..21eed1b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java @@ -52,6 +52,7 @@ public class PurchaseOrder extends BaseOrder { @Column(name="AUTO_SUPPLY") @ApiParam(value ="物料计算时自动补充") + @FieldAnnotation(defaultValue = "true") private Boolean autoSupply; @JsonIgnore diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java index fd7bd8f..cc889e3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java @@ -3,9 +3,8 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; -import cn.estsh.i3plus.pojo.aps.enums.CALENDAR_WEEK; -import cn.estsh.i3plus.pojo.aps.enums.EDIT_TYPE; import cn.estsh.i3plus.pojo.aps.holders.EResCalendar; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -30,12 +29,12 @@ import java.util.List; public class ResCalendar extends BaseAPS { @Column(name="RES_CODES") @ApiParam(value ="资源代码") - @FieldAnnotation(editType = EDIT_TYPE.MULTI_OBJECT, typeName = "Resource") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource") private String resCodes; @Column(name="WEEKS") @ApiParam(value ="星期") - @FieldAnnotation(multiEnumClass = CALENDAR_WEEK.class) + @FieldAnnotation(multiEnumClass = ApsEnumUtil.CALENDAR_WEEK.class) private Integer weeks; @Column(name="DATES") @@ -48,6 +47,7 @@ public class ResCalendar extends BaseAPS { @Column(name="PRIORITY") @ApiParam(value ="优先级") + @FieldAnnotation(defaultValue = "10") private Integer priority; @JsonBackReference diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index 1e4576f..903874d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -1,12 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; -import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_CLASS; -import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_LOCK_TYPE; -import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_TYPE; -import cn.estsh.i3plus.pojo.aps.enums.TIME_ROUND_TYPE; +import cn.estsh.i3plus.pojo.aps.enums.*; import cn.estsh.i3plus.pojo.aps.holders.EResource; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -35,14 +34,17 @@ public class Resource extends BaseCode { @Column(name="TYPE") @ApiParam(value ="资源类型") - private RESOURCE_TYPE type; + @FieldAnnotation(defaultValue = "MAIN") + private ApsEnumUtil.RESOURCE_TYPE type; @Column(name="RES_CLASS") @ApiParam(value ="资源区分") - private RESOURCE_CLASS resClass; + @FieldAnnotation(defaultValue = "SINGLE") + private ApsEnumUtil.RESOURCE_CLASS resClass; @Column(name="EFFICIENCY") @ApiParam(value ="生产效率") + @FieldAnnotation(defaultValue = "1.0") private Double efficiency; @Column(name="PREV_BUFFER") @@ -79,23 +81,28 @@ public class Resource extends BaseCode { @Column(name="ROUND_TYPE") @ApiParam(value ="时间与时间尾数圆整类型") - private TIME_ROUND_TYPE roundType; + @FieldAnnotation(defaultValue = "ROUNDING") + private ApsEnumUtil.TIME_ROUND_TYPE roundType; @Column(name="EFFICIENCY_EFFECT") @ApiParam(value ="效率影响类型") + @FieldAnnotation(multiEnumClass = EFFICIENCY_EFFECT.class) private Integer EfficiencyEffect; @Column(name="TIME_ROUND") @ApiParam(value ="时间圆整影响") + @FieldAnnotation(multiEnumClass = EFFICIENCY_EFFECT.class) private Integer timeRound; @Column(name="TIME_TAIL_ROUND") @ApiParam(value ="时间尾数影响") + @FieldAnnotation(multiEnumClass = EFFICIENCY_EFFECT.class) private Integer timeTailRound; @Column(name="LOCK_TYPE") @ApiParam(value ="锁定类型") - private RESOURCE_LOCK_TYPE lockType; + @FieldAnnotation(defaultValue = "NONE") + private ApsEnumUtil.RESOURCE_LOCK_TYPE lockType; @Column(name="LOCK_TIME") @ApiParam(value ="锁定时间长度") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java index 7ae8cbf..d019c4d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java @@ -3,8 +3,8 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; -import cn.estsh.i3plus.pojo.aps.enums.RULE_TYPE; import cn.estsh.i3plus.pojo.aps.holders.ERuleDetail; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -28,7 +28,11 @@ public class RuleDetail extends BaseAPS { @Column(name="TYPE") @ApiParam(value ="规则类型") - private RULE_TYPE type; + private ApsEnumUtil.RULE_TYPE type; + + @Column(name="ORDER_NUMBER") + @ApiParam(value ="序号") + private Integer orderNumber; @Column(name="RULE_GROUP_ID") @ApiParam(value ="规则组合ID") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java index dc63b89..66a5337 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java @@ -26,11 +26,11 @@ import java.util.Date; @Api("销售订单") public class SalesOrder extends BaseOrder { @Column(name="LOW_EST") - @ApiParam(value ="低阶最早开始时间") + @ApiParam(value ="底阶最早开始时间") private Date lowEst; @Column(name="SPECIFY_LOW_EST") - @ApiParam(value ="指定低价最早开始时间") + @ApiParam(value ="指定底阶最早开始时间") private Date specifyLowEst; @Column(name="SPECIFY_LET") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java index cfffda0..de87386 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java @@ -30,6 +30,7 @@ public class ShippingTime extends BaseAPS { @Column(name="PRIORITY") @ApiParam(value ="优先级") + @FieldAnnotation(defaultValue = "10") private Integer priority; @Column(name="PREV_RES_CODE") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index cabd90a..7e6aeb4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -1,10 +1,8 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseCode; -import cn.estsh.i3plus.pojo.aps.enums.DIRECTION; -import cn.estsh.i3plus.pojo.aps.enums.RES_COMB_LOCK_TYPE; -import cn.estsh.i3plus.pojo.aps.enums.RES_COMB_TIME_TYPE; -import cn.estsh.i3plus.pojo.aps.enums.TAIL_DEAL; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -39,13 +37,16 @@ public class StandOperation extends BaseCode { @Column(name="DIRECTION") @ApiParam(value ="排程方向") - private DIRECTION direction; + @FieldAnnotation(defaultValue = "POSITIVE") + private ApsEnumUtil.DIRECTION direction; @Column(name="COMB_TYPE") @ApiParam(value ="生产组合方式") - private RES_COMB_TIME_TYPE combType; + @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE") + private ApsEnumUtil.RES_COMB_TIME_TYPE combType; @Column(name="LOCK_TYPE") @ApiParam(value ="锁定组合方式") - private RES_COMB_LOCK_TYPE lockType; + @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE") + private ApsEnumUtil.RES_COMB_LOCK_TYPE lockType; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index 4f68bf4..68e1ddf 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; -import cn.estsh.i3plus.pojo.aps.enums.ROUTING_VALID_TYPE; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -30,11 +30,13 @@ public class SysParam extends BaseAPS { @Column(name="MAX_INTERRUPT_COUNT") @ApiParam(value ="最大中断次数") + @FieldAnnotation(defaultValue = "20") private Integer maxInterruptCount; @Column(name="TYPE") @ApiParam(value ="工艺路径有效判断类型") - private ROUTING_VALID_TYPE type; + @FieldAnnotation(defaultValue = "CALC_LET_LT") + private ApsEnumUtil.ROUTING_VALID_TYPE type; @Column(name="RULE_GROUP_ID") @ApiParam(value ="规则组id") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 5e68d01..4e64725 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -3,9 +3,8 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; -import cn.estsh.i3plus.pojo.aps.enums.WORK_STATUS; -import cn.estsh.i3plus.pojo.aps.enums.WORK_TYPE; import cn.estsh.i3plus.pojo.aps.holders.EWork; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -32,7 +31,7 @@ public class Work extends BaseCode { @Column(name="WORK_TYPE") @ApiParam(value ="工作类型") @FieldAnnotation(modify = false) - private WORK_TYPE workType; + private ApsEnumUtil.WORK_TYPE workType; @Column(name="count") @ApiParam(value ="数量") @@ -47,9 +46,9 @@ public class Work extends BaseCode { @ApiParam(value ="指定资源") private String specifyResource; - @Column(name="SPECIFY_MANUF_TIME") + @Column(name="SPECIFY_PRODUCE_TIME") @ApiParam(value ="指定制造时间") - private String specifyManufTime; + private String specifyProduceTime; @Column(name="SPECIFY_PREV_TIME") @ApiParam(value ="指定前设置时间") @@ -87,7 +86,7 @@ public class Work extends BaseCode { @Column(name="WORK_STATUS") @ApiParam(value ="工作状态") - private WORK_STATUS workStatus; + private ApsEnumUtil.WORK_STATUS workStatus; @Column(name="PLAN_BEGIN") @ApiParam(value ="计划开始时间") @@ -105,7 +104,7 @@ public class Work extends BaseCode { private String planResource; @Column(name="FIX_SPLIT") - @ApiParam(value ="已分割的工作是否重新分割") + @ApiParam(value ="已分割的工作是否固定") private Boolean fixSplit; @Column(name="NEED_PREV_COUNT") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index f3e64de..e0b655c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -4,9 +4,8 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; -import cn.estsh.i3plus.pojo.aps.enums.WORK_PLAN_TYPE; import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan; -import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -38,7 +37,7 @@ public class WorkPlan extends BaseAPS { @Column(name="TYPE") @ApiParam(value ="工作计划类型") @FieldAnnotation(modify = false, display = false) - private WORK_PLAN_TYPE type; + private ApsEnumUtil.WORK_PLAN_TYPE type; @Column(name="PREV_SET_BEGIN") @ApiParam(value ="前设置开始时间") @@ -123,6 +122,11 @@ public class WorkPlan extends BaseAPS { @FieldAnnotation(property = false) private Long mainPlanId; + @Column(name="FURNACE_PLAN_ID") + @ApiParam(value ="炉资源计划对象id") + @FieldAnnotation(property = false) + private Long furnacePlanId; + public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); } public void setWork(Work work) { @@ -152,4 +156,11 @@ public class WorkPlan extends BaseAPS { } public List getAssPlans() { return BeanRelation.list(this, EWorkPlan.AssPlans); } + + public FurnacePlan getFurnacePlan() { return BeanRelation.get(this, EWorkPlan.FurnacePlan); } + + public void setFurnacePlan(FurnacePlan plan) { + this.furnacePlanId = plan != null ? plan.getId() : 0; + BeanRelation.set(this, EWorkPlan.FurnacePlan, plan); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java index e4d86da..13aa2cc 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java @@ -3,10 +3,8 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; -import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE; -import cn.estsh.i3plus.pojo.aps.enums.WORK_RELATION_TYPE; -import cn.estsh.i3plus.pojo.aps.holders.EWork; import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -30,12 +28,12 @@ public class WorkRelation extends BaseAPS { @Column(name="TYPE") @ApiParam(value ="关联类型") @FieldAnnotation(modify = false) - private WORK_RELATION_TYPE type; + private ApsEnumUtil.WORK_RELATION_TYPE type; @Column(name="CONS_TYPE") @ApiParam(value ="接续方式") @FieldAnnotation(modify = false) - private CONSTRAINT_TYPE consType; + private ApsEnumUtil.CONSTRAINT_TYPE consType; @Column(name="MAX_SPACE_TIME") @ApiParam(value ="最大间隔时间") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java index 638b6e8..16a577f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java @@ -3,9 +3,8 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; -import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE; -import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation; import cn.estsh.i3plus.pojo.aps.holders.EWorkResource; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -29,7 +28,7 @@ public class WorkResource extends BaseAPS { @Column(name="USE_TYPE") @ApiParam(value ="使用类型") @FieldAnnotation(modify = false) - private USE_TYPE useType; + private ApsEnumUtil.USE_TYPE useType; @Column(name="PREV_TIME") @ApiParam(value ="前设置时间") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java index e206810..a8cdb93 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java @@ -1,8 +1,9 @@ package cn.estsh.i3plus.pojo.aps.common; -import cn.estsh.i3plus.pojo.aps.enums.FIELD_TYPE; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; +import java.sql.Timestamp; import java.util.*; import java.util.function.Consumer; @@ -238,36 +239,36 @@ public class BeanInfo { return beanClasses; } - public static FIELD_TYPE getFieldType(Class cls) { - FIELD_TYPE type = null; + public static ApsEnumUtil.FIELD_TYPE getFieldType(Class cls) { + ApsEnumUtil.FIELD_TYPE type = null; if (cls == Boolean.class || cls == boolean.class) { - type = FIELD_TYPE.BOOLEAN; + type = ApsEnumUtil.FIELD_TYPE.BOOLEAN; } else if (cls == Character.class) { - type = FIELD_TYPE.CHAR; + type = ApsEnumUtil.FIELD_TYPE.CHAR; } else if (cls == Short.class || cls == short.class) { - type = FIELD_TYPE.SHORT; + type = ApsEnumUtil.FIELD_TYPE.SHORT; } else if (cls == Integer.class || cls == int.class) { - type = FIELD_TYPE.INTEGER; + type = ApsEnumUtil.FIELD_TYPE.INTEGER; } else if (cls == Long.class || cls == long.class) { - type = FIELD_TYPE.LONG; + type = ApsEnumUtil.FIELD_TYPE.LONG; } else if (cls == Double.class || cls == Float.class || cls == double.class || cls == float.class) { - type = FIELD_TYPE.DOUBLE; + type = ApsEnumUtil.FIELD_TYPE.DOUBLE; } else if (cls == String.class) { - type = FIELD_TYPE.STRING; - } else if(cls == Date.class || cls == java.sql.Date.class) { - type = FIELD_TYPE.DATE_TIME; + type = ApsEnumUtil.FIELD_TYPE.STRING; + } else if(cls == Date.class || cls == java.sql.Date.class || cls == Timestamp.class) { + type = ApsEnumUtil.FIELD_TYPE.DATE_TIME; } else if (cls == DateDuration.class) { - type = FIELD_TYPE.DURATION; + type = ApsEnumUtil.FIELD_TYPE.DURATION; } else if (Enum.class.isAssignableFrom(cls)) { - type = FIELD_TYPE.ENUM; + type = ApsEnumUtil.FIELD_TYPE.ENUM; } else if (BaseBean.class.isAssignableFrom(cls)) { - type = FIELD_TYPE.OBJECT; + type = ApsEnumUtil.FIELD_TYPE.OBJECT; } return type; } - public static Class getFieldClass(FIELD_TYPE type) { + public static Class getFieldClass(ApsEnumUtil.FIELD_TYPE type) { Class cls = null; switch (type) { case BOOLEAN: diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CALENDAR_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CALENDAR_TYPE.java deleted file mode 100644 index 790195d..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CALENDAR_TYPE.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -/** - * @Description :日历类型 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -public enum CALENDAR_TYPE { - ENABLE, // 启用 - DISABLE // 停用 -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CALENDAR_WEEK.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CALENDAR_WEEK.java deleted file mode 100644 index c89ca37..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CALENDAR_WEEK.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -public enum CALENDAR_WEEK { - MONDAY(1), // 星期一 - TUESDAY(2), // 星期二 - WEDNESDAY(4), // 星期三 - THURSDAY(8), // 星期四 - FRIDAY(16), // 星期五 - SATURDAY(32), // 星期六 - SUNDAY(64); // 星期天 - - private int _value; - - CALENDAR_WEEK(int value) { - _value = value; - } - - public int value() { - return this._value; - } -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CONSTRAINT_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CONSTRAINT_TYPE.java deleted file mode 100644 index 66e085a..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CONSTRAINT_TYPE.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -/** - * @Description :接续方式 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -public enum CONSTRAINT_TYPE { - ES, // 前工作开始，后工作结束 - SS, // 前工作开始，后工作开始 - EE, // 前工作结束，后工作结束 - SSEE // 前后工作同时开始或同时结束 -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DATA_LINK_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DATA_LINK_TYPE.java deleted file mode 100644 index 6e031cf..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DATA_LINK_TYPE.java +++ /dev/null @@ -1,8 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -public enum DATA_LINK_TYPE { - CSV, - MYSQL, - ORACLE, - SQLSERVER -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DIRECTION.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DIRECTION.java deleted file mode 100644 index 800ffdd..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DIRECTION.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -/** - * @Description :排程方向 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -public enum DIRECTION { - POSITIVE, // 正向 - REVERSE // 逆向 -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_CALC.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_CALC.java deleted file mode 100644 index acf8ac8..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_CALC.java +++ /dev/null @@ -1,7 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -public enum DYNAMIC_SET_CALC { - MIN, // 取最小值 - MAX, // 取最大值 - SUM // 求和 -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_TYPE.java deleted file mode 100644 index 0453942..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_TYPE.java +++ /dev/null @@ -1,7 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -public enum DYNAMIC_SET_TYPE { - PREV_SET, // 只对前设置影响 - POST_SET, // 只对后设置影响 - ALL // 对前后设置都产生影响 -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EDIT_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EDIT_TYPE.java deleted file mode 100644 index b231839..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EDIT_TYPE.java +++ /dev/null @@ -1,28 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -/** - * @Description :字段的编辑类型 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -public enum EDIT_TYPE { - NONE, - BOOLEAN, // 布尔, 开关编辑 - CHAR, // 字符, 文本框编辑 - SHORT, // 短整型, 数字编辑 - INTEGER, // 整型, 数字编辑 - LONG, // 长整型, 数字编辑 - DOUBLE, // 浮点型, 文本框编辑 - DATE, // 日期类型(2019-09-16) - TIME, // 时间类型(17:35:30) - DATE_TIME, // 日期时间类型(2019-09-16 17:35:30) - DURATION, // 时间段(1H),文本框编辑 - ENUM, // 枚举,下拉选择 - MULTI_ENUM, // 多选枚举， 下拉多选 - STRING, // 字符串，文本框编辑 - OBJECT, // 关联对象，下来选择关联对象的Code值 - LIST, // 对象集合，不可编辑。 - MULTI_OBJECT // 多选对象，弹出框选择，可以选择全部对象，以*表示选择全部 -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java index 40f73ba..f1da6b4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java @@ -1,10 +1,16 @@ package cn.estsh.i3plus.pojo.aps.enums; +/** + * @Description :资源效率影响的计划类型 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-10-17 + * @Modify: + **/ public enum EFFICIENCY_EFFECT { - NONE(0), - PREV_SET(1), - PRODUCE(2), - POST_SET(4); + PREV_SET(1), // 前设置 + PRODUCE(2), // 生产 + POST_SET(4); // 后设置 private int _value; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/FIELD_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/FIELD_TYPE.java deleted file mode 100644 index 3677c69..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/FIELD_TYPE.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -/** - * @Description :字段类型 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -public enum FIELD_TYPE { - NONE, - BOOLEAN, // 布尔 - CHAR, // 字符 - SHORT, // 短整型 - INTEGER, // 整型 - LONG, // 长整型 - DOUBLE, // 浮点型 - DATE, // 日期类型(2019-09-16) - TIME, // 时间类型(17:35:30) - DATE_TIME, // 日期时间类型(2019-09-16 17:35:30) - DURATION, // 时间段(1H) - ENUM, // 枚举 - MULTI_ENUM, // 多选枚举 - STRING, // 字符串 - OBJECT, // 关联对象，下来选择关联对象的Code值 - LIST // 对象集合，不可编辑。 -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/IMPORT_DETAIL_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/IMPORT_DETAIL_TYPE.java deleted file mode 100644 index a23a8e9..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/IMPORT_DETAIL_TYPE.java +++ /dev/null @@ -1,6 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -public enum IMPORT_DETAIL_TYPE { - REPLACE, - DIFF -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_ASSIGN_LIMIT.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_ASSIGN_LIMIT.java deleted file mode 100644 index e068a04..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_ASSIGN_LIMIT.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -/** - * 物料分配限制 - * 主要考虑输出订的最晚计算时间不能晚于输入的最晚计算时间 - */ -public enum MATERIAL_ASSIGN_LIMIT { - NONE(0), // 不进行任何制约 - INVENTORY(1), // 库存制约 - PURCHASE(2), // 采购制约 - PRODUCT(4); // 制造制约 - - private int _value; - - MATERIAL_ASSIGN_LIMIT(int value) { - _value = value; - } - - public int value() { - return this._value; - } -} \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java deleted file mode 100644 index 89f6644..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -/** - * @Description :物料类型 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -public enum MATERIAL_TYPE { - PRODUCT, // 成品 - HALF_PRODUCT, // 半成品 - RAW_MATERIAL, // 原材料 - VIRTUAL // 虚拟件 -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/ORDER_DEL_LIMIT.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/ORDER_DEL_LIMIT.java deleted file mode 100644 index 67e8f31..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/ORDER_DEL_LIMIT.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -/** - * @Description :订单删除限制 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -public enum ORDER_DEL_LIMIT { - NONE, - NO_PO, - NO_PLAN, - NO_POR, - NO_PPRS -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java deleted file mode 100644 index 8218c5b..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -/** - * @Description :工作计划包含的时间类型 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -public enum PLAN_TYPE { - PREV_SET, - PRODUCE, - POST_SET, - LOCK -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PREPARE_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PREPARE_TYPE.java deleted file mode 100644 index b357026..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PREPARE_TYPE.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -/** - * @Description :备料类型 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -public enum PREPARE_TYPE { - NO, - SELF_MAKE, // 自制 - PURCHASE // 采购 -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/REPLENISHMENT_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/REPLENISHMENT_TYPE.java deleted file mode 100644 index e9c78dd..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/REPLENISHMENT_TYPE.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -/** - * @Description :补充类型 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -public enum REPLENISHMENT_TYPE { - NO, - BATCH, // 批量补充 - ONEBYONE // 一对一补充 -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java deleted file mode 100644 index deb2079..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -/** - * @Description :预置的资源选择规则 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -public enum RESOURCE_CHOISE_RULE { - PREV_SET_TIME, // 前设置时间 - PRODUCE_TIME, // 生产时间 - POST_SET_TIME, // 后设置时间 - WORK_WAIT_TIME, // 工作等待时间 - RES_BALANCE, // 资源均衡度 - SAME_MATERIAL, // 相同物料 - SAME_ORDER, // 相同订单 - NEARLY_WORK, // 前后工作 - POST_RESOURCE, // 后资源制约 - SAME_ASS_RESOURCE, // 相同副资源 - RESOURCE_PRIORITY; // 资源优先级 -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CLASS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CLASS.java deleted file mode 100644 index d78c393..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CLASS.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -/** - * @Description :资源区分 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -public enum RESOURCE_CLASS { - LIMITLESS, // 无限能力 - SINGLE, // 单能力 - BATCH // 炉资源 -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_LOCK_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_LOCK_TYPE.java deleted file mode 100644 index cb37621..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_LOCK_TYPE.java +++ /dev/null @@ -1,7 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -public enum RESOURCE_LOCK_TYPE { - NONE, // 不锁定 - PRODUCE_BEGIN, // 与后工序生产开始时刻有关 - PRODUCE_END // 与后工序生产结束时刻有关 -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java deleted file mode 100644 index fa18826..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -/** - * @Description :资源类型 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -public enum RESOURCE_TYPE { - MAIN, // 主资源 - ASS // 副资源 -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RES_COMB_LOCK_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RES_COMB_LOCK_TYPE.java deleted file mode 100644 index e5eb47f..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RES_COMB_LOCK_TYPE.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -/** - * @Description :锁定时间计算方式 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -public enum RES_COMB_LOCK_TYPE { - KEEP_ORIGIN, // 各自锁定 - MAIN_LOCK, // 主资源锁定 - MAX_ALL_RESOURCE, // 最大锁定时间 -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RES_COMB_TIME_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RES_COMB_TIME_TYPE.java deleted file mode 100644 index c9210a1..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RES_COMB_TIME_TYPE.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -/** - * @Description :生产时间计算方法 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -public enum RES_COMB_TIME_TYPE { - MAIN_RESOURCE, // 主资源 - MAX_ASS_RESOURCE, // 副资源最大值 - MIN_ASS_RESOURCE, // 副资源最小值 - AVG_ASS_RESOURCE, // 副资源平均值 - MAX_ALL_RESOURCE, // 主副资源最大值 - MIN_ALL_RESOURCE, // 主副资源最小值 - AVG_ALL_RESOURCE // 主副资源平均值 -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/ROUTING_VALID_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/ROUTING_VALID_TYPE.java deleted file mode 100644 index 47f2580..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/ROUTING_VALID_TYPE.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -/** - * @Description :工艺路径有效性判断类型 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-10-29 - * @Modify: - **/ -public enum ROUTING_VALID_TYPE { - ORDER_CALC_LET, // 与订单的最晚结束时刻计算值做比较 - CALC_LET_LT, // 与最晚结束时刻计算值-提前期做比较 - BASE_TIME // 与基准时刻做比较 -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RULE_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RULE_TYPE.java deleted file mode 100644 index 3cfede4..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RULE_TYPE.java +++ /dev/null @@ -1,8 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -public enum RULE_TYPE { - CANCEL_PLAN, - MAT_CALC, - HEURISTIC, - FIELD_SET -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TAIL_DEAL.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TAIL_DEAL.java deleted file mode 100644 index 626e1df..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TAIL_DEAL.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -/** - * @Description :尾数处理方式 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -public enum TAIL_DEAL { - NODEAL, // 不处理 - CEILING, // 向下 - PUSHFRONT // 向上 -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java deleted file mode 100644 index 0233691..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -/** - * @Description :时间圆整方式 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -public enum TIME_ROUND_TYPE { - UP, // 向上 - DOWN, // 向下 - ROUNDING // 四舍五入 -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/USE_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/USE_TYPE.java deleted file mode 100644 index 68ee62e..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/USE_TYPE.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -/** - * @Description :使用类型 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -public enum USE_TYPE { - MAIN, // 主资源 - FIRST_ASS, // 第一套副资源 - SECOND_ASS, // 第二套副资源 - THIRD_ASS, // 第三套副资源 - FOURTH_ASS, // 第四套副资源 - FIFTH_ASS, // 第五套副资源 - SIXTH_ASS // 第六套副资源 -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_PLAN_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_PLAN_TYPE.java deleted file mode 100644 index 2a3afa2..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_PLAN_TYPE.java +++ /dev/null @@ -1,7 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -public enum WORK_PLAN_TYPE { - MAIN_PLAN, // 主资源计划 - ASS_PLAN, // 副资源计划 - BATCH_PLAN // 炉资源计划 -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_RELATION_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_RELATION_TYPE.java deleted file mode 100644 index 1aa3c33..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_RELATION_TYPE.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -/** - * @Description :工作关联类型 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -public enum WORK_RELATION_TYPE { - INNER, // 订单内关联 - OUTER // 订单间关联 -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java deleted file mode 100644 index bdaa913..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java +++ /dev/null @@ -1,31 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -/** - * @Description :预置的工作排序规则 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -public enum WORK_SORT_RULE { - NONE, - ORDER_LET, // 订单交货期 - ORDER_PRIORITY, // 订单优先级 - ORDER_EST, // 订单最早开始时刻 - ORDER_COUNT, // 订单数量 - ORDER_RECEIVE_DATE,// 订单接单日期 - ORDER_LET_SUB_EST,// 订单交货期与订单最早开始时刻之差 - ORDER_SURPLUS, // 订单余裕度 - NOPLAN_OPERATION_SIZE,// 残留工序数 - REMAIN_PRODUCE_TIME, // 残留生产时间 - MIN_OPERATION_REMAIN_TIME,// 最小工序宽裕时间 - WORK_LET, // 工作最晚结束时刻 - WORK_EST, // 工作最早开始时刻 - INVENTORY_RELA, // 订单物品库存量相对值 - FIRST_WORK_BEGIN,// 订单首工作上次开始时刻 - HAVE_HIGH_WORK, // 订单中含有高级别工作 - WORK_RESOURCE_SIZE, // 工作的可用资源数 - TOP_ORDER_LET,// 顶层订单的交货期 - TOP_ORDER_CODE, // 顶层订单代码 - TOP_ORDER_PRIORITY; // 顶层订单优先级 -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SPLIT_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SPLIT_TYPE.java deleted file mode 100644 index 95383b4..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SPLIT_TYPE.java +++ /dev/null @@ -1,8 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -public enum WORK_SPLIT_TYPE { - NONE, // 不分割 - RATIO, // 按比例分割 - COUNT, // 按数量分割 - BATCH // 按批量分割 -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_STATUS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_STATUS.java deleted file mode 100644 index a650ed1..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_STATUS.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -/** - * @Description :工作状态 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -public enum WORK_STATUS { - NOPLAN, // 未计划 - PLANDONE, // 计划完毕 - INDICATIONDONE, // 指示完毕 - CONFIRM, // 确认 - STARTPRODUCT, // 开始生产 - FINISH // 完成 -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_TYPE.java deleted file mode 100644 index 1aed997..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_TYPE.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -/** - * @Description :工作类型 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -public enum WORK_TYPE { - FICTITIOUS, // 虚拟工作 - NORMAL // 普通工作 -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java index e4c5238..ef776fc 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java @@ -1,7 +1,10 @@ package cn.estsh.i3plus.pojo.aps.holders; +import io.swagger.annotations.ApiParam; + public enum EBaseOrder { Works, + @ApiParam(value = "物料") Material, PrevRelations, PostRelations, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/BomModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/BomModel.java new file mode 100644 index 0000000..59d8be4 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/BomModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * Bom接口数据 + */ +@Data +public class BomModel { + @Data + public static class Detail { + private String label; + private String name; + } + + private String label; + private String name; + private Long id; + private List details = new ArrayList<>(); + private List children = new ArrayList<>(); +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ExchangeBeanOrderNumber.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ExchangeBeanOrderNumber.java new file mode 100644 index 0000000..df4b3cb --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ExchangeBeanOrderNumber.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description :交换两对象的显示位置 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-11-10 + * @Modify: + **/ +@Data +public class ExchangeBeanOrderNumber { + @ApiParam(value ="前对象ID") + private Long prevId; + @ApiParam(value ="后对象ID") + private Long postId; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IFurnaceCapacityRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IFurnaceCapacityRepository.java new file mode 100644 index 0000000..30df84d --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IFurnaceCapacityRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.FurnaceCapacity; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface IFurnaceCapacityRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IFurnaceSettingRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IFurnaceSettingRepository.java new file mode 100644 index 0000000..76dff1a --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IFurnaceSettingRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.FurnaceSetting; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface IFurnaceSettingRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java new file mode 100644 index 0000000..b84ac79 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -0,0 +1,1001 @@ +package cn.estsh.i3plus.pojo.base.enumutil; + + +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * @Description : + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-11-11 + * @Modify: + **/ +public class ApsEnumUtil { + + /** + * 日历中选择星期的多选枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CALENDAR_WEEK { + MONDAY(1, "星期一"), + TUESDAY(2, "星期二"), + WEDNESDAY(4, "星期三"), + THURSDAY(8, "星期四"), + FRIDAY(16, "星期五"), + SATURDAY(32, "星期六"), + SUNDAY(64, "星期天"); + + private int value; + private String description; + + CALENDAR_WEEK(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; + } + } + + /** + * 物料类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MATERIAL_TYPE { + PRODUCT("PRODUCT", "成品"), + HALF_PRODUCT("HALF_PRODUCT", "半成品"), + RAW_MATERIAL("RAW_MATERIAL", "原材料"), + VIRTUAL("VIRTUAL", "虚拟件"); + + private String value; + private String description; + + MATERIAL_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 备料类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PREPARE_TYPE { + NO("NO", "不备料"), + SELF_MAKE("SELF_MAKE", "自制"), // 自制 + PURCHASE("PURCHASE", "采购"); // 采购 + + private String value; + private String description; + + PREPARE_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 补充类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum REPLENISHMENT_TYPE { + NO("NO", "不补充"), + BATCH("BATCH", "批量补充"), + ONEBYONE("ONEBYONE", "一对一补充"); + + private String value; + private String description; + + REPLENISHMENT_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 物料分配限制 + * 主要考虑输出订的最晚计算时间不能晚于输入的最晚计算时间 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MATERIAL_ASSIGN_LIMIT { + INVENTORY(1, "库存制约"), + PURCHASE(2, "采购制约"), + PRODUCT(4, "制造制约"); + + private int value; + private String description; + + MATERIAL_ASSIGN_LIMIT(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; + } + } + + /** + * 排程方向 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DIRECTION { + POSITIVE("POSITIVE", "正向"), + REVERSE("REVERSE", "逆向"); + + private String value; + private String description; + + DIRECTION(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 尾数处理方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TAIL_DEAL { + NODEAL("NODEAL", "不处理"), + CEILING("CEILING", "向下"), + PUSHFRONT("PUSHFRONT", "向上"); + + private String value; + private String description; + + TAIL_DEAL(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 则管理中规则的类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RULE_TYPE { + CANCEL_PLAN("CANCEL_PLAN", "取消计划"), + MAT_CALC("MAT_CALC", "物料运算"), + HEURISTIC("HEURISTIC", "排程运算"), + FIELD_SET("FIELD_SET", "字段赋值"); + + private String value; + private String description; + + RULE_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 资源区分 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RESOURCE_CLASS { + LIMITLESS("LIMITLESS", "无限能力"), + SINGLE("SINGLE", "单能力"), + BATCH("BATCH", "炉资源"); + + private String value; + private String description; + + RESOURCE_CLASS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 锁定时间的取值方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RESOURCE_LOCK_TYPE { + NONE("NONE", "不锁定"), // + PRODUCE_BEGIN("PRODUCE_BEGIN", "后工序生产开始时刻"), + PRODUCE_END("PRODUCE_END", "后工序生产结束时刻"); + + private String value; + private String description; + + RESOURCE_LOCK_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 资源类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RESOURCE_TYPE { + MAIN("MAIN", "主资源"), + ASS("ASS", "副资源"); + + private String value; + private String description; + + RESOURCE_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 预置的资源选择规则 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RESOURCE_CHOISE_RULE { + PREV_SET_TIME("PREV_SET_TIME", "前设置时间"), + PRODUCE_TIME("PRODUCE_TIME", "生产时间"), + POST_SET_TIME("POST_SET_TIME", "后设置时间"), + WORK_WAIT_TIME("WORK_WAIT_TIME", "工作等待时间"), + RES_BALANCE("RES_BALANCE", "资源均衡度"), + SAME_MATERIAL("SAME_MATERIAL", "相同物料"), + SAME_ORDER("SAME_ORDER", "相同订单"), + NEARLY_WORK("NEARLY_WORK", "前后工作"), + POST_RESOURCE("POST_RESOURCE", "后资源制约"), + SAME_ASS_RESOURCE("SAME_ASS_RESOURCE", "相同副资源"), + RESOURCE_PRIORITY("RESOURCE_PRIORITY", "资源优先级"); + + private String value; + private String description; + + RESOURCE_CHOISE_RULE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 订单删除限制 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ORDER_DEL_LIMIT { + NONE("NONE", "不限制"), + NO_PO("NO_PO", "未计划"), + NO_PLAN("NO_PLAN", "计划完毕"), + NO_POR("NO_POR", ""), + NO_PPRS("NO_PPRS", ""); + + private String value; + private String description; + + ORDER_DEL_LIMIT(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 锁定时间计算方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RES_COMB_LOCK_TYPE { + KEEP_ORIGIN("KEEP_ORIGIN", "各自锁定"), + MAIN_LOCK("MAIN_LOCK", "主资源锁定"), + MAX_ALL_RESOURCE("MAX_ALL_RESOURCE", "最大锁定时间"); + + private String value; + private String description; + + RES_COMB_LOCK_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 生产时间计算方法 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RES_COMB_TIME_TYPE { + MAIN_RESOURCE("MAIN_RESOURCE", "主资源"), + MAX_ASS_RESOURCE("MAX_ASS_RESOURCE", "副资源最大值"), + MIN_ASS_RESOURCE("MIN_ASS_RESOURCE", "副资源最小值"), + AVG_ASS_RESOURCE("AVG_ASS_RESOURCE", "副资源平均值"), + MAX_ALL_RESOURCE("MAX_ALL_RESOURCE", "主副资源最大值"), + MIN_ALL_RESOURCE("MIN_ALL_RESOURCE", "主副资源最小值"), + AVG_ALL_RESOURCE("AVG_ALL_RESOURCE", "主副资源平均值"); + + private String value; + private String description; + + RES_COMB_TIME_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 时间圆整方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TIME_ROUND_TYPE { + UP("UP", "向上"), + DOWN("DOWN", "向下"), + ROUNDING("ROUNDING", "四舍五入"); + + private String value; + private String description; + + TIME_ROUND_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 工艺路径有效性判断类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTING_VALID_TYPE { + ORDER_CALC_LET("ORDER_CALC_LET", "与订单的最晚结束时刻计算值做比较"), + CALC_LET_LT("CALC_LET_LT", "与最晚结束时刻计算值-提前期做比较"), + BASE_TIME("BASE_TIME", "与基准时刻做比较"); + + private String value; + private String description; + + ROUTING_VALID_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 使用类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum USE_TYPE { + MAIN("MAIN", "主资源"), + FIRST_ASS("FIRST_ASS", "第一套副资源"), + SECOND_ASS("SECOND_ASS", "第二套副资源"), + THIRD_ASS("THIRD_ASS", "第三套副资源"), + FOURTH_ASS("FOURTH_ASS", "第四套副资源"), + FIFTH_ASS("FIFTH_ASS", "第五套副资源"), + SIXTH_ASS("SIXTH_ASS", "第六套副资源"); + + private String value; + private String description; + + USE_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 工作计划类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_PLAN_TYPE { + MAIN_PLAN("MAIN_PLAN", "主资源计划"), + ASS_PLAN("ASS_PLAN", "副资源计划"), + BATCH_PLAN("BATCH_PLAN", "炉资源计划"); + + private String value; + private String description; + + WORK_PLAN_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 工作关联类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_RELATION_TYPE { + INNER("INNER", "订单内关联"), + OUTER("OUTER", "订单间关联"); + + private String value; + private String description; + + WORK_RELATION_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 工作排序规则 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_SORT_RULE { + NONE("NONE", "非内置"), + ORDER_LET("ORDER_LET", "订单交货期"), + ORDER_PRIORITY("ORDER_PRIORITY", "订单优先级"), + ORDER_EST("ORDER_EST", "订单最早开始时刻"), + ORDER_COUNT("ORDER_COUNT", "订单数量"), + ORDER_RECEIVE_DATE("ORDER_RECEIVE_DATE", "订单接单日期"), + ORDER_LET_SUB_EST("ORDER_LET_SUB_EST", "订单交货期与订单最早开始时刻之差"), + ORDER_SURPLUS("ORDER_SURPLUS", "订单余裕度"), + NOPLAN_OPERATION_SIZE("NOPLAN_OPERATION_SIZE", "残留工序数"), + REMAIN_PRODUCE_TIME("REMAIN_PRODUCE_TIME", "残留生产时间"), + MIN_OPERATION_REMAIN_TIME("MIN_OPERATION_REMAIN_TIME", "最小工序宽裕时间"), + WORK_LET("WORK_LET", "工作最晚结束时刻"), + WORK_EST("WORK_EST", "工作最早开始时刻"), + INVENTORY_RELA("INVENTORY_RELA", "订单物品库存量相对值"), + FIRST_WORK_BEGIN("FIRST_WORK_BEGIN", "订单首工作上次开始时刻"), + HAVE_HIGH_WORK("HAVE_HIGH_WORK", "订单中含有高级别工作"), + WORK_RESOURCE_SIZE("WORK_RESOURCE_SIZE", "工作的可用资源数"), + TOP_ORDER_LET("TOP_ORDER_LET", "顶层订单的交货期"), + TOP_ORDER_CODE("TOP_ORDER_CODE", "顶层订单代码"), + TOP_ORDER_PRIORITY("TOP_ORDER_PRIORITY", "顶层订单优先级"); + + private String value; + private String description; + + WORK_SORT_RULE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 工作分割类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_SPLIT_TYPE { + NONE("NONE", "不分割"), + RATIO("RATIO", "按比例分割"), + COUNT("COUNT", "按数量分割"), + BATCH("BATCH", "按批量分割"); + + private String value; + private String description; + + WORK_SPLIT_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 工作状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_STATUS { + NOPLAN("NOPLAN", "未计划"), + PLANDONE("PLANDONE", "计划完毕"), + INDICATIONDONE("INDICATIONDONE", "指示完毕"), + CONFIRM("CONFIRM", "确认"), + STARTPRODUCT("STARTPRODUCT", "开始生产"), + FINISH("FINISH", "完成"); + + private String value; + private String description; + + WORK_STATUS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 工作种类 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_TYPE { + FICTITIOUS("FICTITIOUS", "虚拟工作"), + NORMAL("NORMAL", "普通工作"); + + private String value; + private String description; + + WORK_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 动态设置时间影响类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DYNAMIC_SET_TYPE { + PREV_SET("PREV_SET", "只对前设置影响"), + POST_SET("POST_SET", "只对后设置影响"), + ALL("ALL", "对前后设置都产生影响"); + + private String value; + private String description; + + DYNAMIC_SET_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 动态设置事件取值方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DYNAMIC_SET_CALC { + MIN("MIN", "取最小值"), + MAX("MAX", "取最大值"), + SUM("SUM", "求和"); + + private String value; + private String description; + + DYNAMIC_SET_CALC(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 接续方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CONSTRAINT_TYPE { + ES("ES", "前工作开始，后工作结束"), + SS("SS", "前工作开始，后工作开始"), + EE("EE", "前工作结束，后工作结束"), + SSEE("SSEE", "前后工作同时开始或同时结束"); + + private String value; + private String description; + + CONSTRAINT_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 加班日历类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CALENDAR_TYPE { + ENABLE("ENABLE", "启用"), + DISABLE("DISABLE", "停用"); + + private String value; + private String description; + + CALENDAR_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 导入类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IMPORT_DETAIL_TYPE { + REPLACE("REPLACE", "替代导入"), + DIFF("DIFF", "差分导入"); + + private String value; + private String description; + + IMPORT_DETAIL_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 字段赋值对象 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FIELD_SET_BEAN { + Material("Material", "物料"), + ProductRouting("ProductRouting", "工艺路线"), + Operation("Operation", "工序"), + OperInput("OperInput", "工序输入"), + OperOutput("OperOutput", "工序输出"), + OperResource("OperResource", "工序资源"), + StandOperation("StandOperation", "标准工序"), + SalesOrder("SalesOrder", "销售订单"), + ProductOrder("ProductOrder", "生产订单"), + PurchaseOrder("PurchaseOrder", "采购订单"), + Inventory("Inventory", "库存"), + Work("Work", "工作"), + WorkInput("WorkInput", "工作输入"), + WorkOutput("WorkOutput", "工作输出"), + WorkResource("WorkResource", "工作资源"), + WorkRelation("WorkRelation", "工作关联"); + + private String value; + private String description; + + FIELD_SET_BEAN(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 计划类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLAN_TYPE { + PREV_SET("", "前设置"), + PRODUCE("", "生产"), + POST_SET("", "后设置"), + LOCK("", "锁定"); + + private String value; + private String description; + + PLAN_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 数据连接类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DATA_LINK_TYPE { + CSV("CSV", "csv文件"), + MYSQL("MYSQL", "MySql"), + ORACLE("ORACLE", "Oracle"), + SQLSERVER("SQLSERVER", "SqlServer"); + + private String value; + private String description; + + DATA_LINK_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 字段的编辑类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EDIT_TYPE { + NONE("NONE", "未知"), + BOOLEAN("BOOLEAN", "布尔, 开关编辑"), + CHAR("CHAR", "字符, 文本框编辑"), + SHORT("SHORT", "短整型, 数字编辑"), + INTEGER("INTEGER", "整型, 数字编辑"), + LONG("LONG", "长整型, 数字编辑"), + DOUBLE("DOUBLE", "浮点型, 文本框编辑"), + DATE("DATE", "日期类型(2019-09-16)"), + TIME("TIME", "时间类型(17:35:30)"), + DATE_TIME("DATE_TIME", "日期时间类型(2019-09-16 17:35:30)"), + DURATION("DURATION", "时间段(1H),文本框编辑"), + ENUM("ENUM", "枚举,下拉选择"), + MULTI_ENUM("MULTI_ENUM", "多选枚举， 下拉多选"), + STRING("STRING", "字符串，文本框编辑"), + OBJECT("OBJECT", "关联对象，下来选择关联对象的Code值"), + LIST("LIST", "对象集合，不可编辑。"), + MULTI_OBJECT("MULTI_OBJECT", "多选对象，弹出框选择，可以选择全部对象，以*表示选择全部"); + + private String value; + private String description; + + EDIT_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 字段类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FIELD_TYPE { + NONE("NONE", "未知"), + BOOLEAN("BOOLEAN", "布尔"), + CHAR("CHAR", "字符"), + SHORT("SHORT", "短整型"), + INTEGER("INTEGER", "整型"), + LONG("LONG", "长整型"), + DOUBLE("DOUBLE", "浮点型"), + DATE("DATE", "日期类型(2019-09-16)"), + TIME("TIME", "时间类型(17:35:30)"), + DATE_TIME("DATE_TIME", "日期时间类型(2019-09-16 17:35:30)"), + DURATION("DURATION", "时间段(1H)"), + ENUM("ENUM", "枚举"), + MULTI_ENUM("MULTI_ENUM", "多选枚举"), + STRING("STRING", "字符串"), + OBJECT("OBJECT", "关联对象，下来选择关联对象的Code值"), + LIST("LIST", "对象集合，不可编辑。"); + + private String value; + private String description; + + FIELD_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } +} From ad6baaa1e60def90965ec7d287bcc0a61f3a55a8 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Thu, 14 Nov 2019 13:33:11 +0800 Subject: [PATCH 28/34] =?UTF-8?q?=E5=AE=89=E7=81=AF=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E8=B0=83=E8=AF=95=EF=BC=8C=20=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index 4bc0eba..34ed60e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -138,7 +138,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getOrganizeCode(), "organizeCode", packBean); DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getAlarmCode(), "alarmCode", packBean); - DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getGroupNo(), "groupNo", packBean); + DdlPreparedPack.getStringLikerPack(andonBroadCastCfg.getGroupNo(), "groupNo", packBean); DdlPreparedPack.getNumEqualPack(andonBroadCastCfg.getIsValid(),"isValid",packBean); return packBean; } From 028d7641d2096d4322519a3b820c2ea115a3dbea Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 14 Nov 2019 14:03:11 +0800 Subject: [PATCH 29/34] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1126?= =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=91=A8=E6=9C=9F=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E4=BC=98=E5=8C=96=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/mes/bean/MesEquTaskDetail.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java index b15b610..c62fb18 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java @@ -87,4 +87,8 @@ public class MesEquTaskDetail extends BaseBean { @ApiParam(value = "任务类型") private Integer taskType; + @Transient + @ApiParam(value = "关联任务") + private String relateTask; + } From 4ad645d34ebf05980783d701d35267f7e3f16748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 14 Nov 2019 17:27:37 +0800 Subject: [PATCH 30/34] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A7=A6=E5=8F=91=E6=BA=90=EF=BC=88=E6=94=BE?= =?UTF-8?q?=E5=A4=A7=E9=95=9C80=EF=BC=89+=E4=BF=AE=E6=94=B9=E6=B5=81?= =?UTF-8?q?=E7=A8=8BBUG#5826#5779+=E6=9F=A5=E8=AF=A2=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=B8=BA=E5=8F=AF=E9=80=89=E5=88=97=E8=A1=A8=E7=9A=84=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=97=B6=E6=B2=A1=E6=9C=89=E5=8A=A0=E4=B8=8A=E8=BD=AF?= =?UTF-8?q?=E5=88=A0=E6=9D=A1=E4=BB=B6?= 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 0f8069f..725685b 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 @@ -1697,7 +1697,8 @@ public class WmsEnumUtil { CHECK_DETAILS(40, "查看明细"), DELETE_DETAILS(50, "明细(删除)"), CLEAR_DETAILS(60, "明细（清空）"), - CUSTOM_BUTTON(70, "自定义按钮"); + CUSTOM_BUTTON(70, "自定义按钮"), + MAGNIFIER(80, "放大镜"); private int value; private String description; From 0e1220c329560e58a7848736957fa83af99d3972 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 14 Nov 2019 17:32:32 +0800 Subject: [PATCH 31/34] =?UTF-8?q?Core=20=E6=9C=8D=E5=8A=A1=20=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 4e34946..99bac14 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -49,8 +49,8 @@ public class CoreHqlPack { */ public static String packHqlIds(String columnName, String[] params){ StringBuffer result = new StringBuffer(); - - // 参数数组 [1,2,3] -> "1,2,3" + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); HqlPack.getInPack(String.join(",", params), columnName, result); return result.toString(); } @@ -63,6 +63,8 @@ public class CoreHqlPack { */ public static String packHqlIds(String columnName, Long[] params){ StringBuffer result = new StringBuffer(); + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); // 参数数组 [1,2,3] -> "1,2,3" HqlPack.getInPack(StringUtils.join(params,","),columnName,result); @@ -524,13 +526,13 @@ public class CoreHqlPack { DdlPackBean result = DdlPackBean.getDdlPackBean(user); DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); - DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); +// DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result); DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result); DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result); DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result); - DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result); +// DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result); DdlPreparedPack.getInPackList(idList,"id",result); result.setOrderByStr(user.orderBy()); From 9969916e0af54d407ac382a865f4bf34979e71c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 14 Nov 2019 18:07:57 +0800 Subject: [PATCH 32/34] =?UTF-8?q?=E5=BC=80=E5=8F=A3=E5=90=88=E5=90=8C=20-?= =?UTF-8?q?=E5=85=B3=E8=81=94=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?= 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 4284c43..41523ec 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 @@ -754,7 +754,8 @@ public class WmsEnumUtil { QC("QC", "质检"), CS("CS", "盘点"), DR("DR", "直送收货"), - AMPR("AMPR", "AMP拉动收货"); + AMPR("AMPR", "AMP拉动收货"), + OPENING("OPENING", "开口合同"); private String value; private String description; From c27daae8e4df66c96cb9b82382913f7b520a90dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 14 Nov 2019 18:09:57 +0800 Subject: [PATCH 33/34] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=8D=95=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E8=A1=A8=20--=E4=BE=9B=E5=BA=94=E5=95=86=E7=BC=96?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index d546d76..22fe9f5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -74,6 +74,10 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam("条码") public String sn; + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编码") + public String vendorNo; + @Transient @ApiParam("前端表格编辑使用") private Boolean isSet = false; From 7ba63dc9a8afef9a73ddd8bd359e53db733cace5 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Thu, 14 Nov 2019 18:39:57 +0800 Subject: [PATCH 34/34] =?UTF-8?q?6283=20=E6=89=93=E5=8C=85=E6=89=AB?= =?UTF-8?q?=E6=8F=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java index 332fe9f..88a3791 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java @@ -91,6 +91,10 @@ public class MesPackage extends BaseBean { @ApiParam("封箱状态") private String sealStatus; + @Transient + @ApiParam("打印状态文字") + private String printStrStatus; +