|
|
|
@ -768,7 +768,7 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper, |
|
|
|
|
|
|
|
|
|
|
|
// 查找外协订单的第一道工序
|
|
|
|
// 查找外协订单的第一道工序
|
|
|
|
WorkPlan deliverablePlan = workPlans.stream() |
|
|
|
WorkPlan deliverablePlan = workPlans.stream() |
|
|
|
.max(Comparator.comparing(WorkPlan::getOrders)) |
|
|
|
.min(Comparator.comparing(WorkPlan::getOrders)) |
|
|
|
.orElse(null); |
|
|
|
.orElse(null); |
|
|
|
if (deliverablePlan == null) { |
|
|
|
if (deliverablePlan == null) { |
|
|
|
return R.fail("未找到外协第一道工序!"); |
|
|
|
return R.fail("未找到外协第一道工序!"); |
|
|
|
@ -781,7 +781,7 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper, |
|
|
|
workPlans.forEach(workPlan -> { |
|
|
|
workPlans.forEach(workPlan -> { |
|
|
|
workPlan.setOcId(ocId); |
|
|
|
workPlan.setOcId(ocId); |
|
|
|
}); |
|
|
|
}); |
|
|
|
List<BatchResult> batchResults = workPlanMapper.insertOrUpdate(workPlans); |
|
|
|
List<BatchResult> batchResults = workPlanMapper.updateById(workPlans); |
|
|
|
// todo:qyl 2.在MES更改后同步给ERP
|
|
|
|
// todo:qyl 2.在MES更改后同步给ERP
|
|
|
|
|
|
|
|
|
|
|
|
return null; |
|
|
|
return null; |
|
|
|
|