diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java index f89cdd8..c124b5e 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java @@ -830,6 +830,9 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { doProductReportReversal(requestModel,productSn,destLocateNo); //装配件数据处理 doRecursionCheck(requestModel.getAssemblyModelList(), requestModel.getOrganizeCode(), requestModel.getUserName(),destLocateNo,responsibleParty); + if (!CollectionUtils.isEmpty(requestModel.getProductionRecordIds())) { + productionRecordRepository.deleteWeaklyByIds(requestModel.getProductionRecordIds().toArray(new Long[0]), requestModel.getUserName()); + } } private void doProductReportReversal(MesReworkTaskRequestModel requestModel, String productSn,String locateNo) { @@ -868,10 +871,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { } public void doRecursionCheck(List assemblyModelList,String organizeCode,String userName,String destLocate,String responsibleParty){ - Set recordIds = new HashSet<>(); - Set notScrapRecordIds = new HashSet<>(); for (MesProductionAssemblyModel assemblyModel : assemblyModelList) { - recordIds.add(assemblyModel.getProductionRecordId()); //勾选 if (assemblyModel.getFlag() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) { //报废 @@ -891,7 +891,6 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { doRecursionCheck(assemblyModel.getChildren(),organizeCode,userName,destLocate,responsibleParty); } } else if (assemblyModel.getFlag() == CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) { - notScrapRecordIds.add(assemblyModel.getProductionRecordId()); //装配解绑 saveProductionAssembly(organizeCode, userName, assemblyModel.getId()); //自制件更新条码状态 条码状态可用 @@ -903,14 +902,6 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { } } } - - // 加工记录下的所有装配件都做了报废之后需要将加工记录软删掉。 - for (Long recordId : recordIds) { - if (notScrapRecordIds.contains(recordId)) { - continue; - } - productionRecordRepository.deleteWeaklyById(recordId, userName); - } } private void updateProductSn(MesReworkTaskRequestModel requestModel, MesProductionAssembly assembly, MesProductionAssemblyContext context) { diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesReworkTaskRequestModel.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesReworkTaskRequestModel.java index 9a071c1..fb23244 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesReworkTaskRequestModel.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesReworkTaskRequestModel.java @@ -67,4 +67,7 @@ public class MesReworkTaskRequestModel { @ApiModelProperty("生产线类型") private Integer centerType; + @ApiModelProperty("总成回退选中的加工记录ID集合") + private List productionRecordIds; + }