|
|
|
|
@ -1719,7 +1719,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
|
YieldOrder yieldOrder = yieldOrderService.getById(workOrder.getYoId()); |
|
|
|
|
|
|
|
|
|
// 根据零件号、工序ID、版本号、工艺级别查询对应的检验项目
|
|
|
|
|
List<DsProcessProjectEntity> projects = dsPartService.selectDsProcessProjectByPartNoAndPpsId(workOrder.getPartCode(), workPlan.getOrders(), yieldOrder.getPartVersion(), yieldOrder.getRank(), yieldOrder.getRoamNo()); |
|
|
|
|
List<DsProcessProjectVO> projects = dsPartService.selectDsProcessProjectByCraftId(yieldOrder.getCraftId(), workPlan.getOrders()); |
|
|
|
|
if (CollectionUtils.isNotEmpty(projects)) { |
|
|
|
|
// 保存检验任务
|
|
|
|
|
InspectionTask inspectionTask = new InspectionTask(); |
|
|
|
|
@ -1737,7 +1737,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
|
List<WorkPlanItemDetail> workPlanItemDetails = new ArrayList<>(); |
|
|
|
|
WorkPlanItemDetail workPlanItemDetail; |
|
|
|
|
List<InspectionItem> inspectionItems = inspectionService.list(); |
|
|
|
|
for (DsProcessProjectEntity project : projects) { |
|
|
|
|
for (DsProcessProjectVO project : projects) { |
|
|
|
|
workPlanItem = new WorkPlanItem(); |
|
|
|
|
workPlanItem.setWpId(workPlan.getId()); |
|
|
|
|
workPlanItem.setItemCode(project.getTrialNo()); |
|
|
|
|
|