|
|
|
@ -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;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|