任务中设置

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskServiceImpl.java

@@ -1,5 +1,6 @@
 package com.github.zuihou.business.operationManagementCenter.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.zuihou.base.service.SuperServiceImpl;
@@ -17,6 +18,7 @@ import com.github.zuihou.business.operationManagementCenter.entity.*;
 import com.github.zuihou.business.operationManagementCenter.service.TaskService;
 import com.github.zuihou.business.operationManagementCenter.service.WorkpieceService;
 import com.github.zuihou.business.productionReadyCenter.dao.AutoNodeMapper;
+import com.github.zuihou.business.productionReadyCenter.dao.BomProcedureProductionresourceMapper;
 import com.github.zuihou.business.productionReadyCenter.dao.BomProcedureProgramMapper;
 import com.github.zuihou.business.productionReadyCenter.entity.*;
 import com.github.zuihou.business.productionResourceCenter.entity.Repair;
@@ -73,6 +75,8 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
     @Autowired
     private TTaskMapper tTaskMapper;
     @Autowired
+    private BomProcedureProductionresourceMapper procedureProductionresourceMapper;
+    @Autowired
     private BomProcedureProgramMapper bomProcedureProgramMapper;
 
     @Override
@@ -349,9 +353,13 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
             Operation operation = it.next().getValue();
             for(TTask task : taskList){
                 if(task.getTmpId().equals(operation.getId())){
+                    List<BomProcedureProductionresource> procedureProductionresourceList = procedureProductionresourceMapper.selectList(Wraps.<BomProcedureProductionresource>lbQ().eq(BomProcedureProductionresource::getProcedureId,task.getProcedureId()).eq(BomProcedureProductionresource::getResourceId,operation.getMachineId()));
                     task.setExpectStartTime(new Date(operation.getStart()));
                     task.setExpectEndTime(new Date(operation.getFinish()));
                     task.setResourceId(operation.getMachineId());
+                    if(CollectionUtil.isNotEmpty(procedureProductionresourceList)){
+                        task.setResourceBusinessId(procedureProductionresourceList.get(0).getResourceBusinessId());
+                    }
                     break;
                 }
             }