|
@@ -627,7 +627,7 @@ public class BizReturnReceiptController extends BaseController {
|
|
|
}
|
|
|
// 假设有一箱多批的箱子获取该箱子的所有报工
|
|
|
List<BizDayworkCarrier> bizDayworkCarriers = bizDayworkCarrierService.query().in("carrier_id", carriers.stream().filter(e -> bizCarrierCategories.stream().filter(v -> v.getIsAllowMore().equals(1)).anyMatch(v -> v.getId().equals(e.getCategoryId()))).map(BizCarrier::getId).collect(Collectors.toList())).eq("is_changed", 0).list();
|
|
|
- List<BizDayworkCarrier> unreturn = bizDayworkCarriers.stream().filter(v -> details.stream().anyMatch(t -> t.getDayworkId().equals(v.getDayworkId()))).collect(Collectors.toList());
|
|
|
+ List<BizDayworkCarrier> unreturn = bizDayworkCarriers.stream().filter(v -> details.stream().noneMatch(t -> t.getDayworkId().equals(v.getDayworkId()))).collect(Collectors.toList());
|
|
|
List<BizDaywork> bizDayworks = bizDayworkService.query().in("id", unreturn.stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList())).list();
|
|
|
if (unreturn.size() > 0) {
|
|
|
String msg = "周转箱" + unreturn.stream().map(BizDayworkCarrier::getCarrierCode).distinct().collect(Collectors.joining(",")) + "中批次" + bizDayworks.stream().map(BizDaywork::getLotCode).distinct().collect(Collectors.joining(",")) + "未收回";
|