|
|
|
@ -303,6 +303,7 @@ public class MesHqlPack {
|
|
|
|
|
DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdRouteCfg, organizeCode);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getRouteCode(), "routeCode", packBean);
|
|
|
|
|
packBean.setOrderByStr(mesProdRouteCfg.orderBy());
|
|
|
|
|
return packBean;
|
|
|
|
|
}
|
|
|
|
@ -328,6 +329,23 @@ public class MesHqlPack {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* MES班次休息信息查询条件封装
|
|
|
|
|
* @param shiftRest
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public static DdlPackBean getMesShiftRest(MesShiftRest shiftRest, String organizeCode) {
|
|
|
|
|
DdlPackBean packBean = getAllBaseDataByNormalPro(shiftRest, organizeCode);
|
|
|
|
|
if (StringUtils.isNotEmpty(shiftRest.getWorkCenterCode())){
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(shiftRest.getWorkCenterCode(), "workCenterCode", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (StringUtils.isNotEmpty(shiftRest.getShiftCode())){
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(shiftRest.getShiftCode(), "shiftCode", packBean);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return packBean;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* MES工序信息查询条件封装
|
|
|
|
|
* @param process
|
|
|
|
|
* @return
|
|
|
|
@ -357,6 +375,9 @@ public class MesHqlPack {
|
|
|
|
|
if (StringUtils.isNotEmpty(step.getStepName())){
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(step.getStepName(), "stepName", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (StringUtils.isNotEmpty(step.getStepType())){
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(step.getStepType(), "stepType", packBean);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return packBean;
|
|
|
|
|
}
|
|
|
|
@ -425,6 +446,26 @@ public class MesHqlPack {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* MES工序BOM信息查询条件封装
|
|
|
|
|
* @param processBom
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public static DdlPackBean getMesProcessBom(MesProcessBom processBom, String organizeCode) {
|
|
|
|
|
DdlPackBean packBean = getAllBaseDataByNormalPro(processBom, organizeCode);
|
|
|
|
|
if (StringUtils.isNotEmpty(processBom.getPartNo())){
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(processBom.getPartNo(), "partNo", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (StringUtils.isNotEmpty(processBom.getItemPartNo())){
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(processBom.getItemPartNo(), "itemPartNo", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (StringUtils.isNotEmpty(processBom.getProcessCode())){
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(processBom.getProcessCode(), "processCode", packBean);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return packBean;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* MES 客户信息查询条件封装
|
|
|
|
|
* @param customer
|
|
|
|
|
* @return
|
|
|
|
@ -477,4 +518,118 @@ public class MesHqlPack {
|
|
|
|
|
|
|
|
|
|
return packBean;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* MES 设备关键数据信息查询条件封装
|
|
|
|
|
* @param keyData
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public static DdlPackBean getMesKeyData(MesKeyData keyData, String organizeCode) {
|
|
|
|
|
DdlPackBean packBean = getAllBaseDataByNormalPro(keyData, organizeCode);
|
|
|
|
|
if (StringUtils.isNotEmpty(keyData.getKeyDataCode())){
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(keyData.getKeyDataCode(), "keyDataCode", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (StringUtils.isNotEmpty(keyData.getKeyDataName())){
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(keyData.getKeyDataName(), "keyDataName", packBean);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return packBean;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* MES 物料关键数据关系信息查询条件封装
|
|
|
|
|
* @param kpData
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public static DdlPackBean getMesKpData(MesKpData kpData, String organizeCode) {
|
|
|
|
|
DdlPackBean packBean = getAllBaseDataByNormalPro(kpData, organizeCode);
|
|
|
|
|
if (StringUtils.isNotEmpty(kpData.getPartNo())){
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(kpData.getKeyDataCode(), "partNo", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (StringUtils.isNotEmpty(kpData.getKeyDataCode())){
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(kpData.getKeyDataCode(), "keyDataCode", packBean);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return packBean;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* MES 产品配置类型信息查询条件封装
|
|
|
|
|
* @param prodCfgType
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public static DdlPackBean getMesProdCfgType(MesProdCfgType prodCfgType, String organizeCode) {
|
|
|
|
|
DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfgType, organizeCode);
|
|
|
|
|
if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeCode())){
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(prodCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeName())){
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(prodCfgType.getProdCfgTypeName(), "prodCfgTypeName", packBean);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return packBean;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* MES 产品配置信息查询条件封装
|
|
|
|
|
* @param prodCfg
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public static DdlPackBean getMesProdCfg(MesProdCfg prodCfg, String organizeCode) {
|
|
|
|
|
DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfg, organizeCode);
|
|
|
|
|
if (StringUtils.isNotEmpty(prodCfg.getProdCfgCode())){
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(prodCfg.getProdCfgCode(), "prodCfgCode", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (StringUtils.isNotEmpty(prodCfg.getProdCfgName())){
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(prodCfg.getProdCfgName(), "prodCfgName", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (StringUtils.isNotEmpty(prodCfg.getProdCfgTypeCode())){
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(prodCfg.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return packBean;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* MES 产品配置关系信息查询条件封装
|
|
|
|
|
* @param prodCfgDetail
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public static DdlPackBean getMesProdCfgDetail(MesProdCfgDetail prodCfgDetail, String organizeCode) {
|
|
|
|
|
DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfgDetail, organizeCode);
|
|
|
|
|
if (StringUtils.isNotEmpty(prodCfgDetail.getProdCfgCode())){
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(prodCfgDetail.getProdCfgCode(), "prodCfgCode", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (StringUtils.isNotEmpty(prodCfgDetail.getPartNo())){
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(prodCfgDetail.getPartNo(), "partNo", packBean);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return packBean;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* MES 物料信息查询条件封装
|
|
|
|
|
* @param part
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public static DdlPackBean getMesPart(MesPart part, String organizeCode) {
|
|
|
|
|
DdlPackBean packBean = getAllBaseDataByNormalPro(part, organizeCode);
|
|
|
|
|
if (StringUtils.isNotEmpty(part.getPartNo())){
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(part.getPartNo(), "partNo", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (StringUtils.isNotEmpty(part.getPartName())){
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(part.getPartName(), "partName", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (StringUtils.isNotEmpty(part.getCategoryCode1())){
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(part.getCategoryCode1(), "categoryCode1", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (StringUtils.isNotEmpty(part.getCategoryCode2())){
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(part.getCategoryCode2(), "categoryCode2", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (StringUtils.isNotEmpty(part.getCategoryCode3())){
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(part.getCategoryCode3(), "categoryCode3", packBean);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return packBean;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|