Merge remote-tracking branch 'origin/test' into test

yun-zuoyi
曾贞一 4 years ago
commit 5ebb37173d

@ -2206,7 +2206,7 @@ public class MesHqlPack {
DdlPreparedPack.getStringEqualPack(defectRecord.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringEqualPack(defectRecord.getPartNo(), "partNo", packBean);
} }
if (!StringUtils.isEmpty(defectRecord.getSerialNumber())) { if (!StringUtils.isEmpty(defectRecord.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(defectRecord.getSerialNumber(), "serialNumber", packBean); DdlPreparedPack.getStringEqualPack(defectRecord.getSerialNumber(), "serialNumber", packBean);
} }
if (!StringUtils.isEmpty(defectRecord.getWorkCenterCode())) { if (!StringUtils.isEmpty(defectRecord.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(defectRecord.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(defectRecord.getWorkCenterCode(), "workCenterCode", packBean);
@ -2218,7 +2218,10 @@ public class MesHqlPack {
DdlPreparedPack.getStringEqualPack(defectRecord.getDefectCode(), "defectCode", packBean); DdlPreparedPack.getStringEqualPack(defectRecord.getDefectCode(), "defectCode", packBean);
} }
if (!StringUtils.isEmpty(defectRecord.getWorkOrderNo())) { if (!StringUtils.isEmpty(defectRecord.getWorkOrderNo())) {
DdlPreparedPack.getStringLikerPack(defectRecord.getWorkOrderNo(), "workOrderNo", packBean); DdlPreparedPack.getStringEqualPack(defectRecord.getWorkOrderNo(), "workOrderNo", packBean);
}
if (!StringUtils.isEmpty(defectRecord.getProductSn())) {
DdlPreparedPack.getStringEqualPack(defectRecord.getProductSn(), "productSn", packBean);
} }
if (!StringUtils.isEmpty(defectRecord.getRepairStatus())) { if (!StringUtils.isEmpty(defectRecord.getRepairStatus())) {
DdlPreparedPack.getNumEqualPack(defectRecord.getRepairStatus(), "repairStatus", packBean); DdlPreparedPack.getNumEqualPack(defectRecord.getRepairStatus(), "repairStatus", packBean);

Loading…
Cancel
Save