From 9778561725d8a14e5226f58cac854d2dc13f6726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 15 May 2020 15:30:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9A=E3=80=901842?= =?UTF-8?q?=E3=80=91-=E6=B7=BB=E5=8A=A0=E6=B5=B7=E7=BA=B3=E5=B7=9D?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E7=BB=B4=E6=8A=A4=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 139 +++++++++++++++++++++ 1 file changed, 139 insertions(+) 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 644faba..80191ce 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 @@ -2720,4 +2720,143 @@ public class MesHqlPack { } return packBean; } + + /** + * MES 车型等级查询条件封装 + * + * @param modelGrade + * @return + */ + public static DdlPackBean getMesModelGrade(MesModelGrade modelGrade, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(modelGrade, organizeCode); + if (!StringUtils.isEmpty(modelGrade.getGradeCode())) { + DdlPreparedPack.getStringEqualPack(modelGrade.getGradeCode(), "gradeCode", packBean); + } + if (!StringUtils.isEmpty(modelGrade.getGradeName())) { + DdlPreparedPack.getStringLikerPack(modelGrade.getGradeName(), "gradeName", packBean); + } + if (!StringUtils.isEmpty(modelGrade.getGradeFlagValue())) { + DdlPreparedPack.getStringLikerPack(modelGrade.getGradeFlagValue(), "gradeFlagValue", packBean); + } + if (!StringUtils.isEmpty(modelGrade.getProdCfgTypeCode())) { + DdlPreparedPack.getStringEqualPack(modelGrade.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); + } + return packBean; + } + + /** + * MES 产品颜色查询条件封装 + * + * @param partColor + * @return + */ + public static DdlPackBean getMesPartColor(MesPartColor partColor, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(partColor, organizeCode); + if (!StringUtils.isEmpty(partColor.getColorCode())) { + DdlPreparedPack.getStringEqualPack(partColor.getColorCode(), "colorCode", packBean); + } + if (!StringUtils.isEmpty(partColor.getColorName())) { + DdlPreparedPack.getStringLikerPack(partColor.getColorName(), "colorName", packBean); + } + if (!StringUtils.isEmpty(partColor.getIfColorCode())) { + DdlPreparedPack.getStringEqualPack(partColor.getIfColorCode(), "ifColorCode", packBean); + } + if (!StringUtils.isEmpty(partColor.getProdCfgTypeCode())) { + DdlPreparedPack.getStringEqualPack(partColor.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); + } + if (!StringUtils.isEmpty(partColor.getProduceCtgyCode())) { + DdlPreparedPack.getStringEqualPack(partColor.getProduceCtgyCode(), "produceCtgyCode", packBean); + } + if (!StringUtils.isEmpty(partColor.getModelYear())) { + DdlPreparedPack.getStringEqualPack(partColor.getModelYear(), "modelYear", packBean); + } + return packBean; + } + + /** + * MES 产品车型配置 + * + * @param prodModelCfg + * @return + */ + public static DdlPackBean getMesProdModelCfg(MesProdModelCfg prodModelCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(prodModelCfg, organizeCode); + if (!StringUtils.isEmpty(prodModelCfg.getProdCfgTypeCode())) { + DdlPreparedPack.getStringEqualPack(prodModelCfg.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); + } + if (!StringUtils.isEmpty(prodModelCfg.getProduceCtgyCode())) { + DdlPreparedPack.getStringEqualPack(prodModelCfg.getProduceCtgyCode(), "produceCtgyCode", packBean); + } + if (!StringUtils.isEmpty(prodModelCfg.getModelYear())) { + DdlPreparedPack.getStringLikerPack(prodModelCfg.getModelYear(), "modelYear", packBean); + } + if (!StringUtils.isEmpty(prodModelCfg.getPartNo())) { + DdlPreparedPack.getStringEqualPack(prodModelCfg.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(prodModelCfg.getGradeCode())) { + DdlPreparedPack.getStringEqualPack(prodModelCfg.getGradeCode(), "gradeCode", packBean); + } + return packBean; + } + + /** + * MES 车型散件配置清单 + * + * @param scatterPartCfgBom + * @return + */ + public static DdlPackBean getMesScatterPartCfgBom(MesScatterPartCfgBom scatterPartCfgBom, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(scatterPartCfgBom, organizeCode); + if (!StringUtils.isEmpty(scatterPartCfgBom.getProdCfgTypeCode())) { + DdlPreparedPack.getStringEqualPack(scatterPartCfgBom.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); + } + if (!StringUtils.isEmpty(scatterPartCfgBom.getProduceCtgyCode())) { + DdlPreparedPack.getStringEqualPack(scatterPartCfgBom.getProduceCtgyCode(), "produceCtgyCode", packBean); + } + if (!StringUtils.isEmpty(scatterPartCfgBom.getModelYear())) { + DdlPreparedPack.getStringLikerPack(scatterPartCfgBom.getModelYear(), "modelYear", packBean); + } + if (!StringUtils.isEmpty(scatterPartCfgBom.getPartNo())) { + DdlPreparedPack.getStringEqualPack(scatterPartCfgBom.getPartNo(), "partNo", packBean); + } + return packBean; + } + + /** + * MES 散件零件生产配置 + * + * @param scatterPartProdCfg + * @return + */ + public static DdlPackBean getMesScatterPartProdCfg(MesScatterPartProdCfg scatterPartProdCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(scatterPartProdCfg, organizeCode); + if (!StringUtils.isEmpty(scatterPartProdCfg.getCfgId())) { + DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getCfgId(), "cfgId", packBean); + } + if (!StringUtils.isEmpty(scatterPartProdCfg.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(scatterPartProdCfg.getWorkCellCode())) { + DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getWorkCellCode(), "workCellCode", packBean); + } + if (!StringUtils.isEmpty(scatterPartProdCfg.getPartNo())) { + DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(scatterPartProdCfg.getPartName())) { + DdlPreparedPack.getStringLikerPack(scatterPartProdCfg.getPartName(), "partName", packBean); + } + if (!StringUtils.isEmpty(scatterPartProdCfg.getGradeCode())) { + DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getGradeCode(), "gradeCode", packBean); + } + if (!StringUtils.isEmpty(scatterPartProdCfg.getColorCode())) { + DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getColorCode(), "colorCode", packBean); + } + if (!StringUtils.isEmpty(scatterPartProdCfg.getProdCfgTypeCode())) { + DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); + } + if (!StringUtils.isEmpty(scatterPartProdCfg.getProduceCtgyCode())) { + DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getProduceCtgyCode(), "produceCtgyCode", packBean); + } + return packBean; + } }