|
|
|
@ -1091,12 +1091,15 @@ public class MesHqlPack {
|
|
|
|
|
*/
|
|
|
|
|
public static DdlPackBean getMesQcDetailReport(MesQcOrderDetail qcOrderDetail, String organizeCode) {
|
|
|
|
|
DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrderDetail, organizeCode);
|
|
|
|
|
if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) {
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(qcOrderDetail.getOrderNo(), "orderNo", packBean);
|
|
|
|
|
}
|
|
|
|
|
// if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) {
|
|
|
|
|
// DdlPreparedPack.getStringEqualPack(mesQcOrder.getOrderNo(), "orderNo", packBean);
|
|
|
|
|
// }
|
|
|
|
|
if (!StringUtils.isEmpty(qcOrderDetail.getCheckType())) {
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(qcOrderDetail.getCheckType(), "checkType", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (!CollectionUtils.isEmpty(qcOrderDetail.getOrderNoList())) {
|
|
|
|
|
DdlPreparedPack.getInPackList(qcOrderDetail.getOrderNoList(), "orderNo", packBean);
|
|
|
|
|
}
|
|
|
|
|
return packBean;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|