Merge branch 'uat_temp_xw_202502100000_44424' into dev

dev-temp-nht-202502180000-customprint
xiangwei.zhang 3 months ago
commit def2ab6318

@ -510,7 +510,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
srcNo = version.getReceiveInventoryPoint();
}
String destLocateNo = getDestLocateNo(model, org);
if(headModel && !Objects.equals(srcNo, destLocateNo)) {
if(!Objects.equals(srcNo, destLocateNo)) {
throw new ImppBusiException(String.format("【%s】该条码需要完成质检,再重新录入电子化检验", model.getSn()));
}
}
@ -643,11 +643,9 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
if (version != null) {
srcNo = version.getReceiveInventoryPoint();
}
if (headModel ) {
String destLocateNo = getDestLocateNo(model, org);
if (!Objects.equals(srcNo, destLocateNo)) {
throw new ImppBusiException(String.format("【%s】该条码需要完成质检,再重新录入电子化检验", model.getSn()));
}
String destLocateNo = getDestLocateNo(model, org);
if (!Objects.equals(srcNo, destLocateNo)) {
throw new ImppBusiException(String.format("【%s】该条码需要完成质检,再重新录入电子化检验", model.getSn()));
}
}

Loading…
Cancel
Save