From daf0b9431464c59965bc530893f1fcb11f20ac0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 25 Aug 2020 20:39:10 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=9010828=2019048-10827-=E9=A2=84=E8=A3=85?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96=EF=BC=81?= =?UTF-8?q?-2020-08-25=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java | 8 ++++++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 8 ++++++++ 4 files changed, 23 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 0e93187..97947c7 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 @@ -1970,7 +1970,9 @@ public class MesEnumUtil { BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入"), BOARD_PLAN_CAPACITY(520, "boardPlanCapacityExcelService", "计划产能看板导入"), MES_PROD_WORK_CENTER(530, "prodWorkCenterExcelService", "产品工作中心配置导入"), - MES_PART_COLOR(540, "partColorExcelService", "产品颜色导入"); + MES_PART_COLOR(540, "partColorExcelService", "产品颜色导入"), + MES_PART_STOCK_SCHEDULE(550, "partStockScheduleExcelService", "库存排程配置导入"), + MES_PROD_CFG_DETAIL(560, "prodCfgDetailExcelService", "产品配置明细导入"); private int value; private String service; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java index 9ce2fba..581368f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java @@ -55,7 +55,15 @@ public class MesLocation extends BaseBean implements Serializable { @ApiParam("最大存储量") private Integer maxQty = 0; + @Column(name = "IS_SMALL_SIZE") + @ApiParam("是否小尺寸物料") + private Integer isSmallSize = 1; + @Transient @ApiParam("物料名称") private String partNameRdd; + + @Transient + @ApiParam("包装编号集合") + private String packageNoList; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index 8d7c019..bd59557 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -120,6 +120,10 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("打磨件物料号") private String prePartNo; + @Column(name = "IS_SMALL_SIZE") + @ApiParam("是否小尺寸物料") + private Integer isSmallSize = 1; + @Transient @ApiParam("产品类型名称") private String produceCategoryName; 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 0c38eff..02d8059 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 @@ -3267,4 +3267,12 @@ public class MesHqlPack { } return packBean; } + + public static DdlPackBean getMesLocation(MesLocation mesLocation) { + DdlPackBean packBean = getAllBaseData(mesLocation.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesLocation.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(mesLocation.getLocationCode(), "locationCode", packBean); + DdlPreparedPack.getStringLikerPack(mesLocation.getLocationName(), "locationName", packBean); + return packBean; + } }