|
|
|
@ -3326,28 +3326,4 @@ public class MesHqlPack {
|
|
|
|
|
}
|
|
|
|
|
return packBean;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 预装区域查询
|
|
|
|
|
*
|
|
|
|
|
* @param packageTrans
|
|
|
|
|
* @param organizeCode
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public static DdlPackBean getMesPackageTrans(MesPackageTrans packageTrans, String organizeCode) {
|
|
|
|
|
DdlPackBean packBean = getAllBaseDataByNormalPro(packageTrans, organizeCode);
|
|
|
|
|
if (!StringUtils.isEmpty(packageTrans.getTransType())) {
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(packageTrans.getTransType(), "transType", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (!StringUtils.isEmpty(packageTrans.getPartNo())) {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(packageTrans.getPartNo(), "partNo", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (!StringUtil.isEmpty(packageTrans.getCreateDateTimeStart()) || !StringUtil.isEmpty(packageTrans.getCreateDateTimeEnd())) {
|
|
|
|
|
DdlPreparedPack.timeBuilder(
|
|
|
|
|
packageTrans.getCreateDateTimeStart(),
|
|
|
|
|
packageTrans.getCreateDateTimeEnd(),
|
|
|
|
|
"createDatetime", packBean, true);
|
|
|
|
|
}
|
|
|
|
|
return packBean;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|