From 8a1f0c608e73e0ca536cad3876892385bf431f24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 11 Sep 2020 16:41:09 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=9F=BA=E7=A1=80=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9B=BF=E4=BB=A3=E6=96=99=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 9 +++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 787e7a6..90cb863 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 @@ -1973,7 +1973,8 @@ public class MesEnumUtil { MES_PART_COLOR(540, "partColorExcelService", "产品颜色导入"), MES_PART_STOCK_SCHEDULE(550, "partStockScheduleExcelService", "库存排程配置导入"), MES_PROD_CFG_DETAIL(560, "prodCfgDetailExcelService", "产品配置明细导入"), - MES_LOCATION(570, "locationExcelService", "库位信息导入"); + MES_LOCATION(570, "locationExcelService", "库位信息导入"), + MES_SUB_PART(580, "mesSubPartExcelService", "替代料导入"); private int value; private String service; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java index 05466cb..e5f1c82 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java @@ -36,4 +36,7 @@ public class MesSubPart extends BaseBean implements Serializable { @ApiParam("替代料") private String subPartNo; + @Column(name = "SUB_FLAG") + @ApiParam("替代料标识") + private String subFlag; } 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 3475f9a..889926f 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 @@ -3327,4 +3327,13 @@ public class MesHqlPack { } return packBean; } + + public static DdlPackBean getMesSubPart(MesSubPart mesSubPart) { + DdlPackBean packBean = getAllBaseData(mesSubPart.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesSubPart.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(mesSubPart.getSubPartNo(), "subPartNo", packBean); + DdlPreparedPack.getStringLikerPack(mesSubPart.getSubFlag(), "subFlag", packBean); + DdlPreparedPack.getNumEqualPack(mesSubPart.getIsValid(), "isValid", packBean); + return packBean; + } }