diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java index cc4f3f0..dda017a 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java @@ -208,16 +208,9 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService MesPartInspection partInspection; //返工单返修完成,需可疑品移正常库 - if (model.isTransferFlg()) { - String srcLocate = configService.getCfgValue(org, "UMLGO"); - if(!Objects.isNull(model.getPartInspection())){ - MesMove mesMove = getMesMove(model, org); - if(!Objects.isNull(mesMove)){ - srcLocate = mesMove.getUmlgo(); - } - } + if (model.isTransferFlg() && model.getSourceType() == MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.SINGLE.getValue()) { //移库 - MesMove move = createMove(model,srcLocate,configService.getCfgValue(org, "LGORT"), org); + MesMove move = createMove(model,getDestLocateNo(model, org),configService.getCfgValue(org, "LGORT"), org); moveRepository.save(move); }