瀏覽代碼

Merge branch 'master' of http://106.14.142.95:3000/oyq28/imcs_331

oyq28 2 周之前
父節點
當前提交
fef68211bd

+ 141 - 141
imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/externalApi/MesController.java

@@ -204,8 +204,8 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
         //page.setSize(10000L);
         baseService.pageList(page, wrapper);
         page.getRecords().stream().forEach(item->{
-           List<MesNotice> childrens = baseService.list(new LbqWrapper<MesNotice>().eq(MesNotice::getOrderNo, item.getOrderNo()).ne(MesNotice::getId, item.getId()).eq(MesNotice::getStatus, "1").orderByDesc(MesNotice::getApiSort));
-           item.setChildren(childrens);
+            List<MesNotice> childrens = baseService.list(new LbqWrapper<MesNotice>().eq(MesNotice::getOrderNo, item.getOrderNo()).ne(MesNotice::getId, item.getId()).eq(MesNotice::getStatus, "1").orderByDesc(MesNotice::getApiSort));
+            item.setChildren(childrens);
         });
         //List<MesNotice> result = TreeUtil.buildTree(datas);
         //page.setRecords(result);
@@ -244,7 +244,7 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
     @ApiOperation(value = "下载附件", notes = "下载附件")
     @GetMapping(value = "/download")
     public R download(@ApiParam(name = "id", value = "mesId")
-                          @RequestParam(value = "id") String id) {
+                      @RequestParam(value = "id") String id) {
         MesNotice mesNotice = mesNoticeService.getById(id);
         List<MesAttachment> mesAttachments = mesAttachmentService.list(new LbqWrapper<MesAttachment>().isNotNull(MesAttachment::getName).isNotNull(MesAttachment::getUrl).eq(MesAttachment::getProcedureNo, mesNotice.getOrderNo()).eq(MesAttachment::getStatus, "1"));
         if (null==mesAttachments || mesAttachments.size() == 0) return R.fail("参数为空");
@@ -307,129 +307,129 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
         String orderNo = null;
         MMeterialReceiveLog mMeterialReceiveLog = null;
         switch(apiType) {
-          case "QUERYWORKORDER":
-              workOrder = (JSONObject) returnData.getJSONArray("respBody").get(0);
-              List<Object> workPieceList = workOrder.getJSONArray("orderProductSeqList");
-              //新增任务
-              //Plan plan = Plan.builder().build();
-              //plan.setPlanNo(workOrder.getString("workOrderNo")).setOrderNo(workOrder.getString("orderNo")).setPlanStatus("1").setProduceStatus("1").setPrority(50)
-              //        .setAuditStatus("1").setProduceStatus("1").setSchedulingStatus("0").setDraftFlag("1").setStartTime(StringUtil.isNotEmpty(workOrder.getString("plannedStartTime"))?DateUtil.stringToDate3(workOrder.getString("plannedStartTime")):new Date()).setEndTime(StringUtil.isNotEmpty(workOrder.getString("plannedEndTime"))?DateUtil.stringToDate3(workOrder.getString("plannedEndTime")):new Date());
-
-              bom = bBomService.getOne(new LambdaQueryWrapper<BBom>().eq(BBom::getPartsNo, workOrder.getString("materialCode")).eq(BBom::getNo, workOrder.getString("workOrderNo")).eq(BBom::getSynFlag, "1"));
-              //plan.setBomId(bom.getId());
-
-              Order order = Order.builder().build();
-              order.setOrderNo(workOrder.getString("workOrderNo")).setOrderTime(StringUtil.isNotEmpty(workOrder.getString("plannedStartTime"))?DateUtil.stringToDate3(workOrder.getString("plannedStartTime")):new Date()).setDeliveryTime(StringUtil.isNotEmpty(workOrder.getString("plannedEndTime"))?DateUtil.stringToDate3(workOrder.getString("plannedEndTime")): new Date()).setSource("2").setProductNum(workPieceList.size())
-                      .setStatus("1").setSingleTaskFlag(0).setOrderStatus("1").setBatchNo(workOrder.getString("batchNo"));
-              //产品编码+生产类型编码(P/B P:按序列生产 B:按批次生产)+ 密级编码 + 批次号 + 工艺版本
-              String orderName = "MES_"+workOrder.getString("materialCode")+"_"+workOrder.getString("productPhase").toUpperCase()+"_"+ workOrder.getString("planSecretLevel").toUpperCase() + "_" + workOrder.getString("batchNo") + "_"+workOrder.getString("processRouteVersion");
-              order.setCustId(0L).setOrderName(orderName).setZoneId(zone.getId());
-              orderService.save(order);
-
-              OrderProduct orderProduct = OrderProduct.builder().build();
-              orderProduct.setOrderId(order.getId()).setOrderNo(order.getOrderNo()).setBomId(bom.getId()).setBomName(bom.getName()).setBomNum(workPieceList.size()).setBomNo(bom.getNo()).setDeliveryTime(order.getDeliveryTime());
-              mMeterialReceiveLog = meterialReceiveLogService.getOne(new LambdaQueryWrapper<MMeterialReceiveLog>().eq(MMeterialReceiveLog::getMeterialId, bom.getMeterialId()).last("limit 1"));
-              if(null!= mMeterialReceiveLog) {
-                  orderProduct.setMeterialReceiveId(mMeterialReceiveLog.getId());
-              }else{
-                  MMeterialReceiveLog initData = MMeterialReceiveLog.builder().meterialId(bom.getMeterialId()).batchStand(100).bomBatchNo(workOrder.getString("batchNo")).furnaceBatchNo(workOrder.getString("orderNo")).meterialBatchNo(workOrder.getString("batchNo")).usedNum(0).factoryDate(new Date()).build();
-                  meterialReceiveLogService.save(initData);
-                  orderProduct.setMeterialReceiveId(initData.getId());
-              }
-              orderProductService.save(orderProduct);
-
-              //plan.setOrderId(order.getId());
-              //planService.save(plan);
-
-              break;
-          case "QUERYWORKORDERMATERIAL":
-              JSONObject material = (JSONObject) returnData.getJSONArray("respBody").get(0);
-              if(material!=null){
-                  //判断原材料是否存在
-                  String materialCode = material.containsKey("materialCode") && material.getString("materialCode")!="null" ? material.getString("materialCode") : material.getString("productCode");
-                  String materialName = material.containsKey("materialName") && material.getString("materialName")!="null" ? material.getString("materialName") : material.getString("productName");
-                  MMeterial mMeterial = materialService.getOne(new LbqWrapper<MMeterial>().eq(MMeterial::getTradeMark, materialName).eq(MMeterial::getMeterialCode, materialCode).last("limit 1"));
-                  if(null == mMeterial){
-                       MMeterial instance = MMeterial.builder().build();
-                       instance.setStatus("1").setSpecification(material.getString("materialSpecification")).setMeterialCode(materialCode).setEquipmentName(materialName).setTradeMark(materialName).setHandleStatus(material.getString("materialFigureNo"));
-                       if(zone!=null){
-                           instance.setZoneId(zone.getId());
-                       }
-                      materialService.save(instance);
-                      mMeterial = instance;
-                  }
-                  else{
-                      Integer num = material.getInteger("requiredQuantity");
-                      mMeterialReceiveLog = meterialReceiveLogService.getOne(new LambdaQueryWrapper<MMeterialReceiveLog>().eq(MMeterialReceiveLog::getMeterialId, mMeterial.getId()).last("limit 1"));
-                      Integer surplus = mMeterialReceiveLog.getUsedNum() ==null ? mMeterialReceiveLog.getBatchStand() : mMeterialReceiveLog.getBatchStand() - mMeterialReceiveLog.getUsedNum();
-                      if(null!=surplus && surplus < num) {
-                          msgUtil.createWarnLog(mMeterial.getTradeMark()+"毛坯不够", "MesSynDataWarn");
-                          //return;
-                      }
-                  }
-                  //保存工单零件信息
-                  //String bomName = material.containsKey("processNo") ? material.getString("productName")+"V"+material.getString("processNo") : material.getString("productName")+"V"+material.getString("workOrderNo");
-                  String bomName = material.getString("productName")+"V"+material.getString("workOrderNo");
-                  bom = bBomService.getOne(new LambdaQueryWrapper<BBom>().eq(BBom::getMeterialId, mMeterial.getId()).eq(BBom::getPartsNo, material.getString("productCode")).eq(BBom::getName, bomName).eq(BBom::getNo, material.getString("workOrderNo")).eq(BBom::getSynFlag, "1"));
-                  if(bom == null){
-                      bom = BBom.builder().build();
-                      bom.setPartsNo(material.getString("productCode")).setBomAlias(material.getString("productCode")).setPartsAlias(material.getString("productCode")).setBatchNo(material.getString("productCode")).setName(bomName).setStatus("1").setSynFlag("1").setImportantFlag("1").setKeyFlag("1").setNo(material.getString("workOrderNo"));
-                      bom.setMeterialId(mMeterial.getId());
-                      if(zone!=null){
-                          bom.setZoneId(zone.getId());
-                      }
-                      bBomService.save(bom);
-                  }
-              }
-              break;
-          case "QUERYWORKORDERPROESS":
-              workOrder = (JSONObject) returnData.getJSONArray("respBody").get(0);
-              List<Object> taskList = workOrder.getJSONArray("workOrderProcessStepList");
-              if(workOrder!=null){
-                  String version = workOrder.getString("version");
-                  String productCode = workOrder.getString("productCode");
-                  String workOrderNo = workOrder.getString("workOrderNo");
-                  String processNo= workOrder.getString("processNo");
-                  //String productName = workOrder.getString("productName");
-                  //String bomName = productName + "V" + processNo;
-                  bom = bBomService.getOne(new LambdaQueryWrapper<BBom>().eq(BBom::getPartsNo, productCode).eq(BBom::getNo, workOrderNo).eq(BBom::getSynFlag, "1").last("limit 1"));
-                 if(bom!=null && bom.getName().contains(workOrderNo)){
-                       //替换工艺工序名称
-                       String processName = bom.getName().replace(workOrderNo, processNo);
-                       BBom processBom = bBomService.getOne(new LbqWrapper<BBom>().eq(BBom::getName, processName).eq(BBom::getPartsNo, productCode).eq(BBom::getSynFlag, "1").last("limit 1"));
-                       if(null == processBom) {
+            case "QUERYWORKORDER":
+                workOrder = (JSONObject) returnData.getJSONArray("respBody").get(0);
+                List<Object> workPieceList = workOrder.getJSONArray("orderProductSeqList");
+                //新增任务
+                //Plan plan = Plan.builder().build();
+                //plan.setPlanNo(workOrder.getString("workOrderNo")).setOrderNo(workOrder.getString("orderNo")).setPlanStatus("1").setProduceStatus("1").setPrority(50)
+                //        .setAuditStatus("1").setProduceStatus("1").setSchedulingStatus("0").setDraftFlag("1").setStartTime(StringUtil.isNotEmpty(workOrder.getString("plannedStartTime"))?DateUtil.stringToDate3(workOrder.getString("plannedStartTime")):new Date()).setEndTime(StringUtil.isNotEmpty(workOrder.getString("plannedEndTime"))?DateUtil.stringToDate3(workOrder.getString("plannedEndTime")):new Date());
+
+                bom = bBomService.getOne(new LambdaQueryWrapper<BBom>().eq(BBom::getPartsNo, workOrder.getString("materialCode")).eq(BBom::getNo, workOrder.getString("workOrderNo")).eq(BBom::getSynFlag, "1"));
+                //plan.setBomId(bom.getId());
+
+                Order order = Order.builder().build();
+                order.setOrderNo(workOrder.getString("workOrderNo")).setOrderTime(StringUtil.isNotEmpty(workOrder.getString("plannedStartTime"))?DateUtil.stringToDate3(workOrder.getString("plannedStartTime")):new Date()).setDeliveryTime(StringUtil.isNotEmpty(workOrder.getString("plannedEndTime"))?DateUtil.stringToDate3(workOrder.getString("plannedEndTime")): new Date()).setSource("2").setProductNum(workPieceList.size())
+                        .setStatus("1").setSingleTaskFlag(0).setOrderStatus("1").setBatchNo(workOrder.getString("batchNo"));
+                //产品编码+生产类型编码(P/B P:按序列生产 B:按批次生产)+ 密级编码 + 批次号 + 工艺版本
+                String orderName = "MES_"+workOrder.getString("materialCode")+"_"+workOrder.getString("productPhase").toUpperCase()+"_"+ workOrder.getString("planSecretLevel").toUpperCase() + "_" + workOrder.getString("batchNo") + "_"+workOrder.getString("processRouteVersion");
+                order.setCustId(0L).setOrderName(orderName).setZoneId(zone.getId());
+                orderService.save(order);
+
+                OrderProduct orderProduct = OrderProduct.builder().build();
+                orderProduct.setOrderId(order.getId()).setOrderNo(order.getOrderNo()).setBomId(bom.getId()).setBomName(bom.getName()).setBomNum(workPieceList.size()).setBomNo(bom.getNo()).setDeliveryTime(order.getDeliveryTime());
+                mMeterialReceiveLog = meterialReceiveLogService.getOne(new LambdaQueryWrapper<MMeterialReceiveLog>().eq(MMeterialReceiveLog::getMeterialId, bom.getMeterialId()).last("limit 1"));
+                if(null!= mMeterialReceiveLog) {
+                    orderProduct.setMeterialReceiveId(mMeterialReceiveLog.getId());
+                }else{
+                    MMeterialReceiveLog initData = MMeterialReceiveLog.builder().meterialId(bom.getMeterialId()).batchStand(100).bomBatchNo(workOrder.getString("batchNo")).furnaceBatchNo(workOrder.getString("orderNo")).meterialBatchNo(workOrder.getString("batchNo")).usedNum(0).factoryDate(new Date()).build();
+                    meterialReceiveLogService.save(initData);
+                    orderProduct.setMeterialReceiveId(initData.getId());
+                }
+                orderProductService.save(orderProduct);
+
+                //plan.setOrderId(order.getId());
+                //planService.save(plan);
+
+                break;
+            case "QUERYWORKORDERMATERIAL":
+                JSONObject material = (JSONObject) returnData.getJSONArray("respBody").get(0);
+                if(material!=null){
+                    //判断原材料是否存在
+                    String materialCode = material.containsKey("materialCode") && material.getString("materialCode")!="null" ? material.getString("materialCode") : material.getString("productCode");
+                    String materialName = material.containsKey("materialName") && material.getString("materialName")!="null" ? material.getString("materialName") : material.getString("productName");
+                    MMeterial mMeterial = materialService.getOne(new LbqWrapper<MMeterial>().eq(MMeterial::getTradeMark, materialName).eq(MMeterial::getMeterialCode, materialCode).last("limit 1"));
+                    if(null == mMeterial){
+                        MMeterial instance = MMeterial.builder().build();
+                        instance.setStatus("1").setSpecification(material.getString("materialSpecification")).setMeterialCode(materialCode).setEquipmentName(materialName).setTradeMark(materialName).setHandleStatus(material.getString("materialFigureNo"));
+                        if(zone!=null){
+                            instance.setZoneId(zone.getId());
+                        }
+                        materialService.save(instance);
+                        mMeterial = instance;
+                    }
+                    else{
+                        Integer num = material.getInteger("requiredQuantity");
+                        mMeterialReceiveLog = meterialReceiveLogService.getOne(new LambdaQueryWrapper<MMeterialReceiveLog>().eq(MMeterialReceiveLog::getMeterialId, mMeterial.getId()).last("limit 1"));
+                        Integer surplus = mMeterialReceiveLog.getUsedNum() ==null ? mMeterialReceiveLog.getBatchStand() : mMeterialReceiveLog.getBatchStand() - mMeterialReceiveLog.getUsedNum();
+                        if(null!=surplus && surplus < num) {
+                            msgUtil.createWarnLog(mMeterial.getTradeMark()+"毛坯不够", "MesSynDataWarn");
+                            //return;
+                        }
+                    }
+                    //保存工单零件信息
+                    //String bomName = material.containsKey("processNo") ? material.getString("productName")+"V"+material.getString("processNo") : material.getString("productName")+"V"+material.getString("workOrderNo");
+                    String bomName = material.getString("productName")+"V"+material.getString("workOrderNo");
+                    bom = bBomService.getOne(new LambdaQueryWrapper<BBom>().eq(BBom::getMeterialId, mMeterial.getId()).eq(BBom::getPartsNo, material.getString("productCode")).eq(BBom::getName, bomName).eq(BBom::getNo, material.getString("workOrderNo")).eq(BBom::getSynFlag, "1"));
+                    if(bom == null){
+                        bom = BBom.builder().build();
+                        bom.setPartsNo(material.getString("productCode")).setBomAlias(material.getString("productCode")).setPartsAlias(material.getString("productCode")).setBatchNo(material.getString("productCode")).setName(bomName).setStatus("1").setSynFlag("1").setImportantFlag("1").setKeyFlag("1").setNo(material.getString("workOrderNo"));
+                        bom.setMeterialId(mMeterial.getId());
+                        if(zone!=null){
+                            bom.setZoneId(zone.getId());
+                        }
+                        bBomService.save(bom);
+                    }
+                }
+                break;
+            case "QUERYWORKORDERPROESS":
+                workOrder = (JSONObject) returnData.getJSONArray("respBody").get(0);
+                List<Object> taskList = workOrder.getJSONArray("workOrderProcessStepList");
+                if(workOrder!=null){
+                    String version = workOrder.getString("version");
+                    String productCode = workOrder.getString("productCode");
+                    String workOrderNo = workOrder.getString("workOrderNo");
+                    String processNo= workOrder.getString("processNo");
+                    //String productName = workOrder.getString("productName");
+                    //String bomName = productName + "V" + processNo;
+                    bom = bBomService.getOne(new LambdaQueryWrapper<BBom>().eq(BBom::getPartsNo, productCode).eq(BBom::getNo, workOrderNo).eq(BBom::getSynFlag, "1").last("limit 1"));
+                    if(bom!=null && bom.getName().contains(workOrderNo)){
+                        //替换工艺工序名称
+                        String processName = bom.getName().replace(workOrderNo, processNo);
+                        BBom processBom = bBomService.getOne(new LbqWrapper<BBom>().eq(BBom::getName, processName).eq(BBom::getPartsNo, productCode).eq(BBom::getSynFlag, "1").last("limit 1"));
+                        if(null == processBom) {
                             //更新本地标准零件名称数据
                             bom.setName(processName).setBrand(processNo);
                             bBomService.updateAllById(bom);
                             bom = bBomService.getById(bom.getId());
-                       }else{
-                           //为后续接口替换工单编号
-                           processBom.setNo(workOrderNo).setBrand(processNo);
-                           bBomService.updateAllById(processBom);
-                           //删除临时零件数据
-                           bBomService.delete(bom);
-                           bom = bBomService.getById(processBom.getId());
-                       }
-                  }
-
-                  if(StringUtil.isNotEmpty(version)) {
-                      Long versionId = null;
-                      BomVersionInfo mesVersionInfo = bomVersionInfoService.getOne(new LambdaQueryWrapper<BomVersionInfo>().eq(BomVersionInfo::getBomId, bom.getId()).eq(BomVersionInfo::getVersion, version).eq(BomVersionInfo::getSource, "2").last("limit 1"));
-                      if (null == mesVersionInfo) {
-                          BomVersionInfo bomVersionInfo = BomVersionInfo.builder().build();
-                          bomVersionInfo.setVersion(version).setUseStatus("0").setAuditStatus("2");
-                          //String no = codeRuleService.getBillCode(CodeRuleModule.CODE_RULE_VERSION);
-                          bomVersionInfo.setNo(workOrderNo).setSource("2");
-                          if(zone!=null){
-                              bomVersionInfo.setZoneId(zone.getId());
-                          }
-                          bomVersionInfo.setBomId(bom.getId());
-                          bomVersionInfoService.save(bomVersionInfo);
-                          versionId = bomVersionInfo.getId();
-                      } else {
-                          versionId = mesVersionInfo.getId();
-                      }
-                      //节点处理
+                        }else{
+                            //为后续接口替换工单编号
+                            processBom.setNo(workOrderNo).setBrand(processNo);
+                            bBomService.updateAllById(processBom);
+                            //删除临时零件数据
+                            bBomService.delete(bom);
+                            bom = bBomService.getById(processBom.getId());
+                        }
+                    }
+
+                    if(StringUtil.isNotEmpty(version)) {
+                        Long versionId = null;
+                        BomVersionInfo mesVersionInfo = bomVersionInfoService.getOne(new LambdaQueryWrapper<BomVersionInfo>().eq(BomVersionInfo::getBomId, bom.getId()).eq(BomVersionInfo::getVersion, version).eq(BomVersionInfo::getSource, "2").last("limit 1"));
+                        if (null == mesVersionInfo) {
+                            BomVersionInfo bomVersionInfo = BomVersionInfo.builder().build();
+                            bomVersionInfo.setVersion(version).setUseStatus("0").setAuditStatus("2");
+                            //String no = codeRuleService.getBillCode(CodeRuleModule.CODE_RULE_VERSION);
+                            bomVersionInfo.setNo(workOrderNo).setSource("2");
+                            if(zone!=null){
+                                bomVersionInfo.setZoneId(zone.getId());
+                            }
+                            bomVersionInfo.setBomId(bom.getId());
+                            bomVersionInfoService.save(bomVersionInfo);
+                            versionId = bomVersionInfo.getId();
+                        } else {
+                            versionId = mesVersionInfo.getId();
+                        }
+                        //节点处理
                       /*
                       if (taskList.size() >= 4) {
                           String[] noArr = new String[] {"OP05","OP10", "OP11", "OP15"};
@@ -456,9 +456,9 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
                           bomProcedureService.saveBatch(bomProcedureList);
                       }
                        */
-                  }
-              }
-              break;
+                    }
+                }
+                break;
             case "QUERYWORKORDERRESOURCES":
                 workOrder = (JSONObject) returnData.getJSONArray("respBody").get(0);
                 //图片
@@ -571,7 +571,7 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
                         productionTasksController.receiveMaterialConfirm(map);
                     }
                 }
