|
@@ -972,6 +972,11 @@ public class BizOutsourcedOrderController extends BaseController {
|
|
|
// 删除对应的报工明细
|
|
|
List<BizDayworkItem> allItems = bizDayworkItemService.getListByDayworkIds(removeProcesses.isEmpty() ? Collections.singletonList(0L) : removeProcesses.stream().map(BizOutsourcedOrderDetailProcess::getDayworkId).collect(Collectors.toList()));
|
|
|
List<BizDayworkItem> removeItems = allItems.stream().filter(v -> removeProcesses.stream().anyMatch(e -> e.getProcessStepNumber().equals(v.getProcessStepNumber()))).collect(Collectors.toList());
|
|
|
+ // 还要删除对应的收回单明细
|
|
|
+ List<BizReturnReceiptDetail> returnReceiptDetails = bizReturnReceiptDetailService.query()
|
|
|
+ .in("outsource_detail_id", removeProcesses.isEmpty()? Collections.singletonList(0L): removeProcesses.stream().map(BizOutsourcedOrderDetailProcess::getDetailId).collect(Collectors.toList()))
|
|
|
+ .in("technological_process_detail_id", removeProcesses.isEmpty() ? Collections.singletonList(0L) : removeProcesses.stream().map(BizOutsourcedOrderDetailProcess::getTechnologicalProcessDetailId)).list();
|
|
|
+ bizReturnReceiptDetailService.removeBatchByIds(returnReceiptDetails);
|
|
|
bizDayworkItemService.removeBatchByIds(removeItems);
|
|
|
}
|
|
|
|