转试修改

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java

@@ -30,6 +30,7 @@ import org.springblade.desk.basic.pojo.entity.OemCraftAbilityEntity;
 import org.springblade.desk.basic.pojo.entity.WorkCenter;
 import org.springblade.desk.basic.service.*;
 import org.springblade.desk.dashboard.pojo.entity.*;
+import org.springblade.desk.dashboard.pojo.vo.DsProcessProjectVO;
 import org.springblade.desk.dashboard.service.IBsProcessSetService;
 import org.springblade.desk.dashboard.service.IBsTeamSetService;
 import org.springblade.desk.dashboard.service.IDsPartService;
@@ -2633,8 +2634,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         if(yieldOrder == null){
             return false;
         }
-        List<DsProcessProjectEntity> dsProcessProjectEntities = dsPartService.selectDsProcessProjectByCraftId(yieldOrder.getCraftId());
+        List<DsProcessProjectVO> dsProcessProjectEntities = dsPartService.selectDsProcessProjectByCraftId(yieldOrder.getCraftId(),null);
-        if (!(dsProcessProjectEntities != null && !dsProcessProjectEntities.isEmpty())) {
+        if (dsProcessProjectEntities == null || dsProcessProjectEntities.isEmpty()) {
             return false;
         }
         boolean flag = false;
@@ -2729,13 +2730,15 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     private WorkPlan findRelevantWorkPlan(Long woId) {
         WorkOrder workOrder = this.getById(woId);
         YieldOrder yieldOrder = yieldOrderService.getById(workOrder.getYoId());
-        List<DsProcessProjectEntity> dsProcessProjectEntities = dsPartService.selectDsProcessProjectByCraftId(yieldOrder.getCraftId());
+        List<DsProcessProjectVO> dsProcessProjectEntities = dsPartService.selectDsProcessProjectByCraftId(yieldOrder.getCraftId(),null);
         WorkPlan prWorkPlan = null;
-        for (DsProcessProjectEntity dsProcessProjectEntity : dsProcessProjectEntities) {
+        if (dsProcessProjectEntities != null && !dsProcessProjectEntities.isEmpty()) {
-            if ("承压检测".equals(dsProcessProjectEntity.getProjectName())) {
+            for (DsProcessProjectEntity dsProcessProjectEntity : dsProcessProjectEntities) {
-                prWorkPlan = workPlanService.getOne(new LambdaQueryWrapper<WorkPlan>()
+                if ("承压检测".equals(dsProcessProjectEntity.getProjectName())) {
-                        .eq(WorkPlan::getWoId, woId)
+                    prWorkPlan = workPlanService.getOne(new LambdaQueryWrapper<WorkPlan>()
-                        .eq(WorkPlan::getOrders,null));
+                            .eq(WorkPlan::getWoId, woId)
+                            .eq(WorkPlan::getOrders,null));
+                }
             }
         }
         return prWorkPlan;