|
|
@@ -142,6 +142,10 @@ public class BizQuickDayworkController extends BaseController {
|
|
|
List<BizDaywork> updateDaywork = new ArrayList<>();
|
|
|
// 判断下都有哪些周转箱
|
|
|
List<BizDayworkCarrier> dayworkCarriers = bizDayworkCarrierService.query().eq("process_inspection_id", 0L).in("daywork_id", items.stream().map(BizDayworkItem::getDayworkId).collect(Collectors.toList())).eq("is_changed", 0).list();
|
|
|
+ // 判断是否有批次没绑箱
|
|
|
+ if (items.stream().anyMatch(e -> dayworkCarriers.stream().noneMatch(t -> t.getDayworkId().equals(e.getDayworkId())))) {
|
|
|
+ return error("有批次未绑定载具，请绑定后再结束");
|
|
|
+ }
|
|
|
// 判断下周转箱有哪些批次
|
|
|
List<BizDaywork> dayworks = bizDayworkService.query().in("id", dayworkCarriers.stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList())).list();
|
|
|
List<BizDayworkCarrier> allCarrier = bizDayworkCarrierService.query().eq("process_inspection_id", 0L).in("daywork_id", items.stream().map(BizDayworkItem::getDayworkId).collect(Collectors.toList())).list();
|
