|
|
|
@ -263,6 +263,23 @@ public class MesHqlPack {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* MES设备信息查询条件封装
|
|
|
|
|
* @param mesEquipment
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public static DdlPackBean getMesEquipment(MesEquipment mesEquipment, String organizeCode) {
|
|
|
|
|
DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquipment, organizeCode);
|
|
|
|
|
if (StringUtils.isNotEmpty(mesEquipment.getWorkCellCode())){
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())){
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return packBean;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 流程查询条件封装
|
|
|
|
|
*
|
|
|
|
|
* @param mesRoute
|
|
|
|
|