|
|
@@ -894,7 +894,7 @@ public class BizReturnReceiptController extends BaseController
|
|
|
//外协厂报工明细
|
|
|
List<BizOutsourcedOrderDetailProcess> bizOutsourcedOrderDetailProcess = bizOutsourcedOrderDetailProcessService.query().in("detail_id", outsourceDetailId.isEmpty()? Collections.singletonList(0L) : bizReturnReceipt.getDetails().stream().map(BizReturnReceiptDetail::getOutsourceDetailId).collect(Collectors.toList())).list();
|
|
|
|
|
|
- List<BizDayworkItem> dayworkItem = bizDayworkItemService.getListByDayworkIdsForOutsourced(dayworkListIds.size()>0?dayworkListIds:Collections.singletonList(0L));
|
|
|
+ List<BizDayworkItem> dayworkItem = bizDayworkItemService.getListByDayworkIdsForOutsourced(dayworkListIds.size()>0?dayworkListIds:Collections.singletonList(0L)).stream().filter(item ->outsourceDetailId.contains(item.getOutsourceDetailId())).collect(Collectors.toList());
|
|
|
List<BizDayworkItem> turnovered = dayworkItem.stream().filter(e -> e.getStatus().compareTo("4") >= 0).collect(Collectors.toList());
|
|
|
dayworkItem = dayworkItem.stream().filter(e -> turnovered.stream().noneMatch(t -> t.getDayworkId().equals(e.getDayworkId()))).collect(Collectors.toList());
|
|
|
|
