From dbe2d32bb636da0a5838e82756d9ea248829ae0a Mon Sep 17 00:00:00 2001 From: zcg Date: Wed, 25 Dec 2019 20:25:15 +0800 Subject: [PATCH 01/31] =?UTF-8?q?[=E9=9C=80=E6=B1=82=EF=BC=9A1322=EF=BC=8C?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 d6154b5..750af55 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 @@ -132,7 +132,9 @@ public class MesPcnEnumUtil { PCN_MODULE(180, "PCN_MODULE", ""), PCN_LOGOUT(190, "PCN_LOGOUT", ""), UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"), - PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""); + PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""), + PCN_SYS_ALL_LANGUAGE(220,"PCN_SYS_ALL_LANGUAGE","PCN_SYS_ALL_LANGUAGE"), + PCN_SYS_RESOURCE_KEY_LANGUAGE(230,"PCN_SYS_RESOURCE_KEY_LANGUAGE","PCN_SYS_RESOURCE_KEY_LANGUAGE"); private int value; private String code; From d47a097c53b1996d2120d6139578ca81ba4f160e Mon Sep 17 00:00:00 2001 From: jokelone Date: Mon, 30 Dec 2019 14:47:05 +0800 Subject: [PATCH 02/31] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1344?= =?UTF-8?q?=20=E9=80=9A=E7=94=A8=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/util/StringUtil.java | 54 ---------------------- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- 2 files changed, 1 insertion(+), 55 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java index 95bfee7..6a7a274 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java @@ -33,58 +33,4 @@ public class StringUtil { } return fieldNames; } - - /** - * 获取对象所有属性名 - * @param clazz - * @return - */ - public static List getFieldList(Class clazz) { - Field[] fields = clazz.getDeclaredFields(); - Field[] superFields = clazz.getSuperclass().getDeclaredFields(); - List fieldNames = new ArrayList<>(); - for(int i = 0;i < fields.length; i++){ - fieldNames.add(fields[i].getName()); - } - for(int i = 0;i < superFields.length; i++){ - fieldNames.add(superFields[i].getName()); - } - return fieldNames; - } - - /** - * 根据属性名和对象获取属性对应的值 - * @param fieldName - * @param o - * @return - */ - public static Object getFieldValueByName(String fieldName, Object o) { - try { - String firstLetter = fieldName.substring(0, 1).toUpperCase(); - String getter = "get" + firstLetter + fieldName.substring(1); - Method method = o.getClass().getMethod(getter, new Class[] {}); - Object value = method.invoke(o, new Object[] {}); - return value; - } catch (Exception e) { - return null; - } - } - - private static Pattern linePattern = Pattern.compile("_(\\w)"); - - /** 驼峰转下划线 */ - public static Map humpToLine(Map map) { - Map resultMap = new HashMap<>(); - for (String str : map.keySet()) { - str = str.toLowerCase(); - Matcher matcher = linePattern.matcher(str); - StringBuffer sb = new StringBuffer(); - while (matcher.find()) { - matcher.appendReplacement(sb, matcher.group(1).toUpperCase()); - } - matcher.appendTail(sb); - resultMap.put(sb.toString(), map.get(str)); - } - return resultMap; - } } 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 b9eb3ec..001ee09 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 @@ -1388,7 +1388,7 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCenterCode(), "workCenterCode", packBean); } - if (null == mesQcCheckStandard.getCheckType()) { + if (mesQcCheckStandard.getCheckType() != null) { DdlPreparedPack.getNumberBiggerEqualPack(mesQcCheckStandard.getCheckType(), "checkType", packBean); } if (!StringUtils.isEmpty(mesQcCheckStandard.getCheckItem())) { From af6083ddff826e8e3f3ffd9c3154f16915f1c319 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 3 Jan 2020 14:17:24 +0800 Subject: [PATCH 03/31] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=AD=98=E5=82=A8?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 9 +++++ .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 43 ++++++++++++++++++++++ 2 files changed, 52 insertions(+) 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 bc924e2..873e21d 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 @@ -1259,6 +1259,15 @@ public class CommonEnumUtil { return tmp; } + public static LOG_DETAIL_SHOW_TYPE valueOfEnum(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { 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 13b076e..f8581ff 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 @@ -1190,4 +1190,47 @@ public class ImppEnumUtil { return tmp; } } + + /** + * 日志存储 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LOG_STORAGE { + MONGO(1, "MongoDB"), + ELASTICSEARCH(2, "Elasticsearch"); + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + private LOG_STORAGE(int value, String description) { + this.value = value; + this.description = 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; + } + + public static LOG_STORAGE valueOfEnum(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + } } From d8d47541df15504923a472000ac537b8a900ec75 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 3 Jan 2020 14:18:00 +0800 Subject: [PATCH 04/31] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java index fa78d8b..20d9181 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java @@ -77,6 +77,14 @@ public class BrPojoFilterAttr extends BaseBean { @ApiParam(value ="属性显示名称") private String attrName; + @Column(name = "VIEW_ATTR_CONTROL_TYPE") + @ApiParam(value = "控件类型") + private Integer viewAttrControlType; + + @Column(name = "VIEW_ATTR_CONTROL_REF_KEY") + @ApiParam(value = "控件引用RefKey") + private String viewAttrControlRefKey; + @Column(name="ATTR_SHOW") @ApiParam(value ="属性是否显示") private Integer attrShow; From 989e05c64c8e89b53aeefa70c3a0a3098e389cce Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 3 Jan 2020 15:02:54 +0800 Subject: [PATCH 05/31] =?UTF-8?q?=E3=80=907168=20=E5=AF=B9=E4=BA=8E?= =?UTF-8?q?=E5=8F=91=E8=BF=90=E5=8D=95=E6=A0=87=E7=AD=BE=E8=A1=A5=E6=89=93?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=A0=B9=E6=8D=AE=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E5=8D=95=E4=B8=AD=E7=9A=84ship-to=E8=8E=B7=E5=8F=96=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=A8=A1=E6=9D=BF=E8=BF=9B=E8=A1=8C=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 4 ---- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) 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 f3c25d0..d812406 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 @@ -118,8 +118,4 @@ public class WmsDocMovementSn extends BaseBean { @Transient @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") public Integer itemStatus; - - @Transient - @ApiParam("打印模板名称") - private String templateName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 422cf79..0e5b1f3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -282,6 +282,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "是否最早批次") public String isFifo; + @Transient + @ApiParam("打印模板名称") + private String templateName; + public WmsStockSn() { } From fe809e2effe6bc536d1ee6d1cd4d6b9e8fe7d4ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 3 Jan 2020 17:51:55 +0800 Subject: [PATCH 06/31] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=A4=84=E7=90=86?= =?UTF-8?q?=E9=81=97=E6=BC=8F=E7=9A=84=E5=BE=85=E5=A4=84=E7=90=86=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E5=8D=95JOB=EF=BC=9A=E5=A4=84=E7=90=86=E5=91=A8?= =?UTF-8?q?=E6=9C=9F=E6=94=B9=E4=B8=BA=E5=8F=AF=E9=85=8D=E7=BD=AE=E7=9A=84?= =?UTF-8?q?JOB=E5=8F=82=E6=95=B0+=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=EF=BC=9A=E5=9C=A8=E6=94=BE=E5=85=A5=E2=80=9CIS=5FCOMMIT=5FREF?= =?UTF-8?q?=5FMOVE=E2=80=9D=E7=BC=93=E5=AD=98=E6=97=B6=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E4=B8=BA=E7=A9=BA+?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E7=B1=BB=E5=9E=8B=E6=B7=BB=E5=8A=A0=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E2=80=9C=E6=98=AF=E5=90=A6=E6=8E=A8=E9=80=81=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E9=82=AE=E4=BB=B6=E2=80=9D=E7=94=A8=E4=BA=8E=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E5=A4=84=E7=90=86=E7=A7=BB=E5=8A=A8=E5=8D=95?= =?UTF-8?q?=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 3 +++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java index b84e932..6bfdd58 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java @@ -19,4 +19,9 @@ public class WmsJobParamModel implements Serializable { private List zonesNoList;//存储区编号 private Integer snType;//条码类型（虚拟，实物） private String devOpsEmail;//运维人员邮箱 + private Integer minuteDiff;//处理周期(分钟) + + public int getMinuteDiffVal() { + return this.minuteDiff == null ? 0 : this.minuteDiff.intValue(); + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index 9d502de..36ce2dc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -96,6 +96,9 @@ public class WmsActionGroup extends BaseBean { return this.endAmId == null ? 0 : this.endAmId.longValue(); } + public int getIsCommitRefMoveVal() { + return this.isCommitRefMove == null ? 0 : this.isCommitRefMove.intValue(); + } public int getAutoInitVal() { return this.autoInit == null ? 0 : this.autoInit.intValue(); } From 3fe50125ae70033f502d3a088282953e0a658b65 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 6 Jan 2020 09:36:29 +0800 Subject: [PATCH 07/31] JIS --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 10 +- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 106 +++++++++++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesJisPattern.java | 64 +++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesQueueJis.java | 64 +++++++++++++ .../pojo/mes/pcn/bean/MesQueueJisDetail.java | 56 +++++++++++ .../i3plus/pojo/mes/pcn/model/QueueJisModel.java | 60 ++++++++++++ .../pcn/repository/MesJisPatternRepository.java | 16 ++++ .../repository/MesQueueJisDetailRepository.java | 16 ++++ .../mes/pcn/repository/MesQueueJisRepository.java | 16 ++++ .../estsh/i3plus/pojo/mes/bean/MesJisPattern.java | 6 +- .../cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java | 8 ++ .../estsh/i3plus/pojo/mes/model/QueueJisModel.java | 100 ------------------- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 - 13 files changed, 414 insertions(+), 111 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesJisPattern.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesJisPatternRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.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 0bb09ea..0f44cb0 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 @@ -48,17 +48,17 @@ public class MesEnumUtil { } /** - * JIS发运产品组扫描顺序类型 + * JIS发运是否按主队列顺序扫描 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_JIS_SCAN_SEQ_TYPE { - ONE_PROD(10, "整发"), - MANY_PROD(20, "单发"); + public enum MES_JIS_SCAN_TYPE { + TRUE(10, "是"), + FALSE(20, "否"); private int value; private String description; - MES_JIS_SCAN_SEQ_TYPE(int value, String description) { + MES_JIS_SCAN_TYPE(int value, String description) { this.value = value; this.description = description; } 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 d6154b5..5a93fce 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,112 @@ import org.apache.commons.lang3.StringUtils; public class MesPcnEnumUtil { /** + * JIS发运模式类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_JIS_PATTERN_TYPE { + ONE_PROD(10, "单产品发运"), + MANY_PROD(20, "多产品发运"); + + private int value; + private String description; + + MES_JIS_PATTERN_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; + } + } + + /** + * JIS发运是否按主队列顺序扫描 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_JIS_SCAN_TYPE { + TRUE(10, "是"), + FALSE(20, "否"); + + private int value; + private String description; + + MES_JIS_SCAN_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; + } + } + + /** + * JIS发运队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_QUEUE_JIS_STATUS { + + TRUE(10, "已发运"), + FALSE(20, "未发运"); + + private int value; + private String description; + + MES_QUEUE_JIS_STATUS(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; + } + } + + /** * MesMethod实体对应的methodType值 * 10. */ diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesJisPattern.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesJisPattern.java new file mode 100644 index 0000000..4b02d0a --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesJisPattern.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 :JIS发运模式 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_JIS_PATTERN") +@Api("JIS发运模式") +public class MesJisPattern extends BaseBean { + + @Column(name = "PATTERN_NO") + @ApiParam("模式编号") + private String patternNo; + + @Column(name = "PATTERN_NAME") + @ApiParam("模式名称") + private String patternName; + + @Column(name = "RULE") + @ApiParam("规则") + private String rule; + + @Column(name = "DESC") + @ApiParam("描述") + private String desc; + + @Column(name = "TOP_NO") + @ApiParam("一次显示TOP数") + private Integer topNo; + + @Column(name = "HANDLE_NO") + @ApiParam("一次处理套数") + private Integer handleNo; + + @Column(name = "PATTERN_TYPE") + @ApiParam("模式类型") + private Integer patternType; + + @Column(name = "SCAN_TYPE") + @ApiParam("是否按主队列顺序扫描") + private Integer scanType; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java new file mode 100644 index 0000000..b833dfc --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 :JIS发运队列 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIS") +@Api("JIS发运队列") +public class MesQueueJis extends BaseBean { + + @Column(name = "JIS_NO") + @ApiParam("主队列编号") + private String jisNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "CAR_NO") + @ApiParam("车号") + private String carNo; + + @Column(name = "SEQ") + @ApiParam("排序") + private Double seq; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java new file mode 100644 index 0000000..e8243ed --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 :JIS发运队列明细 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIS_DETAIL") +@Api("JIS发运队列明细") +public class MesQueueJisDetail extends BaseBean { + + @Column(name = "JIS_NO") + @ApiParam("主队列编号") + private String jisNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java new file mode 100644 index 0000000..1cd6a17 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class QueueJisModel implements Serializable { + + @ApiParam("主队列编号") + private String jisNo; + + @ApiParam("vin") + private String vinCode; + + @ApiParam("车号") + private String carNo; + + @ApiParam("排序") + private Double seq; + + @ApiParam("状态") + private Integer status; + + @ApiParam("产品配置代码") + private String prodCfgCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("产品类型代码") + private String produceCategoryCode; + + @ApiParam("明细状态") + private Integer detailStatus; + + @ApiParam("产品条码") + private String serialNumber; + + public QueueJisModel() { + } + + public QueueJisModel(String jisNo, String vinCode, String carNo, Double seq, Integer status, String prodCfgCode, String partNo, String partNameRdd, String produceCategoryCode, Integer detailStatus, String serialNumber) { + this.jisNo = jisNo; + this.vinCode = vinCode; + this.carNo = carNo; + this.seq = seq; + this.status = status; + this.prodCfgCode = prodCfgCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.produceCategoryCode = produceCategoryCode; + this.detailStatus = detailStatus; + this.serialNumber = serialNumber; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesJisPatternRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesJisPatternRepository.java new file mode 100644 index 0000000..8c06cef --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesJisPatternRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesJisPattern; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Repository +public interface MesJisPatternRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java new file mode 100644 index 0000000..bd19fef --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueJisDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Repository +public interface MesQueueJisDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java new file mode 100644 index 0000000..8a08948 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueJis; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Repository +public interface MesQueueJisRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java index f3c9f89..ad8bc0b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java @@ -57,8 +57,8 @@ public class MesJisPattern extends BaseBean { @ApiParam("模式类型") private Integer patternType; - @Column(name = "SCAN_SEQ_TYPE") - @ApiParam("产品组扫描顺序类型") - private Integer scanSeqType; + @Column(name = "SCAN_TYPE") + @ApiParam("是否按主队列顺序扫描") + private Integer scanType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java index 6f65fce..87f6946 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java @@ -53,4 +53,12 @@ public class MesQueueJis extends BaseBean { @ApiParam("状态") private Integer status; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java deleted file mode 100644 index be4145b..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java +++ /dev/null @@ -1,100 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; - -@Data -public class QueueJisModel implements Serializable { - @ApiParam("id") - private Long id; - - @ApiParam("作业任务编号") - private String taskNo; - - @ApiParam("作业类型") - private Integer taskType; - - @ApiParam("作业状态") - private Integer taskStatus; - - @ApiParam(value="生产线") - private String workCenterCode; - - @ApiParam("计划日期") - private String planTime; - - @ApiParam("任务来源") - private Integer taskSource; - - @ApiParam("备注") - private String memo; - - @ApiParam("通知标识") - private Integer notifyFlag; - - @ApiParam("关联任务") - private String relateTask; - - @ApiParam("组织代码") - public String organizeCode; - - @ApiParam("有效性") - public Integer isValid; - - @ApiParam("是否已删除") - public Integer isDeleted; - - @ApiParam("创建用户") - public String createUser; - - @ApiParam("创建日期") - public String createDatetime; - - @ApiParam("修改人") - public String modifyUser; - - @ApiParam("修改日期") - public String modifyDatetime; - - @ApiParam("作业类型") - private String taskTypeName; - - @ApiParam("作业状态") - private String taskStatusName; - - @ApiParam("任务来源") - private String taskSourceName; - - @ApiParam("通知标识") - private String notifyFlagName; - - @ApiParam("mes设备作业任务页面按钮控制") - private MesButtonFlagModel mesButtonFlagModel; - - - public QueueJisModel() { - - } - - public QueueJisModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { - this.id = id; - this.taskNo = taskNo; - this.taskType = taskType; - this.taskStatus = taskStatus; - this.workCenterCode = workCenterCode; - this.planTime = planTime; - this.taskSource = taskSource; - this.memo = memo; - this.notifyFlag = notifyFlag; - this.relateTask = relateTask; - this.organizeCode = organizeCode; - this.isValid = isValid; - this.isDeleted = isDeleted; - this.createUser = createUser; - this.createDatetime = createDatetime; - this.modifyUser = modifyUser; - this.modifyDatetime = modifyDatetime; - } -} 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 19d4f8c..e0d2e6e 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 @@ -2118,9 +2118,6 @@ public class MesHqlPack { if (!StringUtils.isEmpty(jisPattern.getPatternType())) { DdlPreparedPack.getNumEqualPack(jisPattern.getPatternType(), "patternType", packBean); } - if (!StringUtils.isEmpty(jisPattern.getScanSeqType())) { - DdlPreparedPack.getNumEqualPack(jisPattern.getScanSeqType(), "scanSeqType", packBean); - } return packBean; } From bcec1d7e6222e58e4edde1c438c14d9e1ce8e278 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 6 Jan 2020 13:19:17 +0800 Subject: [PATCH 08/31] JIS --- .../{MesJisPattern.java => MesPatternJis.java} | 8 ++++---- ...epository.java => MesPatternJisRepository.java} | 4 ++-- .../{MesJisPattern.java => MesPatternJis.java} | 8 ++++---- ...epository.java => MesPatternJisRepository.java} | 4 ++-- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 22 +++++++++++----------- 5 files changed, 23 insertions(+), 23 deletions(-) rename modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/{MesJisPattern.java => MesPatternJis.java} (90%) rename modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/{MesJisPatternRepository.java => MesPatternJisRepository.java} (65%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/{MesJisPattern.java => MesPatternJis.java} (90%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/{MesJisPatternRepository.java => MesPatternJisRepository.java} (66%) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesJisPattern.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java similarity index 90% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesJisPattern.java rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java index 4b02d0a..09b331d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesJisPattern.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java @@ -25,9 +25,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_JIS_PATTERN") +@Table(name = "MES_PATTERN_JIS") @Api("JIS发运模式") -public class MesJisPattern extends BaseBean { +public class MesPatternJis extends BaseBean { @Column(name = "PATTERN_NO") @ApiParam("模式编号") @@ -41,9 +41,9 @@ public class MesJisPattern extends BaseBean { @ApiParam("规则") private String rule; - @Column(name = "DESC") + @Column(name = "PATTERN_DESC") @ApiParam("描述") - private String desc; + private String patternDesc; @Column(name = "TOP_NO") @ApiParam("一次显示TOP数") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesJisPatternRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java similarity index 65% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesJisPatternRepository.java rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java index 8c06cef..87029c6 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesJisPatternRepository.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.mes.pcn.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesJisPattern; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPatternJis; import org.springframework.stereotype.Repository; /** @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface MesJisPatternRepository extends BaseRepository { +public interface MesPatternJisRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java similarity index 90% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java index ad8bc0b..34911dd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java @@ -25,9 +25,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_JIS_PATTERN") +@Table(name = "MES_PATTERN_JIS") @Api("JIS发运模式") -public class MesJisPattern extends BaseBean { +public class MesPatternJis extends BaseBean { @Column(name = "PATTERN_NO") @ApiParam("模式编号") @@ -41,9 +41,9 @@ public class MesJisPattern extends BaseBean { @ApiParam("规则") private String rule; - @Column(name = "DESC") + @Column(name = "PATTERN_DESC") @ApiParam("描述") - private String desc; + private String patternDesc; @Column(name = "TOP_NO") @ApiParam("一次显示TOP数") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJisPatternRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPatternJisRepository.java similarity index 66% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJisPatternRepository.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPatternJisRepository.java index 11e0ba0..59da062 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJisPatternRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPatternJisRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.MesJisPattern; +import cn.estsh.i3plus.pojo.mes.bean.MesPatternJis; import org.springframework.stereotype.Repository; /** @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface MesJisPatternRepository extends BaseRepository { +public interface MesPatternJisRepository 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 e0d2e6e..d2241c4 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 @@ -2100,23 +2100,23 @@ public class MesHqlPack { /** * JIS发运模式 - * @param jisPattern + * @param patternJis * @param organizeCode * @return */ - public static DdlPackBean getJisPatternCondition(MesJisPattern jisPattern, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(jisPattern, organizeCode); - if (!StringUtils.isEmpty(jisPattern.getPatternNo())) { - DdlPreparedPack.getStringLikerPack(jisPattern.getPatternNo(), "patternNo", packBean); + public static DdlPackBean getPatternJisCondition(MesPatternJis patternJis, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(patternJis, organizeCode); + if (!StringUtils.isEmpty(patternJis.getPatternNo())) { + DdlPreparedPack.getStringLikerPack(patternJis.getPatternNo(), "patternNo", packBean); } - if (!StringUtils.isEmpty(jisPattern.getTopNo())) { - DdlPreparedPack.getNumEqualPack(jisPattern.getTopNo(), "topNo", packBean); + if (!StringUtils.isEmpty(patternJis.getTopNo())) { + DdlPreparedPack.getNumEqualPack(patternJis.getTopNo(), "topNo", packBean); } - if (!StringUtils.isEmpty(jisPattern.getHandleNo())) { - DdlPreparedPack.getNumEqualPack(jisPattern.getHandleNo(), "handleNo", packBean); + if (!StringUtils.isEmpty(patternJis.getHandleNo())) { + DdlPreparedPack.getNumEqualPack(patternJis.getHandleNo(), "handleNo", packBean); } - if (!StringUtils.isEmpty(jisPattern.getPatternType())) { - DdlPreparedPack.getNumEqualPack(jisPattern.getPatternType(), "patternType", packBean); + if (!StringUtils.isEmpty(patternJis.getPatternType())) { + DdlPreparedPack.getNumEqualPack(patternJis.getPatternType(), "patternType", packBean); } return packBean; } From fea1811191306ad73b1363a01c5f88e03661520c Mon Sep 17 00:00:00 2001 From: jokelone Date: Mon, 6 Jan 2020 16:59:34 +0800 Subject: [PATCH 09/31] =?UTF-8?q?=E3=80=90bug=EF=BC=9A7153=20JIT=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java index b7f831b..a3f4547 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java @@ -17,6 +17,7 @@ import java.io.Serializable; @Data @Api("JIT队列列表Model") public class QueueOrderModel implements Serializable { + private Long id; @ApiParam("队列序号") public Double queueSeq; @ApiParam("队列明细序号") @@ -52,8 +53,9 @@ public class QueueOrderModel implements Serializable { public QueueOrderModel() { } - public QueueOrderModel(Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) { + this.id = id; this.queueSeq = queueSeq; this.queDetailSeq = queDetailSeq; this.custFlagNo = custFlagNo; 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 19d4f8c..1fe9483 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 @@ -1483,7 +1483,7 @@ public class MesHqlPack { public static DdlPackBean getMesTypeCfg(MesTypeCfg mesTypeCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesTypeCfg, organizeCode); if (!StringUtils.isEmpty(mesTypeCfg.getTypeCode())) { - DdlPreparedPack.getStringLikerPack(mesTypeCfg.getTypeCode(), "typeCode", packBean); + DdlPreparedPack.getStringEqualPack(mesTypeCfg.getTypeCode(), "typeCode", packBean); } if (!StringUtils.isEmpty(mesTypeCfg.getBusinessTypeCode())) { DdlPreparedPack.getStringLikerPack(mesTypeCfg.getBusinessTypeCode(), "businessTypeCode", packBean); From a9f2cf25015ddc58032e1a01240e0e54b4524cea Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 6 Jan 2020 19:12:44 +0800 Subject: [PATCH 10/31] =?UTF-8?q?task=201309=20=E5=A4=A7=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java | 10 ++++++---- .../annotation/{UseMongoDb.java => ElasticSearch.java} | 2 +- .../cn/estsh/i3plus/pojo/mes/annotation/Json4Es.java | 15 +++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesProductData.java | 17 ++++++++++------- 4 files changed, 32 insertions(+), 12 deletions(-) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/{UseMongoDb.java => ElasticSearch.java} (87%) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/Json4Es.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java index 532ec2a..5bd3895 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java @@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description :生产数据 @@ -102,4 +99,9 @@ public class MesProductData extends BaseBean { @ApiParam("数据组号") private String groupNo; + @Lob + @Column(name = "TEST_DATA") + @ApiParam("测试json数据") + private String testData; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/ElasticSearch.java similarity index 87% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/ElasticSearch.java index e4d90a6..93e0ba9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/ElasticSearch.java @@ -11,5 +11,5 @@ import java.lang.annotation.*; @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) @Documented -public @interface UseMongoDb { +public @interface ElasticSearch { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/Json4Es.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/Json4Es.java new file mode 100644 index 0000000..3921f97 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/Json4Es.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.annotation; + + +import java.lang.annotation.*; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/12/25 1:45 下午 + * @Description: + **/ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD}) +@Documented +public @interface Json4Es { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index 602bb21..fc86e50 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -2,7 +2,8 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.mes.annotation.UseMongoDb; +import cn.estsh.i3plus.pojo.mes.annotation.ElasticSearch; +import cn.estsh.i3plus.pojo.mes.annotation.Json4Es; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -10,11 +11,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description :生产数据 @@ -34,7 +31,7 @@ import javax.persistence.Transient; @Index(columnList = "OBJECT_CODE"), @Index(columnList = "MODIFY_DATE_TIME") }) -//@UseMongoDb +@ElasticSearch @Api("生产数据") public class MesProductData extends BaseBean { @Column(name = "WORK_CENTER_CODE") @@ -109,6 +106,12 @@ public class MesProductData extends BaseBean { @ApiParam("数据组号") private String groupNo; + @Json4Es + @Column(name = "TEST_DATA") + @ApiParam("测试json数据") + private String testData; + + @Lob @Transient @ApiParam("字段总数") private Integer fieldNum; From 8584946ce5bb67150ed64ddd088f46c74cfb2a4a Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 6 Jan 2020 21:51:29 +0800 Subject: [PATCH 11/31] =?UTF-8?q?=E3=80=90=20=20=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=8A=A5=E8=A1=A8=EF=BC=8C=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=97=B6=E4=B8=8B=E5=88=97=E4=B8=89=E4=B8=AA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=B8=BA=E4=B8=AD=E6=96=87=20=E3=80=91bug7196?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index f2ef95b..a05fe1b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.base.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -66,7 +67,7 @@ public abstract class BaseBean implements Serializable { @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) @ApiParam(value = "有效性",example = "1") - @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) public Integer isValid; //CommonEnumUtil.IS_VAILD; @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false) From bf624942363519243b0a68a2aff80c1ecbbede67 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 7 Jan 2020 09:22:04 +0800 Subject: [PATCH 12/31] JIS --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 1 + .../i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java | 51 ++++++++++++++++++++++ .../pojo/mes/pcn/bean/MesProduceCategory.java | 38 ++++++++++++++++ .../pcn/repository/MesProdCfgDetailRepository.java | 16 +++++++ .../repository/MesProduceCategoryRepository.java | 16 +++++++ .../estsh/i3plus/pojo/mes/bean/MesPatternJis.java | 2 + 6 files changed, 124 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.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 0f44cb0..86a66f5 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 @@ -2620,6 +2620,7 @@ public class MesEnumUtil { PUBLIC(10, "公用"), JIT(20, "JIT生产"), WORK_ORDER(30, "工单生产"), + JIS(40, "JIS发运"), OTHER(99, "其他"); private int value; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java new file mode 100644 index 0000000..cbb3f3d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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; +import javax.persistence.Transient; + +/** + * @Description :产品配置明细 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_CFG_DETAIL") +@Api("产品配置明细") +public class MesProdCfgDetail extends BaseBean { + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "IS_VIRTUAL") + @ApiParam("是否虚零件") + private Integer isVirtual; + + @Transient + @ApiParam("零件名称") + private String partName; + + public int getIsVirtualVal() { + return this.isVirtual == null ? 0 : this.isVirtual; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java new file mode 100644 index 0000000..131674e --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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: Crish + * @CreateDate:2019-04-26-10:25 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCE_CATEGORY") +@Api("系统业务动作") +public class MesProduceCategory extends BaseBean { + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品类型代码") + private String produceCategoryCode; + + @Column(name = "PRODUCE_CTGY_NAME") + @ApiParam("产品类型名称") + private String produceCategoryName; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java new file mode 100644 index 0000000..c93700b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdCfgDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdCfgDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java new file mode 100644 index 0000000..50602d5 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceCategory; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-26-10:28 + * @Modify: + **/ +@Repository +public interface MesProduceCategoryRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java index 34911dd..b7a7b64 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -37,6 +38,7 @@ public class MesPatternJis extends BaseBean { @ApiParam("模式名称") private String patternName; + @Lob @Column(name = "RULE") @ApiParam("规则") private String rule; From 7d63a933c02da36dd1db30e61af2a328e595c971 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 7 Jan 2020 10:37:15 +0800 Subject: [PATCH 13/31] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5JOB?= =?UTF-8?q?=E5=87=BA=E9=94=99=E6=B2=A1=E6=9C=89=E6=9B=B4=E6=96=B0=E7=8A=B6?= =?UTF-8?q?=E6=80=81+=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E7=BB=84=E4=BB=B6=E6=B2=A1=E6=9C=89=E9=87=8D?= =?UTF-8?q?=E6=96=B0=E5=8A=A0=E8=BD=BD=E7=BB=84=E4=BB=B6+=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E7=AE=A1=E5=AE=B6=EF=BC=9A=E5=8A=A0=E4=B8=8A=E5=8F=AF?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=98=AF=E5=90=A6=E6=8F=90=E4=BA=A4=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index 36ce2dc..9a726ee 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -75,6 +75,12 @@ public class WmsActionGroup extends BaseBean { @AnnoOutputColumn private Integer isCommitRefMove; + // 1=true, 2 = false + @Column(name = "IS_AUTO_COMMIT", nullable = false) + @ApiParam(value = "是否自动提交", example = "1") + @AnnoOutputColumn + private Integer isAutoCommit; + @Lob @Column(name = "POSITION") @ApiParam(value = "GOJS位置") @@ -99,6 +105,11 @@ public class WmsActionGroup extends BaseBean { public int getIsCommitRefMoveVal() { return this.isCommitRefMove == null ? 0 : this.isCommitRefMove.intValue(); } + + public int getIsAutoCommitVal() { + return this.isCommitRefMove == null ? 0 : this.isCommitRefMove.intValue(); + } + public int getAutoInitVal() { return this.autoInit == null ? 0 : this.autoInit.intValue(); } From b939ce66253140c7becc3b6af73e503c6f54f426 Mon Sep 17 00:00:00 2001 From: e-jiawentao1 Date: Tue, 7 Jan 2020 11:10:36 +0800 Subject: [PATCH 14/31] =?UTF-8?q?2020-01-07=E5=88=9B=E5=BB=BA=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E6=9F=A5=E8=AF=A2=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java | 51 +++++++++++++++ .../pojo/wms/bean/dynamic/WmsListElement.java | 75 ++++++++++++++++++++++ .../wms/bean/dynamic/WmsListElementFunction.java | 47 ++++++++++++++ .../pojo/wms/bean/dynamic/WmsSearchElement.java | 51 +++++++++++++++ .../wms/bean/dynamic/WmsSearchElementFunction.java | 55 ++++++++++++++++ 5 files changed, 279 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java new file mode 100644 index 0000000..718dd49 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.wms.bean.dynamic; + +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 : WMS字段信息表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 09:06 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_FIELDINFO") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="WMS字段信息表",description = "WMS字段信息表") +public class WmsFieldInfo extends BaseBean { + + private static final long serialVersionUID = 3903166651913139064L; + @Column(name = "FIELD_NAME") + @ApiParam(value = "字段名称") + private String fieldName; + + @Column(name = "FIELD_DESC") + @ApiParam(value = "字段描述") + private String fieldDesc; + + @Column(name = "FIELD_TYPE") + @ApiParam(value = "字段类型") + private String fieldType; + + @Column(name = "ENTITY_NAME") + @ApiParam(value = "实体名称") + private String entityName; + + @Column(name = "ENTITY_DESC") + @ApiParam(value = "实体描述") + private String entityDesc; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java new file mode 100644 index 0000000..bd3d125 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.wms.bean.dynamic; + +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 : WMS列表元素表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 09:06 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_LISTELEMENT") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="WMS列表元素表",description = "WMS列表元素表") +public class WmsListElement extends BaseBean { + + private static final long serialVersionUID = 3903166651913139060L; + @Column(name = "FIELD_NAME") + @ApiParam(value = "字段名称") + private String fieldName; + + @Column(name = "TITLE_NAME") + @ApiParam(value = "标题名称") + private String titleName; + + @Column(name = "SEQ") + @ApiParam(value = "序列号:字段标题排序使用默认0（不排序）") + private Integer seq; + + @Column(name = "IS_REQUIRE") + @ApiParam(value = "是否必选:默认1-必选，2-非必选") + private Integer isRequire; + + @Column(name = "WIDTH", columnDefinition = "decimal(2,5)") + @ApiParam(value = "宽度", example = "0") + private Double width; + + public Double getWidth() { + return this.width == null ? 0 : this.width.doubleValue(); + } + + @Column(name = "SORT") + @ApiParam(value = "排序规则:默认0-不排序，1-升序2-降序") + private Integer sort; + + @Column(name = "IS_WIDER") + @ApiParam(value = "是否加粗:默认1-加粗，2-非加粗") + private Integer isWider; + + @Column(name = "IS_SELECT") + @ApiParam(value = "是否勾选:默认1-勾选，2-非勾选") + private Integer isSelect; + + @Column(name = "ISSHOW") + @ApiParam(value = "是否表单字段展示:默认1-显示，2-隐藏") + private Integer isShow; + + @Column(name = "DEFAULT_VALUE") + @ApiParam(value = "表单字段默认值") + private String defaultValue; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java new file mode 100644 index 0000000..18ff672 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.wms.bean.dynamic; + +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 : WMS列表元素菜单关系表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 09:06 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_LISTELEMENT_FUNCTION") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="WMS列表元素菜单关系表",description = "WMS列表元素菜单关系表") +public class WmsListElementFunction extends BaseBean { + + private static final long serialVersionUID = 3903166651913139061L; + @Column(name = "FUNCTION_ID") + @ApiParam(value = "功能菜单ID") + private Long functionId; + + @Column(name = "ELEMENT_ID") + @ApiParam(value = "元素ID") + private Long elementId; + + @Column(name = "USER_CODE") + @ApiParam(value = "用户编号") + private String userCode; + + @Column(name = "IS_DEFAULT") + @ApiParam(value = "是否默认配置") + private Integer isDefault; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java new file mode 100644 index 0000000..cdae331 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.wms.bean.dynamic; + +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 : WMS搜索元素表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 09:06 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_SEARCHELEMENT") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="WMS搜索元素表",description = "WMS搜索元素表") +public class WmsSearchElement extends BaseBean { + + private static final long serialVersionUID = 3903166651913139062L; + @Column(name = "FIELD_NAME") + @ApiParam(value = "字段名称") + private String fieldName; + + @Column(name = "TITLE_NAME") + @ApiParam(value = "标题名称") + private String titleName; + + @Column(name = "CONDITION_EXPRE") + @ApiParam(value = "条件表达式:>,<,>=等") + private String conditionExpre; + + @Column(name = "VALUE") + @ApiParam(value = "检索值") + private String value; + + @Column(name = "CONDITION_CONNECTOR") + @ApiParam(value = "条件连接符:and/or") + private String conditionConnector; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java new file mode 100644 index 0000000..4e0a3fd --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.wms.bean.dynamic; + +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 : WMS搜索元素菜单关系表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 09:06 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_SEARCHELEMENT_FUNCTION") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="WMS搜索元素菜单关系表",description = "WMS搜索元素菜单关系表") +public class WmsSearchElementFunction extends BaseBean { + + private static final long serialVersionUID = 3903166651913139063L; + @Column(name = "FUNCTION_ID") + @ApiParam(value = "功能菜单ID") + private Long functionId; + + @Column(name = "GROUP_NAME") + @ApiParam(value = "组名称") + private String groupName; + + @Column(name = "SEARCH_ELEMENT_ID") + @ApiParam(value = "搜索元素ID") + private Long searchElementId; + + @Column(name = "GROUP_CONNECTOR") + @ApiParam(value = "组条件连接符") + private String groupConnector; + + @Column(name = "USER_CODE") + @ApiParam(value = "用户编号") + private String userCode; + + @Column(name = "IS_SHAER") + @ApiParam(value = "是否共享") + private Integer isShaer; +} From b2edab4ef403dc6e7ec251dc4a69109f3ae1f5f6 Mon Sep 17 00:00:00 2001 From: e-jiawentao1 Date: Tue, 7 Jan 2020 11:38:51 +0800 Subject: [PATCH 15/31] =?UTF-8?q?2020-01-07=E5=88=9B=E5=BB=BA=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E6=9F=A5=E8=AF=A2=E4=B8=8E=E8=A1=A8=E5=8D=95dao?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/repository/WmsFieldInfoRepository.java | 16 ++++++++++++++++ .../wms/repository/WmsListElementFunctionRepository.java | 16 ++++++++++++++++ .../pojo/wms/repository/WmsListElementRepository.java | 16 ++++++++++++++++ .../repository/WmsSearchElementFunctionRepository.java | 16 ++++++++++++++++ .../pojo/wms/repository/WmsSearchElementRepository.java | 16 ++++++++++++++++ 5 files changed, 80 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldInfoRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementFunctionRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementFunctionRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldInfoRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldInfoRepository.java new file mode 100644 index 0000000..f1e59d0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldInfoRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo; +import org.springframework.stereotype.Repository; + +/** + * @Description : WMS字段信息表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 11:30 + * @Modify: + **/ +@Repository +public interface WmsFieldInfoRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementFunctionRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementFunctionRepository.java new file mode 100644 index 0000000..5b724e6 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementFunctionRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElementFunction; +import org.springframework.stereotype.Repository; + +/** + * @Description : WMS列表元素菜单关系表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 11:30 + * @Modify: + **/ +@Repository +public interface WmsListElementFunctionRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementRepository.java new file mode 100644 index 0000000..9433e7d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElement; +import org.springframework.stereotype.Repository; + +/** + * @Description : WMS列表元素表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 11:30 + * @Modify: + **/ +@Repository +public interface WmsListElementRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementFunctionRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementFunctionRepository.java new file mode 100644 index 0000000..1746d7e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementFunctionRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElementFunction; +import org.springframework.stereotype.Repository; + +/** + * @Description : WMS搜索元素菜单关系表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 11:30 + * @Modify: + **/ +@Repository +public interface WmsSearchElementFunctionRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementRepository.java new file mode 100644 index 0000000..028586d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElement; +import org.springframework.stereotype.Repository; + +/** + * @Description : WMS搜索元素表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 11:30 + * @Modify: + **/ +@Repository +public interface WmsSearchElementRepository extends BaseRepository { +} From 9fbc12066626290854f75e5a34930f705228fd2a Mon Sep 17 00:00:00 2001 From: e-jiawentao1 Date: Tue, 7 Jan 2020 18:09:50 +0800 Subject: [PATCH 16/31] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=8E=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97=E8=A1=A8=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E6=89=AB=E6=8F=8FBean=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/annotation/FieldAnnotation.java | 16 ++++++++++ .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 4 +++ .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 36 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 8 +++++ 4 files changed, 64 insertions(+) create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java new file mode 100644 index 0000000..5a6b149 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.base.annotation; + +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; + +import java.lang.annotation.*; + +/** + * 字段类型属性注解 + */ +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD}) +public @interface FieldAnnotation { + // Web前端字段数据类型 + WmsEnumUtil.FIELD_TYPE webFieldType(); +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index a05fe1b..5ba62b3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.base.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import com.alibaba.fastjson.annotation.JSONField; @@ -67,11 +68,13 @@ public abstract class BaseBean implements Serializable { @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) @ApiParam(value = "有效性",example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) public Integer isValid; //CommonEnumUtil.IS_VAILD; @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false) @ApiParam(value = "是否已删除",example = "2") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) @AnnoOutputColumn(hidden = true) //逻辑删除，软删除 public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSEA @@ -127,6 +130,7 @@ public abstract class BaseBean implements Serializable { @Transient @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1") @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc public transient Integer ascOrDesc = 1; 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 665cbcb..a25a0d7 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 @@ -4792,5 +4792,41 @@ public class WmsEnumUtil { } } + /** + * WEB页面字段类型 + * 10-文本类型，20-数字类型，30-下拉框类型，40，时间类型，50-开窗查询类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FIELD_TYPE { + TEXT(10, "text"), NUMBER(20, "number"), + SELECT(30, "select"), DATETIME(40, "datetime"), + LIST(50, "list"); + + private int value; + private String description; + + FIELD_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; + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 0f31d20..1b049a9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; @@ -46,6 +47,7 @@ public class WmsPart extends BaseBean { @Column(name = "PART_TYPE") @ApiParam(value = "物料类型") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class, refForeignKey = "value", value = "description") private String partType; @@ -96,6 +98,7 @@ public class WmsPart extends BaseBean { @ColumnDefault("2") @Column(name = "IQC") @ApiParam(value = "是否免检", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) private Integer iqc; @Column(name = "MIN", columnDefinition = "decimal(18,8)") @@ -116,6 +119,7 @@ public class WmsPart extends BaseBean { @Column(name = "SN_CONTROL") @ApiParam(value = "是否条码管理", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) private Integer snControl; @Column(name = "VENDOR_NO") @@ -152,6 +156,7 @@ public class WmsPart extends BaseBean { @Column(name = "IS_REPORT_PARTNO") @ApiParam("是否报工零件") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) private Integer isReportPartNo; @Column(name = "REPORT_LOCATE_NO") @@ -172,6 +177,7 @@ public class WmsPart extends BaseBean { @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") @ApiParam(value = "是否贵重") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description") private Integer isValuable; @@ -189,10 +195,12 @@ public class WmsPart extends BaseBean { private Double verbNum; @Column(name = "IS_PROD_LOT") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) @ApiParam(value = "是否录入生产批次", example = "1") private Integer isProdLot = 2; @Column(name = "PULL_WAY") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) @ApiParam(value = "拉动方式", example = "0") private Integer pullWay = 0; From a92090a3ab9f4a032099b06b39d8f4544debb274 Mon Sep 17 00:00:00 2001 From: e-jiawentao1 Date: Tue, 7 Jan 2020 18:11:40 +0800 Subject: [PATCH 17/31] =?UTF-8?q?2020-01-07=E5=88=9B=E5=BB=BA=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E6=9F=A5=E8=AF=A2=E4=B8=8E=E8=A1=A8=E5=8D=95=E5=90=84?= =?UTF-8?q?=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/bean/dynamic/WmsSearchElementFunction.java | 4 +- .../pojo/wms/modelbean/WmsListElementModel.java | 55 ++++++++++++++++++++++ .../pojo/wms/modelbean/WmsSearchElementModel.java | 48 +++++++++++++++++++ 3 files changed, 105 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsListElementModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsSearchElementModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java index 4e0a3fd..81bf452 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java @@ -49,7 +49,7 @@ public class WmsSearchElementFunction extends BaseBean { @ApiParam(value = "用户编号") private String userCode; - @Column(name = "IS_SHAER") + @Column(name = "IS_SHARE") @ApiParam(value = "是否共享") - private Integer isShaer; + private Integer isShare; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsListElementModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsListElementModel.java new file mode 100644 index 0000000..1c2eb95 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsListElementModel.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : WMS列表菜单model + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 14:33 + * @Modify: + **/ +@Data +@Api("WMS列表菜单model") +public class WmsListElementModel extends BaseBean { + + @ApiParam("字段名称") + private String fieldName; + + @ApiParam("标题名称") + private String titleName; + + @ApiParam("序列号:字段标题排序使用默认0（不排序）") + private Integer seq; + + @ApiParam(value = "是否必选:默认1-必选，2-非必选") + private Integer isRequire; + + @ApiParam(value = "宽度") + private Double width; + + @ApiParam(value = "排序规则:默认0-不排序，1-升序2-降序") + private Integer sort; + + @ApiParam(value = "是否加粗:默认1-加粗，2-非加粗") + private Integer isWider; + + @ApiParam(value = "是否勾选:默认1-勾选，2-非勾选") + private Integer isSelect; + + @ApiParam(value = "表单字段默认值") + private String defaultValue; + + @ApiParam(value = "功能菜单ID") + private Long functionId; + + @ApiParam(value = "用户编号") + private String userCode; + + @ApiParam(value = "是否默认配置") + private Integer isDefault; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsSearchElementModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsSearchElementModel.java new file mode 100644 index 0000000..b9a1224 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsSearchElementModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : WMS列表搜索model + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 14:33 + * @Modify: + **/ +@Data +@Api("WMS列表搜索model") +public class WmsSearchElementModel extends BaseBean { + + @ApiParam("字段名称") + private String fieldName; + + @ApiParam("标题名称") + private String titleName; + + @ApiParam(value = "条件表达式:>,<,>=等") + private String conditionExpre; + + @ApiParam(value = "检索值") + private String value; + + @ApiParam(value = "条件连接符:and/or") + private String conditionConnector; + + @ApiParam(value = "功能菜单ID") + private Long functionId; + + @ApiParam(value = "组名称") + private String groupName; + + @ApiParam(value = "组条件连接符") + private String groupConnector; + + @ApiParam(value = "用户编号") + private String userCode; + + @ApiParam(value = "是否共享") + private Integer isShare; +} From 54bdf8f6a0e80185ec0f3a2b9ae1af058c9beebf Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 7 Jan 2020 19:48:51 +0800 Subject: [PATCH 18/31] JIS --- .../cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 9 --------- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java | 6 +++--- .../estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 86a66f5..9af8a31 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 @@ -187,15 +187,6 @@ public class MesEnumUtil { return tmp; } - public static String valueOfDescription2(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description; - } - } - return tmp; - } } @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java index 1859025..78b1e77 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java @@ -69,9 +69,9 @@ public class MesPart extends BaseBean { @ApiParam("默认工作中心") private String defaultWorkCenter; - @Column(name = "PRODUCE_CATEGORY") - @ApiParam("产品类型") - private String produceCategory; + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品类型代码") + private String produceCategoryCode; @Column(name = "PROCESS_MATCH_TYPE") @ApiParam("过程编码匹配类型") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java index 1cd6a17..7a32f8b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.mes.pcn.model; +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -41,6 +42,20 @@ public class QueueJisModel implements Serializable { @ApiParam("产品条码") private String serialNumber; + @ApiParam("状态名称") + private String statusName; + + @ApiParam("明细状态名称") + private String detailStatusName; + + public String getStatusName() { + return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.status); + } + + public String getDetailStatusName() { + return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.detailStatus); + } + public QueueJisModel() { } @@ -57,4 +72,5 @@ public class QueueJisModel implements Serializable { this.detailStatus = detailStatus; this.serialNumber = serialNumber; } + } From 0d7aca73a85e09c4fe91bf4dd7d651547b7607a6 Mon Sep 17 00:00:00 2001 From: jokelone Date: Tue, 7 Jan 2020 20:05:36 +0800 Subject: [PATCH 19/31] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A7315?= =?UTF-8?q?=20=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=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/MesEnumUtil.java | 3 +-- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 86a66f5..d6e4051 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 @@ -2889,8 +2889,7 @@ public class MesEnumUtil { STANDARD_ORDER(10, "标准工单"), BTS_ORDER(20, "BTS工单"), ATTEMPT_ORDER(30, "试制工单"), - BH_ORDER(40, "B&H工单"), - JIT_ORDER(50, "JIT工单"); + BH_ORDER(40, "B&H工单"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index 20a1b79..e358ca6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -37,7 +37,7 @@ public class MesPackageDetail extends BaseBean { private String serialNumber; @Column(name = "PART_NO") - @ApiParam("产品条码") + @ApiParam("物料号") private String partNo; @Column(name = "PART_NAME_RDD") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java index a67a223..d3ab791 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java @@ -23,8 +23,8 @@ public class MesButtonFlagModel implements Serializable { @ApiParam("修改按钮") private boolean updateButton; -// @ApiParam("按配置修改按钮") -// private boolean updateButtonConfig; + @ApiParam("按配置修改按钮") + private boolean updateButtonConfig; @ApiParam("下达按钮") private boolean transmitButton; From 68fc275565ff4b973b497d7b42449aaff34fbf0e Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 8 Jan 2020 09:54:27 +0800 Subject: [PATCH 20/31] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE=E6=8B=96=E6=8B=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java index 18d4ace..26e9d6c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java @@ -8,10 +8,10 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import javax.persistence.Column; +import javax.persistence.Lob; import javax.persistence.MappedSuperclass; import javax.persistence.Transient; import java.util.HashMap; -import java.util.Map; /** * @Description :APS基类 @@ -26,7 +26,9 @@ import java.util.Map; @ExcludeImportExport public abstract class BaseAPS extends BaseBean { @JsonIgnore - private transient Map customFields = new HashMap<>(); + @Lob + @FieldAnnotation(property = false) + private HashMap customFields = new HashMap<>(); @Column(name="KEY") @ApiParam(value ="主键值") From b0f60a9176fa8da0a2e02c3ff6a893911f31984c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 8 Jan 2020 10:04:20 +0800 Subject: [PATCH 21/31] =?UTF-8?q?2020-01-08=E5=88=9B=E5=BB=BA=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E5=88=97=E8=A1=A8=E4=B8=8E=E6=9F=A5=E8=AF=A2model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms}/WmsListElementModel.java | 2 +- .../java/cn/estsh/i3plus/pojo/model/wms}/WmsSearchElementModel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename modules/{i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean => i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms}/WmsListElementModel.java (96%) rename modules/{i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean => i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms}/WmsSearchElementModel.java (96%) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsListElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java similarity index 96% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsListElementModel.java rename to modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java index 1c2eb95..a286a2e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsListElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.modelbean; +package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsSearchElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java similarity index 96% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsSearchElementModel.java rename to modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java index b9a1224..b785f96 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsSearchElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.modelbean; +package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; From f323637c94ad1302fafc5f35f70665cecbe11d8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 8 Jan 2020 10:44:34 +0800 Subject: [PATCH 22/31] =?UTF-8?q?Wms=E5=88=9D=E5=A7=8B=E5=8C=96=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsFieldInfoModel.java | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java new file mode 100644 index 0000000..ecbf355 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : Wms实体字段Model信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-01-08 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class WmsFieldInfoModel implements Serializable { + + private static final long serialVersionUID = -6376845639646427495L; + + @ApiParam(value = "字段信息列表") + public List wmsFieldInfoList; + + @ApiParam(value = "新增数据操作类") + private String baseRepository; + + public WmsFieldInfoModel (String baseRepository, List wmsFieldInfoList) { + this.baseRepository = baseRepository; + this.wmsFieldInfoList = wmsFieldInfoList; + } +} From c53c8c04e340b59676f7737f78110de3a69f9163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 8 Jan 2020 11:18:10 +0800 Subject: [PATCH 23/31] BUG#7186 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index 9a726ee..41e57d1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -107,7 +107,7 @@ public class WmsActionGroup extends BaseBean { } public int getIsAutoCommitVal() { - return this.isCommitRefMove == null ? 0 : this.isCommitRefMove.intValue(); + return this.isAutoCommit == null ? 0 : this.isAutoCommit.intValue(); } public int getAutoInitVal() { From 7d4ba10449d80125659d4a9c00278e6e79583a50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 8 Jan 2020 15:23:43 +0800 Subject: [PATCH 24/31] =?UTF-8?q?Wms=E5=88=9D=E5=A7=8B=E5=8C=96=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/annotation/FieldAnnotation.java | 18 ++++++++++ .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 5 +++ .../pojo/model/wms/WmsSearchElementModel.java | 3 ++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 34 +++++++++++++++++++ .../i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java | 38 +++++++++++++++++++++- .../pojo/wms/bean/dynamic/WmsListElement.java | 11 ++++--- .../wms/bean/dynamic/WmsSearchElementFunction.java | 4 +++ 7 files changed, 107 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java index 5a6b149..2e2b0a2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java @@ -13,4 +13,22 @@ import java.lang.annotation.*; public @interface FieldAnnotation { // Web前端字段数据类型 WmsEnumUtil.FIELD_TYPE webFieldType(); + // 条件表达式:>,<,>=等 + String conditionExpre() default "="; + // 条件连接符:and/or + String conditionConnector() default "and"; + // 排序序号 + int seq() default 0; + // 字段列宽度 + double width() default 0d; + // 排序规则:默认0-不排序，1-升序2-降序 + int sort() default 0; + // 是否标题字段加粗 是否加粗:默认1-加粗，2-非加粗 + int isWider() default 2; + // 是否勾选:默认1-勾选，2-非勾选 + int isSelect() default 1; + // 是否必选:默认1-必选，2-非必选 + int isRequire() default 1; + // 是否表单字段展示:默认1-显示，2-隐藏 + int isShow() default 1; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 5ba62b3..9c10c6c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -41,6 +41,7 @@ public abstract class BaseBean implements Serializable { @ApiParam(value = "主键",example = "0") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) public Long id; //get单独处理 @@ -63,6 +64,7 @@ public abstract class BaseBean implements Serializable { @Column(name="ORGANIZE_CODE") @ApiParam(value ="组织代码") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) // @AnnoOutputColumn(hidden = true) public String organizeCode; @@ -87,15 +89,18 @@ public abstract class BaseBean implements Serializable { @Indexed(direction = IndexDirection.DESCENDING) @Column(name="CREATE_DATE_TIME",updatable = false) @ApiParam(value = "创建日期") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) public String createDatetime; @Column(name="MODIFY_USER") @ApiParam(value = "修改人") @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) public String modifyUser; @Column(name="MODIFY_DATE_TIME") @ApiParam(value = "修改日期") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) public String modifyDatetime; @Transient diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java index b785f96..9ca8e79 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java @@ -45,4 +45,7 @@ public class WmsSearchElementModel extends BaseBean { @ApiParam(value = "是否共享") private Integer isShare; + + @ApiParam(value = "搜索名称") + private String searchName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 1b049a9..748e194 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -35,14 +35,17 @@ public class WmsPart extends BaseBean { private static final long serialVersionUID = 4849044986767609346L; @Column(name = "PART_NO") @ApiParam(value = "物料编码") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partNo; @Column(name = "PART_NAME") @ApiParam(value = "物料名称") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partName; @Column(name = "PART_SPEC") @ApiParam(value = "物料规格") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partSpec; @Column(name = "PART_TYPE") @@ -53,46 +56,57 @@ public class WmsPart extends BaseBean { @Column(name = "PART_TYPE_DESC") @ApiParam(value = "物料类型描述") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partTypeDesc; @Column(name = "GRAPHI_NO") @ApiParam(value = "图号") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String graphiNo; @Column(name = "VERSION") @ApiParam(value = "版本") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String version; @Column(name = "COLOR") @ApiParam(value = "颜色") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String color; @Column(name = "STOCK_UNIT") @ApiParam(value = "库存单位") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String stockUnit; @Column(name = "ABC") @ApiParam(value = "分类") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String abc; @Column(name = "BUY_UNIT") @ApiParam(value = "采购单位") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String buyUnit; @Column(name = "BU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率1", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double bu2su; @Column(name = "PRICE_UNIT") @ApiParam(value = "计价单位") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String priceUnit; @Column(name = "PU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率2", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double pu2su; @Column(name = "SNP", columnDefinition = "decimal(18,8)") @ApiParam(value = "标包", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double snp; @ColumnDefault("2") @@ -103,18 +117,22 @@ public class WmsPart extends BaseBean { @Column(name = "MIN", columnDefinition = "decimal(18,8)") @ApiParam(value = "最低库存", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double min; @Column(name = "MAX", columnDefinition = "decimal(18,8)") @ApiParam(value = "最高库存", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double max; @Column(name = "PART_GROUP") @ApiParam(value = "物料组") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partGroup; @Column(name = "LOT_CHECK_RULE") @ApiParam(value = "批次校验规则") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String lotCheckRule; @Column(name = "SN_CONTROL") @@ -124,34 +142,42 @@ public class WmsPart extends BaseBean { @Column(name = "VENDOR_NO") @ApiParam(value = "供应商代码") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String vendorNo; @Column(name = "IN_LOCATE_NO") @ApiParam(value = "默认入库库位") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String inLocateNo; @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("项目代码") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String prodCfgTypeCode; @Column(name = "PROD_CFG_TYPE_NAME") @ApiParam("项目名称") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String prodCfgTypeName; @Column(name = "OUT_CLOSE_FLAG") @ApiParam("項目结算标识") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String outCloseFlag = "2"; @Column(name = "OUT_CLOSE_TYPE") @ApiParam("结算方式") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String outCloseType; @Column(name = "OUT_CLOSE_VENDOR") @ApiParam("结算供应商") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String outCloseVendor; @Column(name = "QUALITY_DAYS") @ApiParam("保质期天数") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Integer qualityDays; @Column(name = "IS_REPORT_PARTNO") @@ -161,18 +187,22 @@ public class WmsPart extends BaseBean { @Column(name = "REPORT_LOCATE_NO") @ApiParam("报工库位") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String reportLocateNo; @Column(name = "REPORT_ZONE_NO") @ApiParam("报工存储区") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String reportZoneNo; @Column(name = "PRODUCT_LINES") @ApiParam("报工产线") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String productLines; @Column(name = "PROPORTION", columnDefinition = "decimal(10,5)") @ApiParam(value = "待质检比例", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double proportion; @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") @@ -183,11 +213,13 @@ public class WmsPart extends BaseBean { @Transient @ApiParam("总数量") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double qty; @Transient @ApiParam("库存水平") @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_LEVEL_STATUS.class, refForeignKey = "value", value = "description") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String stockLevelStatus; @Column(name="verb_num") @@ -206,10 +238,12 @@ public class WmsPart extends BaseBean { @Column(name = "CYCLE_RQUEST_PERIOD") @ApiParam(value = "循环补货周期", example = "0") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Integer cycleRquestPeriod = 0; @Column(name = "CYCLE_RQUEST_QTY") @ApiParam(value = "循环补货数量", example = "0") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double cycleRquestQty = 0d; public int getIqcVal(){ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java index 718dd49..7ef1220 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java @@ -7,7 +7,6 @@ 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; @@ -29,6 +28,7 @@ import javax.persistence.Table; public class WmsFieldInfo extends BaseBean { private static final long serialVersionUID = 3903166651913139064L; + @Column(name = "FIELD_NAME") @ApiParam(value = "字段名称") private String fieldName; @@ -48,4 +48,40 @@ public class WmsFieldInfo extends BaseBean { @Column(name = "ENTITY_DESC") @ApiParam(value = "实体描述") private String entityDesc; + + @Column(name = "SEQ") + @ApiParam(value = "序列号:字段标题排序使用默认0（不排序）") + private Integer seq; + + @Column(name = "IS_REQUIRE") + @ApiParam(value = "是否必选:默认1-必选，2-非必选") + private Integer isRequire; + + @Column(name = "WIDTH", columnDefinition = "decimal(18,8)") + @ApiParam(value = "宽度", example = "0") + private Double width; + + @Column(name = "SORT") + @ApiParam(value = "排序规则:默认0-不排序，1-升序2-降序") + private Integer sort; + + @Column(name = "IS_WIDER") + @ApiParam(value = "是否加粗:默认1-加粗，2-非加粗") + private Integer isWider; + + @Column(name = "IS_SELECT") + @ApiParam(value = "是否勾选:默认1-勾选，2-非勾选") + private Integer isSelect; + + @Column(name = "IS_SHOW") + @ApiParam(value = "是否表单字段展示:默认1-显示，2-隐藏") + private Integer isShow; + + @Column(name = "CONDITION_EXPRE") + @ApiParam(value = "条件表达式:>,<,>=等") + private String conditionExpre; + + @Column(name = "CONDITION_CONNECTOR") + @ApiParam(value = "条件连接符:and/or") + private String conditionConnector; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java index bd3d125..09109a7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java @@ -29,6 +29,7 @@ import javax.persistence.Table; public class WmsListElement extends BaseBean { private static final long serialVersionUID = 3903166651913139060L; + @Column(name = "FIELD_NAME") @ApiParam(value = "字段名称") private String fieldName; @@ -45,14 +46,10 @@ public class WmsListElement extends BaseBean { @ApiParam(value = "是否必选:默认1-必选，2-非必选") private Integer isRequire; - @Column(name = "WIDTH", columnDefinition = "decimal(2,5)") + @Column(name = "WIDTH", columnDefinition = "decimal(18,8)") @ApiParam(value = "宽度", example = "0") private Double width; - public Double getWidth() { - return this.width == null ? 0 : this.width.doubleValue(); - } - @Column(name = "SORT") @ApiParam(value = "排序规则:默认0-不排序，1-升序2-降序") private Integer sort; @@ -72,4 +69,8 @@ public class WmsListElement extends BaseBean { @Column(name = "DEFAULT_VALUE") @ApiParam(value = "表单字段默认值") private String defaultValue; + + @Column(name = "USER_CODE") + @ApiParam(value = "用户编号") + private String userCode; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java index 81bf452..d10ef27 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java @@ -37,6 +37,10 @@ public class WmsSearchElementFunction extends BaseBean { @ApiParam(value = "组名称") private String groupName; + @Column(name = "SEARCH_NAME") + @ApiParam(value = "搜索名称") + private String searchName; + @Column(name = "SEARCH_ELEMENT_ID") @ApiParam(value = "搜索元素ID") private Long searchElementId; From 25606ea25ac1b36aeaed58b408d6af8b490d494b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 8 Jan 2020 15:26:46 +0800 Subject: [PATCH 25/31] =?UTF-8?q?=E3=80=906847=20=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=BC=82=E5=B8=B8=E7=9A=84=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E3=80=82=E5=AD=98=E5=9C=A8=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=95=B0=E6=8D=AE=E6=97=B6=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E4=BE=9B=E6=8A=A5=E8=A1=A8=E5=B1=95=E7=A4=BA=E3=80=82=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E5=89=8D=E6=89=80=E6=9C=89=E5=BC=82=E5=B8=B8=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=9D=87=E9=9C=80=E5=A4=84=E7=90=86=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsDataMigrationConfig.java | 90 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 11 +++ .../WmsDataMigrationConfigRepository.java | 17 ++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 21 +++++ 4 files changed, 139 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataMigrationConfigRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java new file mode 100644 index 0000000..9038989 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java @@ -0,0 +1,90 @@ +package cn.estsh.i3plus.pojo.wms.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.ColumnDefault; +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 : WMS数据迁移配置表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-01-08 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_DATA_MIGRATION_CONFIG") +@Api("WMS数据迁移配置表") +public class WmsDataMigrationConfig extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592777L; + + @Column(name="MIG_NAME") + @ApiParam("名称") + private String migName; + + @Column(name="REMARK") + @ApiParam("描述") + private String remark; + + @Column(name="MIGRATION_CYCLE") + @ApiParam("迁移周期") + private String migrationCycle; + + @Column(name="LAST_EXECUTION_TIME") + @ApiParam("末次迁移时间") + private String lastExecutionTime; + + @Column(name="LAST_MRGRATION_QTY") + @ApiParam(value = "末次迁移记录数", example = "0") + private Integer LastmMigrationQty; + + @Column(name="NEXT_EXECUTION_TIME") + @ApiParam("下次执行时间") + private String nextExecutionTime; + + @Column(name="SRC_TABLE_NAME") + @ApiParam("来源表名") + private String srcTableName; + + @Column(name="SRC_QUERY_CONDITIONS") + @ApiParam("来源表查询条件") + private String srcQueryConditions; + + @Column(name="PROCESS_QTY") + @ApiParam(value = "每次处理行数", example = "0") + private Integer processQty; + + @Column(name="DEST_TABLE_NAME") + @ApiParam("目标表名") + private String destTableName; + + @Column(name="IS_PHYSICAL_DELETE") + @ApiParam(value = "是否物理删除", example = "0") + private Integer isPhysicalDelete; + + @Column(name="ERROR_MESSAGE") + @ApiParam("执行错误日志") + private String errorMessage; + + @Transient + @ApiParam(value ="开始时间") + private String mcStartTime; + + @Transient + @ApiParam(value ="结束时间") + private String mcEndTime; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 335aac9..a4405ea 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.util.StringUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -156,6 +157,10 @@ public class WmsMoveMaster extends BaseBean { @Transient private Integer isSnapshot; + @Transient + @ApiParam("总行数") + private Integer itemQty; + // @Version // @Column(name = "LOCK_VERSION") // @ApiParam(value = "乐观锁", example = "1") @@ -220,6 +225,12 @@ public class WmsMoveMaster extends BaseBean { this.modifyDatetime = modifyDatetime; } + public WmsMoveMaster(Integer itemQty , String transTypeCode , Integer itemStatus){ + this.itemQty = itemQty; + this.transTypeCode = transTypeCode; + this.itemStatus = itemStatus; + } + public Double getTransQty() { return this.transQty == null ? 0 : this.transQty.doubleValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataMigrationConfigRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataMigrationConfigRepository.java new file mode 100644 index 0000000..080bf9d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataMigrationConfigRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.BasVendor; +import cn.estsh.i3plus.pojo.wms.bean.WmsDataMigrationConfig; +import org.springframework.stereotype.Repository; + +/** + * @Description :WMS数据迁移配置实体 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-01-08 14:49 + * @Modify: + **/ +@Repository +public interface WmsDataMigrationConfigRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 215fb1b..55724ff 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2692,4 +2692,25 @@ public class WmsHqlPack { return result; } + /** + * 数据迁移配置信息分页查询条件 + * + * @param wmsDataMigrationConfig + * @return + */ + public static DdlPackBean packHqlWmsDataMigrationConfig(WmsDataMigrationConfig wmsDataMigrationConfig) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(wmsDataMigrationConfig.getMigName(), "migName", result); + DdlPreparedPack.getStringLikerPack(wmsDataMigrationConfig.getRemark(), "remark", result); + DdlPreparedPack.getStringLikerPack(wmsDataMigrationConfig.getSrcTableName(), "srcTableName", result); + DdlPreparedPack.getNumEqualPack(wmsDataMigrationConfig.getIsPhysicalDelete(), "isPhysicalDelete", result); + DdlPreparedPack.getStringBiggerPack(wmsDataMigrationConfig.getMcStartTime(), "nextExecutionTime", result); + DdlPreparedPack.getStringSmallerPack(wmsDataMigrationConfig.getMcEndTime(), "nextExecutionTime", result); + + getStringBuilderPack(wmsDataMigrationConfig, result); + + return result; + } + } From bca93691baf09fc82b1238fbbddea22bc435682e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 8 Jan 2020 15:35:48 +0800 Subject: [PATCH 26/31] =?UTF-8?q?2020-01-08=E6=B7=BB=E5=8A=A0=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=8F=9C=E5=8D=95=E4=B8=8E=E5=AF=B9=E5=BA=94=E5=92=8C?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsListElementModel.java | 33 ++++------------------ 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java index a286a2e..2c8f6f2 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java @@ -1,10 +1,14 @@ package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElement; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; +import java.util.List; + /** * @Description : WMS列表菜单model * @Reference : @@ -16,33 +20,6 @@ import lombok.Data; @Api("WMS列表菜单model") public class WmsListElementModel extends BaseBean { - @ApiParam("字段名称") - private String fieldName; - - @ApiParam("标题名称") - private String titleName; - - @ApiParam("序列号:字段标题排序使用默认0（不排序）") - private Integer seq; - - @ApiParam(value = "是否必选:默认1-必选，2-非必选") - private Integer isRequire; - - @ApiParam(value = "宽度") - private Double width; - - @ApiParam(value = "排序规则:默认0-不排序，1-升序2-降序") - private Integer sort; - - @ApiParam(value = "是否加粗:默认1-加粗，2-非加粗") - private Integer isWider; - - @ApiParam(value = "是否勾选:默认1-勾选，2-非勾选") - private Integer isSelect; - - @ApiParam(value = "表单字段默认值") - private String defaultValue; - @ApiParam(value = "功能菜单ID") private Long functionId; @@ -52,4 +29,6 @@ public class WmsListElementModel extends BaseBean { @ApiParam(value = "是否默认配置") private Integer isDefault; + List wmsListElementList; + } From e1386275d0f9d71396f585ab962bc3f2c8e81939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 8 Jan 2020 15:49:57 +0800 Subject: [PATCH 27/31] =?UTF-8?q?Wms=E5=88=9D=E5=A7=8B=E5=8C=96=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java | 6 +++++- .../cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java | 6 +++++- .../i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java | 7 ++++++- .../cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java | 5 ++++- .../i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java | 9 ++++++++- 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java index 7ef1220..b1f3e68 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -20,7 +21,10 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_FIELDINFO") +@Table(name="WMS_FIELDINFO", indexes = { + @Index(columnList = "FIELD_NAME"), + @Index(columnList = "ENTITY_NAME") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java index 09109a7..d654c64 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -21,7 +22,10 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_LISTELEMENT") +@Table(name="WMS_LISTELEMENT", indexes = { + @Index(columnList = "FIELD_NAME"), + @Index(columnList = "USER_CODE") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java index 18ff672..dc94f0a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -21,7 +22,11 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_LISTELEMENT_FUNCTION") +@Table(name="WMS_LISTELEMENT_FUNCTION", indexes = { + @Index(columnList = "FUNCTION_ID"), + @Index(columnList = "ELEMENT_ID"), + @Index(columnList = "USER_CODE") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java index cdae331..de0aaf6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -21,7 +22,9 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_SEARCHELEMENT") +@Table(name="WMS_SEARCHELEMENT", indexes = { + @Index(columnList = "FIELD_NAME") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java index d10ef27..54f31aa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -21,7 +22,13 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_SEARCHELEMENT_FUNCTION") +@Table(name="WMS_SEARCHELEMENT_FUNCTION", indexes = { + @Index(columnList = "FUNCTION_ID"), + @Index(columnList = "SEARCH_NAME"), + @Index(columnList = "SEARCH_ELEMENT_ID"), + @Index(columnList = "IS_SHARE"), + @Index(columnList = "USER_CODE") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) From d05fd542b37d0b24a7ec595ffd03e9ba3f01da4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 8 Jan 2020 16:29:07 +0800 Subject: [PATCH 28/31] =?UTF-8?q?2020-01-08=E6=B7=BB=E5=8A=A0=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=8F=9C=E5=8D=95=E4=B8=8E=E5=AF=B9=E5=BA=94=E5=92=8C?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java index 2c8f6f2..0a11f26 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java @@ -6,7 +6,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Column; import java.util.List; /** From c14d6c6916ea260c967fb4a5baad4fbee39f2b7a Mon Sep 17 00:00:00 2001 From: gcj Date: Wed, 8 Jan 2020 17:31:45 +0800 Subject: [PATCH 29/31] =?UTF-8?q?=E3=80=90=E5=AE=81=E5=BE=B7=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E6=B8=85=E5=8D=95=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 35 ++++++++ .../estsh/i3plus/pojo/wms/bean/WmsPushConfig.java | 92 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java | 52 ++++++++++++ .../pojo/wms/modelbean/MailMessageModel.java | 15 ++++ .../pojo/wms/modelbean/PushMessageModel.java | 25 ++++++ .../wms/repository/WmsPushConfigRepository.java | 19 +++++ .../pojo/wms/repository/WmsPushLogRepository.java | 18 +++++ 7 files changed, 256 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushConfigRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushLogRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 665cbcb..33d06b5 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 @@ -4793,4 +4793,39 @@ public class WmsEnumUtil { } + /** + * 推送类型 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PUSH_TYPE { + EMAIL(10, "邮件"), SMS(20, "短信"); + + private int value; + private String description; + + PUSH_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; + } + } + } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java new file mode 100644 index 0000000..374abd7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java @@ -0,0 +1,92 @@ +package cn.estsh.i3plus.pojo.wms.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 : gcj + * @CreateDate : 2020-01-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PUSH_CONFIG") +@Api("推送配置") +public class WmsPushConfig extends BaseBean{ + + private static final long serialVersionUID = 2701710669030092153L; + @ApiParam("推送名称") + @Column(name = "PUSH_NAME") + private String pushName; + + @ApiParam("规则类型") + @Column(name = "QUARTZ_CRON") + private String quartzCron; + + @ApiParam("末次执行时间") + @Column(name = "LAST_EXE_TIME") + private String lastExeTime; + + @ApiParam("下次执行时间") + @Column(name = "NEXT_EXE_TIME") + private String nextExeTime; + + @ApiParam("序号") + @Column(name = "SERIAL_NUMBER") + private Integer serialNumber; + + @ApiParam("查询Hql") + @Column(name = "HQL_STR") + private String hqlStr; + + @ApiParam("查询Sql") + @Column(name = "SQL_STR") + private String sqlStr; + + @ApiParam("脚本编号") + @Column(name = "SCRIPT_NO") + private String scriptNo; + + @ApiParam("标题模板") + @Column(name = "TITLE_TEMPLATE") + private String titleTemplate; + + @ApiParam("消息体模板") + @Column(name = "CONTENT_TEMPLATE") + private String contentTemplate; + + @ApiParam("推送类型") + @Column(name = "PUSH_TYPE") + private Integer pushType; + + @ApiParam("描述") + @Column(name = "REMARK") + private String remark; + + @ApiParam("推送地址") + @Column(name ="PATH_URL") + private String pathUrl; + + @ApiParam("头标签") + @Column(name = "TITLE_LABEL") + private String titleLabel; + + @ApiParam("内容标签") + @Column(name = "CONTENT_LABEL") + private String contentLabel; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java new file mode 100644 index 0000000..6a57625 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.wms.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 : gcj + * @CreateDate : 2020-01-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PUSH_LOG") +@Api("推送日志") +public class WmsPushLog extends BaseBean{ + + private static final long serialVersionUID = -1708833666516164845L; + @Column(name = "EXE_HQL") + @ApiParam("执行Hql") + private String exeHql; + + @Column(name = "PUSH_TITLE") + @ApiParam("推送标题") + private String pushTitle; + + @Column(name = "PUSH_CONTENT") + @ApiParam("推送内容") + private String pushContent; + + @Column(name = "PUSH_TYPE") + @ApiParam("推送类型") + private String pushType; + + @Column(name = "PUSH_RESULT") + @ApiParam("推送结果") + private String pushResult; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java new file mode 100644 index 0000000..6667a49 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import lombok.Data; + +import java.util.Map; + +@Data +public class MailMessageModel extends PushMessageModel { + + + //附加，value 文件的绝对地址/动态模板数据 + private Map attachment; + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java new file mode 100644 index 0000000..1e2ff26 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +@Data +public class PushMessageModel { + + + //标题 + public String title; + //内容 + public String content; + + //推送类型 + public String pushType; + + //推送地址 + public String pathUrl; + + //推送数据 + List> dataList; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushConfigRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushConfigRepository.java new file mode 100644 index 0000000..65de6a6 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushConfigRepository.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPushConfig; +import cn.estsh.i3plus.pojo.wms.bean.WmsPushLog; +import org.springframework.stereotype.Repository; + +/** + * @Description : 推送日志配置信息 + * @Reference : + * @Author : gcj + * @CreateDate : 2020-01-06 9:47 + * @Modify: + **/ +@Repository +public interface WmsPushConfigRepository extends BaseRepository { + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushLogRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushLogRepository.java new file mode 100644 index 0000000..209b9a7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushLogRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsASNMasterDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsPushLog; +import org.springframework.stereotype.Repository; + +/** + * @Description : 推送日志保存对象 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2020-01-06 9:47 + * @Modify: + **/ +@Repository +public interface WmsPushLogRepository extends BaseRepository { + +} From daf3365ce3a222c4b5330e76861bb4d1d8373781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 8 Jan 2020 18:22:00 +0800 Subject: [PATCH 30/31] =?UTF-8?q?Wms=E5=88=9D=E5=A7=8B=E5=8C=96=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/wms/WmsSearchElementModel.java | 22 +++++----------------- .../pojo/wms/bean/dynamic/WmsSearchElement.java | 15 +++++++++++++-- .../wms/bean/dynamic/WmsSearchElementFunction.java | 6 +----- 3 files changed, 19 insertions(+), 24 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java index 9ca8e79..0056ba7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java @@ -1,10 +1,13 @@ package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElement; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.List; + /** * @Description : WMS列表搜索model * @Reference : @@ -16,21 +19,6 @@ import lombok.Data; @Api("WMS列表搜索model") public class WmsSearchElementModel extends BaseBean { - @ApiParam("字段名称") - private String fieldName; - - @ApiParam("标题名称") - private String titleName; - - @ApiParam(value = "条件表达式:>,<,>=等") - private String conditionExpre; - - @ApiParam(value = "检索值") - private String value; - - @ApiParam(value = "条件连接符:and/or") - private String conditionConnector; - @ApiParam(value = "功能菜单ID") private Long functionId; @@ -46,6 +34,6 @@ public class WmsSearchElementModel extends BaseBean { @ApiParam(value = "是否共享") private Integer isShare; - @ApiParam(value = "搜索名称") - private String searchName; + @ApiParam(value = "Wms查询元素列表") + private List searchElementList; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java index de0aaf6..8ffe833 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java @@ -16,14 +16,16 @@ import javax.persistence.Table; /** * @Description : WMS搜索元素表 * @Reference : - * @Author : sjc + * @Author : siliter.yuan * @CreateDate : 2020-01-07 09:06 * @Modify: **/ @Data @Entity @Table(name="WMS_SEARCHELEMENT", indexes = { - @Index(columnList = "FIELD_NAME") + @Index(columnList = "FIELD_NAME"), + @Index(columnList = "SEARCH_NAME"), + @Index(columnList = "USER_CODE") }) @DynamicInsert @DynamicUpdate @@ -32,6 +34,7 @@ import javax.persistence.Table; public class WmsSearchElement extends BaseBean { private static final long serialVersionUID = 3903166651913139062L; + @Column(name = "FIELD_NAME") @ApiParam(value = "字段名称") private String fieldName; @@ -51,4 +54,12 @@ public class WmsSearchElement extends BaseBean { @Column(name = "CONDITION_CONNECTOR") @ApiParam(value = "条件连接符:and/or") private String conditionConnector; + + @Column(name = "SEARCH_NAME") + @ApiParam(value = "搜索名称") + private String searchName; + + @Column(name = "USER_CODE") + @ApiParam(value = "用户编号") + private String userCode; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java index 54f31aa..43cbb23 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java @@ -24,7 +24,6 @@ import javax.persistence.Table; @Entity @Table(name="WMS_SEARCHELEMENT_FUNCTION", indexes = { @Index(columnList = "FUNCTION_ID"), - @Index(columnList = "SEARCH_NAME"), @Index(columnList = "SEARCH_ELEMENT_ID"), @Index(columnList = "IS_SHARE"), @Index(columnList = "USER_CODE") @@ -36,6 +35,7 @@ import javax.persistence.Table; public class WmsSearchElementFunction extends BaseBean { private static final long serialVersionUID = 3903166651913139063L; + @Column(name = "FUNCTION_ID") @ApiParam(value = "功能菜单ID") private Long functionId; @@ -44,10 +44,6 @@ public class WmsSearchElementFunction extends BaseBean { @ApiParam(value = "组名称") private String groupName; - @Column(name = "SEARCH_NAME") - @ApiParam(value = "搜索名称") - private String searchName; - @Column(name = "SEARCH_ELEMENT_ID") @ApiParam(value = "搜索元素ID") private Long searchElementId; From 42bbb852c4451475cfe482e3fa4832046e8aa545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 8 Jan 2020 20:02:45 +0800 Subject: [PATCH 31/31] =?UTF-8?q?Wms=E5=88=9D=E5=A7=8B=E5=8C=96=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 55724ff..65c25de 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo; import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence; import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; @@ -2713,4 +2714,17 @@ public class WmsHqlPack { return result; } + /** + * WMS实体字段信息分页查询条件 + * + * @param wmsFieldInfo + * @return + */ + public static DdlPackBean packHqlWmsFieldInfo(WmsFieldInfo wmsFieldInfo) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getFieldName(), "fieldName", result); + DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getEntityName(), "entityName", result); + getStringBuilderPack(wmsFieldInfo, result); + return result; + } }