工具原材料从零件中获取

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

@@ -95,6 +95,9 @@ public class BomProcedureVersionServiceImpl extends SuperServiceImpl<BomProcedur
     @Autowired
     private BomProcedureService procedureService;
 
+    @Autowired
+    private BBomService bomService;
+
 
     @Override
     public Map<String, Object> pageList(Map<String, Object> map) {
@@ -384,6 +387,8 @@ public class BomProcedureVersionServiceImpl extends SuperServiceImpl<BomProcedur
     @Override
     @Transactional(rollbackFor = Exception.class)
     public BomProcedureVersion saveProcessAnalysis(BomProcedureVersion bean) {
+        BBom bBom = bomService.getById(bean.getBomId());
+
         //1.新增可执行设备,因可执行设备对应设置自动化节点，所以不能直接删除
         //查询当前程序下的设备
         List<BomProcedureProductionresource> prList = bomProcedureProductionresourceService.list(Wraps.<BomProcedureProductionresource>lbQ().eq(BomProcedureProductionresource::getProcedureId,bean.getId()));
@@ -430,17 +435,29 @@ public class BomProcedureVersionServiceImpl extends SuperServiceImpl<BomProcedur
         //先删除原材料
         bomProcedureMeterialService.remove(Wraps.<BomProcedureMeterial>lbQ().eq(BomProcedureMeterial::getProcedureId,bean.getId()));
         //2.新增所需原材料
-        if("3".equals(bean.getMeterialConf())){
-            List<BomProcedureMeterial> meterialList = bean.getMeterialList();
-            if(meterialList != null && meterialList.size() > 0){
-                List<BomProcedureMeterial> mList = meterialList.stream().map((map) -> {
-                    BomProcedureMeterial item = new BomProcedureMeterial();
-                    BeanUtil.copyProperties(map, item);
-                    item.setProcedureId(bean.getId());
-                    item.setId(null);
-                    return item;
-                }).collect(Collectors.toList());
-                bomProcedureMeterialService.saveBatch(mList);
+//        if("3".equals(bean.getMeterialConf())){
+//            List<BomProcedureMeterial> meterialList = bean.getMeterialList();
+//            if(meterialList != null && meterialList.size() > 0){
+//                List<BomProcedureMeterial> mList = meterialList.stream().map((map) -> {
+//                    BomProcedureMeterial item = new BomProcedureMeterial();
+//                    BeanUtil.copyProperties(map, item);
+//                    item.setProcedureId(bean.getId());
+//                    item.setId(null);
+//                    return item;
+//                }).collect(Collectors.toList());
+//                bomProcedureMeterialService.saveBatch(mList);
+//            }
+//        }
+
+        //2.原材料的从bom表中获的
+        if(1==1){
+            bean.setMeterialConf("3");//需要原材料
+
+            if(bBom!=null&&bBom.getMeterialId()!=null){
+                BomProcedureMeterial bomProcedureMeterial = new BomProcedureMeterial();
+                bomProcedureMeterial.setMeterialId(bBom.getMeterialId());
+                bomProcedureMeterial.setProcedureId(bean.getId());
+                bomProcedureMeterialService.save(bomProcedureMeterial);
             }
         }