|
|
@@ -508,7 +508,7 @@ public class BizLotController extends BaseController {
|
|
|
if (dayworks.stream().anyMatch(e -> !baseDayworks.stream().allMatch(v -> v.getProductionPlanDetailId().equals(e.getProductionPlanDetailId())))) {
|
|
|
return error("载具已绑定其他计划单");
|
|
|
}
|
|
|
- List<BizDayworkItem> baseDayworkItems = bizDayworkItemService.getList(new BizDayworkItem().setLotId(bizLot.getId()));
|
|
|
+ List<BizDayworkItem> baseDayworkItems = bizDayworkItemService.getList(new BizDayworkItem().setDayworkId(baseDayworks.get(0).getId()));
|
|
|
String lastProcessStep = baseDayworkItems.stream().max(Comparator.comparing(BizDayworkItem::getProcessStepNumber)).orElse(new BizDayworkItem()).getProcessStepNumber();
|
|
|
// 判断最后一道工序是否有邀请报工,假设有邀请报工则不可分批
|
|
|
List<BizDayworkItem> lastProcessItem = baseDayworkItems.stream().filter(v -> v.getProcessStepNumber().equals(lastProcessStep)).collect(Collectors.toList());
|
