二次电子化初检,需要区分批次和单件

tags/yfai-pcn-ext-v2.51^2
xiangwei.zhang 5 months ago
parent d6a455ba77
commit 6d5faf79cd

@ -474,10 +474,12 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
if (model.getOptType() != 2) { if (model.getOptType() != 2) {
//移库 //移库
//移库 //移库
String destLocateNo = getDestLocateNo(model, org);
String dest = configService.getCfgValue(org, "UMLGO"); String dest = configService.getCfgValue(org, "UMLGO");
if (!StringUtils.isEmpty(destLocateNo) && Objects.equals(dest, destLocateNo)) { if (model.getSourceType() == MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.SINGLE.getValue()){
return; String destLocateNo = getDestLocateNo(model, org);
if (!StringUtils.isEmpty(destLocateNo) && Objects.equals(dest, destLocateNo)) {
return;
}
} }
MesMove move = createMove(model, srcLocateNo, dest, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode()); MesMove move = createMove(model, srcLocateNo, dest, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode());
moveRepository.save(move); moveRepository.save(move);
@ -566,10 +568,12 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
srcLocateNo = version.getReceiveInventoryPoint(); srcLocateNo = version.getReceiveInventoryPoint();
} }
//移库 //移库
String destLocateNo = getDestLocateNo(model, org);
String dest = configService.getCfgValue(org, "UMLGO"); String dest = configService.getCfgValue(org, "UMLGO");
if (!StringUtils.isEmpty(destLocateNo) && Objects.equals(dest, destLocateNo)) { if (model.getSourceType() == MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.SINGLE.getValue()){
return; String destLocateNo = getDestLocateNo(model, org);
if (!StringUtils.isEmpty(destLocateNo) && Objects.equals(dest, destLocateNo)) {
return;
}
} }
MesMove move = createMove(model, srcLocateNo, dest, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode()); MesMove move = createMove(model, srcLocateNo, dest, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode());
moveRepository.save(move); moveRepository.save(move);

Loading…
Cancel
Save