-               break;
+                break;
 
             case "EXCEPTIONHANDLINGPROGRESS":
                 //确认消息 无操作
@@ -582,7 +582,7 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
                 map.put("anomalyNo", anomalyNo);
                 productionTasksController.abnormalShutdownFeedback(map);
                 break;
-      }
+        }
     }
 
 
@@ -749,21 +749,21 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
             msgUtil.createWarnLog("产线"+lineCode+"推送工单"+orderNo+"工艺版本数据为空","MesNoticeWarn");
             return;
         }
-         Long versionId = null;
-         BomVersionInfo mesVersionInfo = bomVersionInfoService.getOne(new LambdaQueryWrapper<BomVersionInfo>().eq(BomVersionInfo::getBomId, bom.getId()).eq(BomVersionInfo::getVersion, version).eq(BomVersionInfo::getSource, "2").last("limit 1"));
-            if (null == mesVersionInfo) {
-                BomVersionInfo bomVersionInfo = BomVersionInfo.builder().build();
-                bomVersionInfo.setVersion(version).setUseStatus("0").setAuditStatus("2");
-                bomVersionInfo.setNo(workOrderNo).setSource("2");
-                if(zone!=null){
-                    bomVersionInfo.setZoneId(zone.getId());
-                }
-                bomVersionInfo.setBomId(bom.getId());
-                bomVersionInfoService.save(bomVersionInfo);
-                versionId = bomVersionInfo.getId();
-            } else {
-                versionId = mesVersionInfo.getId();
+        Long versionId = null;
+        BomVersionInfo mesVersionInfo = bomVersionInfoService.getOne(new LambdaQueryWrapper<BomVersionInfo>().eq(BomVersionInfo::getBomId, bom.getId()).eq(BomVersionInfo::getVersion, version).eq(BomVersionInfo::getSource, "2").last("limit 1"));
+        if (null == mesVersionInfo) {
+            BomVersionInfo bomVersionInfo = BomVersionInfo.builder().build();
+            bomVersionInfo.setVersion(version).setUseStatus("0").setAuditStatus("2");
+            bomVersionInfo.setNo(workOrderNo).setSource("2");
+            if(zone!=null){
+                bomVersionInfo.setZoneId(zone.getId());
             }
+            bomVersionInfo.setBomId(bom.getId());
+            bomVersionInfoService.save(bomVersionInfo);
+            versionId = bomVersionInfo.getId();
+        } else {
+            versionId = mesVersionInfo.getId();
+        }
             /*
             //节点处理
             if (taskList.size() >= 4) {