mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-13 05:12:07 +08:00
1、装配清单部件列表增加orderIds的过滤影响;2、cad拆单部件层级异常累加修复;
This commit is contained in:
+6
-1
@@ -79,7 +79,9 @@ public class AssemblyListServiceImpl implements AssemblyListService {
|
||||
}
|
||||
|
||||
// 查询入参部件
|
||||
List<OrderComponentDO> componentDOS = orderComponentMapper.selectByIds(componentIds);
|
||||
List<OrderComponentDO> componentDOS = orderComponentMapper.selectList(new LambdaUpdateWrapper<OrderComponentDO>()
|
||||
.in(OrderComponentDO::getId, componentIds)
|
||||
.in(OrderComponentDO::getOrderId, reqVO.getOrderIds()));
|
||||
if (CollUtil.isEmpty(componentDOS) || componentDOS.size() != componentIds.size()) {
|
||||
throw new ServiceException(ORDER_COMPONENT_NOT_EXIST);
|
||||
}
|
||||
@@ -117,6 +119,9 @@ public class AssemblyListServiceImpl implements AssemblyListService {
|
||||
List<String> topComponentNames = orderComponentTreeRespVOS.stream().map(OrderComponentTreeCompareVO::getName).distinct().toList();
|
||||
|
||||
// 根据名称查询组织装配设置
|
||||
if (CollUtil.isEmpty(topComponentNames)) {
|
||||
return orderComponentTreeRespVOS;
|
||||
}
|
||||
CommonResult<List<AssemblyConfigRespDTO>> assemblyConfigByComponentNameListResult = assemblyConfigApi.getAssemblyConfigByPartNameList(topComponentNames);
|
||||
if(assemblyConfigByComponentNameListResult.isError()) {
|
||||
throw new ServiceException(ORDER_COMPONENT_ASSEMBLY_CONFIG_QUERY_ERROR);
|
||||
|
||||
Reference in New Issue
Block a user