手动模式

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

@@ -1,11 +1,13 @@
 package com.github.zuihou.business.productionReadyCenter.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.zuihou.authority.service.common.DictionaryItemService;
 import com.github.zuihou.business.basics.dao.CustMapper;
 import com.github.zuihou.business.basics.service.CustService;
+import com.github.zuihou.business.edgeLibrary.entity.StockInfo;
 import com.github.zuihou.business.modelingCenter.dao.MModuleFieldMapper;
 import com.github.zuihou.business.modelingCenter.entity.MModuleField;
 import com.github.zuihou.business.productionReadyCenter.dao.AutoNodeMapper;
@@ -39,6 +41,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.github.zuihou.utils.BizAssert.isFalse;
+import static java.util.stream.Collectors.groupingBy;
 
 /**
  * <p>
@@ -778,12 +781,20 @@ public class BomProcedureVersionServiceImpl extends SuperServiceImpl<BomProcedur
 //                m.setProgramGroupList(map.get(m.getId()));
 //            }
 //        }
-        model.setProgramList(programList);
+
 
         //设置刀具
         List<BBomProcedureTool>toolList = bomProcedureToolService.list(Wraps.<BBomProcedureTool>lbQ().eq(BBomProcedureTool::getProcedureId,bean.getId()));
-//        model.setToolList(toolList);
+        Map<Long,List<BBomProcedureTool>>map = toolList.stream().collect(groupingBy(BBomProcedureTool::getProgramId));
+        if(CollectionUtil.isNotEmpty(programList)){
+            for(BomProcedureProgram procedureProgram:programList){
+                if(map.containsKey(procedureProgram.getId())){
+                    procedureProgram.setToolList(map.get(procedureProgram.getId()));
+                }
+            }
+        }
 
+        model.setProgramList(programList);
         //人工质检
         model.setProcedureTestList(bomProcedureTestService.list(Wraps.<BomProcedureTest>lbQ().eq(BomProcedureTest::getProcedureId,bean.getId())));