|
|
@ -3,7 +3,7 @@ package com.spring.ifs.bean; |
|
|
import com.alibaba.fastjson.JSON; |
|
|
import com.alibaba.fastjson.JSON; |
|
|
import com.spring.ifs.api.BomApi; |
|
|
import com.spring.ifs.api.BomApi; |
|
|
import com.spring.ifs.api.IfsServer; |
|
|
import com.spring.ifs.api.IfsServer; |
|
|
import com.spring.ifs.data.*; |
|
|
|
|
|
|
|
|
import com.spring.ifs.data.BomDistribution; |
|
|
import com.spring.modules.part.entity.APIEntity.BomIfsAlternative; |
|
|
import com.spring.modules.part.entity.APIEntity.BomIfsAlternative; |
|
|
import com.spring.modules.part.entity.APIEntity.BomIfsHeader; |
|
|
import com.spring.modules.part.entity.APIEntity.BomIfsHeader; |
|
|
import com.spring.modules.part.entity.APIEntity.BomIfsItem; |
|
|
import com.spring.modules.part.entity.APIEntity.BomIfsItem; |
|
|
@ -447,7 +447,7 @@ public class BomServiceBean { |
|
|
throw new RuntimeException("Bom Alternative不存在!"); |
|
|
throw new RuntimeException("Bom Alternative不存在!"); |
|
|
} |
|
|
} |
|
|
//查询结果集 |
|
|
//查询结果集 |
|
|
List<BomItem> resultList = BomApi.getBomItems(srv, contract, partNo, engChgLevel, bomType, alternativeNo, lineItemNo); |
|
|
|
|
|
|
|
|
List<BomIfsItem> resultList = BomApi.getBomItems(srv, contract, partNo, engChgLevel, bomType, alternativeNo, lineItemNo); |
|
|
//判断是否查询数据 |
|
|
//判断是否查询数据 |
|
|
if(resultList == null ||resultList.size() == 0 || resultList.isEmpty()) { |
|
|
if(resultList == null ||resultList.size() == 0 || resultList.isEmpty()) { |
|
|
throw new RuntimeException("不存在此bom组件信息!"); |
|
|
throw new RuntimeException("不存在此bom组件信息!"); |
|
|
@ -488,9 +488,9 @@ public class BomServiceBean { |
|
|
throw new RuntimeException("Bom Alternative不存在!"); |
|
|
throw new RuntimeException("Bom Alternative不存在!"); |
|
|
} |
|
|
} |
|
|
//查询结果集 |
|
|
//查询结果集 |
|
|
List<BomItem> itemList = BomApi.getBomItems(srv, contract, partNo, engChgLevel, bomType, alternativeNo, null); |
|
|
|
|
|
|
|
|
List<BomIfsItem> itemList = BomApi.getBomItems(srv, contract, partNo, engChgLevel, bomType, alternativeNo, null); |
|
|
//转Map |
|
|
//转Map |
|
|
Map<String, String> itemMap = itemList.stream().collect(Collectors.toMap(BomItem::getLineItemNo, BomItem::getLineItemNo)); |
|
|
|
|
|
|
|
|
Map<String, String> itemMap = itemList.stream().collect(Collectors.toMap(BomIfsItem::getLineItemNo, BomIfsItem::getLineItemNo)); |
|
|
//打印日志 |
|
|
//打印日志 |
|
|
logger.info("Bom替代明细集合 批量新增结束:"+JSON.toJSONString(inDatas)); |
|
|
logger.info("Bom替代明细集合 批量新增结束:"+JSON.toJSONString(inDatas)); |
|
|
//循环判断的方法 |
|
|
//循环判断的方法 |
|
|
@ -545,13 +545,13 @@ public class BomServiceBean { |
|
|
throw new RuntimeException("Bom Alternative不存在!"); |
|
|
throw new RuntimeException("Bom Alternative不存在!"); |
|
|
} |
|
|
} |
|
|
//查询结果集 |
|
|
//查询结果集 |
|
|
List<BomItem> resultList = BomApi.getBomItems(srv, contract, partNo, engChgLevel, bomType, alternativeNo, lineItemNo); |
|
|
|
|
|
|
|
|
List<BomIfsItem> resultList = BomApi.getBomItems(srv, contract, partNo, engChgLevel, bomType, alternativeNo, lineItemNo); |
|
|
//判断是否查询数据 |
|
|
//判断是否查询数据 |
|
|
if(resultList.size() == 0 || resultList.isEmpty()) { |
|
|
if(resultList.size() == 0 || resultList.isEmpty()) { |
|
|
throw new RuntimeException("不存在此bom组件信息!"); |
|
|
throw new RuntimeException("不存在此bom组件信息!"); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
BomItem bomItem = resultList.get(0); |
|
|
|
|
|
|
|
|
BomIfsItem bomItem = resultList.get(0); |
|
|
//设置版本信息 |
|
|
//设置版本信息 |
|
|
inData.setIfsRowId(bomItem.getIfsRowId()); |
|
|
inData.setIfsRowId(bomItem.getIfsRowId()); |
|
|
inData.setIfsRowVersion(bomItem.getIfsRowVersion()); |
|
|
inData.setIfsRowVersion(bomItem.getIfsRowVersion()); |
|
|
@ -589,9 +589,9 @@ public class BomServiceBean { |
|
|
String alternativeNo = inDatas.get(0).getAlternativeNo(); |
|
|
String alternativeNo = inDatas.get(0).getAlternativeNo(); |
|
|
try{ |
|
|
try{ |
|
|
//查询数据 |
|
|
//查询数据 |
|
|
List<BomItem> itemList = BomApi.getBomItems(srv, contract, partNo, engChgLevel, bomType, alternativeNo, null); |
|
|
|
|
|
|
|
|
List<BomIfsItem> itemList = BomApi.getBomItems(srv, contract, partNo, engChgLevel, bomType, alternativeNo, null); |
|
|
//转Map |
|
|
//转Map |
|
|
Map<String, BomItem> itemMap = itemList.stream().collect(Collectors.toMap(BomItem::getLineItemNo, Function.identity())); |
|
|
|
|
|
|
|
|
Map<String, BomIfsItem> itemMap = itemList.stream().collect(Collectors.toMap(BomIfsItem::getLineItemNo, Function.identity())); |
|
|
//打印日志 |
|
|
//打印日志 |
|
|
logger.info("Bom替代明细集合 批量新增结束:"+JSON.toJSONString(inDatas)); |
|
|
logger.info("Bom替代明细集合 批量新增结束:"+JSON.toJSONString(inDatas)); |
|
|
//循环判断的方法 |
|
|
//循环判断的方法 |
|
|
@ -606,7 +606,7 @@ public class BomServiceBean { |
|
|
for(BomIfsItem bomItem : inDatas) { |
|
|
for(BomIfsItem bomItem : inDatas) { |
|
|
//设置版本的信息 |
|
|
//设置版本的信息 |
|
|
String key = bomItem.getLineItemNo(); |
|
|
String key = bomItem.getLineItemNo(); |
|
|
BomItem oriItem = itemMap.get(key); |
|
|
|
|
|
|
|
|
BomIfsItem oriItem = itemMap.get(key); |
|
|
bomItem.setIfsRowId(oriItem.getIfsRowId()); |
|
|
bomItem.setIfsRowId(oriItem.getIfsRowId()); |
|
|
bomItem.setIfsRowVersion(oriItem.getIfsRowVersion()); |
|
|
bomItem.setIfsRowVersion(oriItem.getIfsRowVersion()); |
|
|
//调用api |
|
|
//调用api |
|
|
|