diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java index b0cbdc18..f0ab99b8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java @@ -1105,13 +1105,13 @@ public class WorkOrderServiceImpl extends BaseServiceImpl prPlanTests = planTestService.list(Wrappers.lambdaQuery(PlanTest.class).eq(PlanTest::getWpId, prWorkPlan.getPpsId())); + List prPlanTests = planTestService.list(Wrappers.lambdaQuery(PlanTest.class).eq(PlanTest::getWpId, prWorkPlan.getId())); if (prPlanTests != null && !prPlanTests.isEmpty()) { for (PlanTest planTest : prPlanTests) { newPlanTest = new PlanTest(); BeanUtils.copyProperties(planTest, newPlanTest); newPlanTest.setId(null); - newPlanTest.setWpId(workPlan.getPpsId()); + newPlanTest.setWpId(workPlan.getId()); planTestService.save(newPlanTest); } } @@ -2625,20 +2625,24 @@ public class WorkOrderServiceImpl extends BaseServiceImpl prWorkPlanItems = workPlanItemService.listByWoId(woId); - - // 没有试验项目,不能转试 - if (!(prWorkPlanItems != null && !prWorkPlanItems.isEmpty())) { + WorkOrder workOrder = this.getById(woId); + if(workOrder == null){ + return false; + } + YieldOrder yieldOrder = yieldOrderService.getById(workOrder.getYoId()); + if(yieldOrder == null){ + return false; + } + List dsProcessProjectEntities = dsPartService.selectDsProcessProjectByCraftId(yieldOrder.getCraftId()); + if (!(dsProcessProjectEntities != null && !dsProcessProjectEntities.isEmpty())) { return false; } - boolean flag = false; - for (WorkPlanItem prWorkPlanItem : prWorkPlanItems) { + for (DsProcessProjectEntity dsProcessProjectEntity : dsProcessProjectEntities) { // 如果试验项目中包含 承压检测 则代表可以发起转试 24/8/5 牛营杰确认 - if ("承压检测".equals(prWorkPlanItem.getItemName())) { - if (prWorkPlanItem.getCheckResult() == -1) { - flag = true; - } + if ("承压检测".equals(dsProcessProjectEntity.getProjectName())) { + flag = true; + break; } } return flag; @@ -2711,7 +2715,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl prWorkPlanItems = workPlanItemService.listByWoId(woId); + WorkOrder workOrder = this.getById(woId); + YieldOrder yieldOrder = yieldOrderService.getById(workOrder.getYoId()); + List dsProcessProjectEntities = dsPartService.selectDsProcessProjectByCraftId(yieldOrder.getCraftId()); WorkPlan prWorkPlan = null; - for (WorkPlanItem item : prWorkPlanItems) { - if ("承压检测".equals(item.getItemName()) || "承压测试".equals(item.getItemName()) || "承压测试检测".equals(item.getItemName())) { - if (item.getCheckResult() == -1) { - prWorkPlan = workPlanService.getById(item.getWpId()); - } + for (DsProcessProjectEntity dsProcessProjectEntity : dsProcessProjectEntities) { + if ("承压检测".equals(dsProcessProjectEntity.getProjectName())) { + prWorkPlan = workPlanService.getOne(new LambdaQueryWrapper() + .eq(WorkPlan::getWoId, woId) + .eq(WorkPlan::getOrders,null)); } } return prWorkPlan; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java index f46e02e2..9772b7ea 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java @@ -55,11 +55,4 @@ public interface IWorkPlanItemService extends BaseService { void saveCheckItem(WorkPlan wp, List checkItemList, List deleteIds, String s); void deleteItem(List deleteIds); - - /** - * 根据订单id查询 - * @param woId 订单id - * @return 工序检验项 - */ - List listByWoId(Long woId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java index 93926bdb..68aa85ca 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java @@ -228,26 +228,4 @@ public class WorkPlanItemServiceImpl extends BaseServiceImpl listByWoId(Long woId) { - if (woId == null) { - return null; - } - // 创建查询条件 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - // 关联查询条件 - queryWrapper.exists( - "SELECT 1 FROM MES_WORK_PLAN wp " + - "JOIN BS_PROCESS_SET ps ON wp.pps_id = ps.id " + - "WHERE wp.wo_id = {0} " + - "AND ps.name <> {1}", - woId, "烧结包装防护" - ); - // 其他条件 - queryWrapper.ne(WorkPlanItem::getItemName, "单件包装材料数量") - .orderByAsc(WorkPlanItem::getItemCode) - .orderByDesc(WorkPlanItem::getId); - return this.list(queryWrapper); - } }