|
|
|
@ -3540,4 +3540,67 @@ public class MesHqlPack {
|
|
|
|
|
}
|
|
|
|
|
return packBean;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* MES容器位置查询条件封装
|
|
|
|
|
*
|
|
|
|
|
* @param mesContainerLocation
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public static DdlPackBean getMesContainerLocation(MesContainerLocation mesContainerLocation) {
|
|
|
|
|
DdlPackBean packBean = getAllBaseDataByNormalPro(mesContainerLocation, mesContainerLocation.getOrganizeCode());
|
|
|
|
|
if (!StringUtils.isEmpty(mesContainerLocation.getOrganizeCode())) {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(mesContainerLocation.getOrganizeCode(), "organizeCode", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (!StringUtils.isEmpty(mesContainerLocation.getCtCode())) {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(mesContainerLocation.getCtCode(), "ctCode", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (!StringUtils.isEmpty(mesContainerLocation.getCtLocationNo())) {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(mesContainerLocation.getCtLocationNo(), "ctLocationNo", packBean);
|
|
|
|
|
}
|
|
|
|
|
return packBean;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* MES产品容器容量配置查询条件封装
|
|
|
|
|
*
|
|
|
|
|
* @param mesPartContainerCapacity
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public static DdlPackBean getMesPartContainerCapacity(MesPartContainerCapacity mesPartContainerCapacity) {
|
|
|
|
|
DdlPackBean packBean = getAllBaseDataByNormalPro(mesPartContainerCapacity, mesPartContainerCapacity.getOrganizeCode());
|
|
|
|
|
if (!StringUtils.isEmpty(mesPartContainerCapacity.getOrganizeCode())) {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getOrganizeCode(), "organizeCode", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (!StringUtils.isEmpty(mesPartContainerCapacity.getPartNo())) {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getPartNo(), "partNo", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (!StringUtils.isEmpty(mesPartContainerCapacity.getCtCode())) {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getCtCode(), "ctCode", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (!StringUtils.isEmpty(mesPartContainerCapacity.getCtLocationNo())) {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getCtLocationNo(), "ctLocationNo", packBean);
|
|
|
|
|
}
|
|
|
|
|
return packBean;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* MES客户条码规则查询条件封装
|
|
|
|
|
*
|
|
|
|
|
* @param mesCustomerSnRule
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public static DdlPackBean getMesCustomerSnRule(MesCustomerSnRule mesCustomerSnRule) {
|
|
|
|
|
DdlPackBean packBean = getAllBaseDataByNormalPro(mesCustomerSnRule, mesCustomerSnRule.getOrganizeCode());
|
|
|
|
|
if (!StringUtils.isEmpty(mesCustomerSnRule.getOrganizeCode())) {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getOrganizeCode(), "organizeCode", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerCode())) {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerCode(), "customerCode", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerPartNo())) {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerPartNo(), "customerPartNo", packBean);
|
|
|
|
|
}
|
|
|
|
|
return packBean;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|