|
|
|
@ -2954,4 +2954,32 @@ public class MesHqlPack {
|
|
|
|
|
}
|
|
|
|
|
return packBean;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 过程质量检测数据
|
|
|
|
|
*
|
|
|
|
|
* @param qcOrderDetail
|
|
|
|
|
* @param organizeCode
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public static DdlPackBean getMesQcOrderDetailData(MesQcOrderDetail qcOrderDetail, String organizeCode) {
|
|
|
|
|
DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrderDetail, organizeCode);
|
|
|
|
|
if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) {
|
|
|
|
|
DdlPreparedPack.getStringRightLikerPack(qcOrderDetail.getOrderNo(), "orderNo", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (qcOrderDetail.getCheckType() != null) {
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(qcOrderDetail.getCheckType(), "checkType", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (!StringUtils.isEmpty(qcOrderDetail.getSerialNumber())) {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(qcOrderDetail.getSerialNumber(), "serialNumber", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (!StringUtils.isEmpty(qcOrderDetail.getCreateDateTimeStart()) || !StringUtils.isEmpty(qcOrderDetail.getCreateDateTimeEnd())) {
|
|
|
|
|
DdlPreparedPack.timeBuilder(
|
|
|
|
|
qcOrderDetail.getCreateDateTimeStart(),
|
|
|
|
|
qcOrderDetail.getCreateDateTimeEnd(),
|
|
|
|
|
"createDatetime", packBean, true);
|
|
|
|
|
}
|
|
|
|
|
return packBean;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|