|
|
|
@ -474,10 +474,12 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
|
|
|
|
|
if (model.getOptType() != 2) {
|
|
|
|
|
//移库
|
|
|
|
|
//移库
|
|
|
|
|
String destLocateNo = getDestLocateNo(model, org);
|
|
|
|
|
String dest = configService.getCfgValue(org, "UMLGO");
|
|
|
|
|
if (!StringUtils.isEmpty(destLocateNo) && Objects.equals(dest, destLocateNo)) {
|
|
|
|
|
return;
|
|
|
|
|
if (model.getSourceType() == MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.SINGLE.getValue()){
|
|
|
|
|
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());
|
|
|
|
|
moveRepository.save(move);
|
|
|
|
@ -566,10 +568,12 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
|
|
|
|
|
srcLocateNo = version.getReceiveInventoryPoint();
|
|
|
|
|
}
|
|
|
|
|
//移库
|
|
|
|
|
String destLocateNo = getDestLocateNo(model, org);
|
|
|
|
|
String dest = configService.getCfgValue(org, "UMLGO");
|
|
|
|
|
if (!StringUtils.isEmpty(destLocateNo) && Objects.equals(dest, destLocateNo)) {
|
|
|
|
|
return;
|
|
|
|
|
if (model.getSourceType() == MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.SINGLE.getValue()){
|
|
|
|
|
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());
|
|
|
|
|
moveRepository.save(move);
|
|
|
|
|