|
@@ -3,10 +3,8 @@ package com.fjhx.mes.service.bom.impl;
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.convert.Convert;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
-import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
-import com.fjhx.common.constant.SourceConstant;
|
|
|
import com.fjhx.item.entity.product.po.ProductInfo;
|
|
|
import com.fjhx.item.service.product.ProductInfoService;
|
|
|
import com.fjhx.mes.entity.bom.dto.BomInfoDto;
|
|
@@ -62,19 +60,15 @@ public class BomInfoServiceImpl extends ServiceImpl<BomInfoMapper, BomInfo> impl
|
|
|
|
|
|
Map<Long, ProductInfo> productInfoMap = new HashMap<>();
|
|
|
if (!ObjectUtil.isAllEmpty(productType, keyword)) {
|
|
|
- DynamicDataSourceContextHolder.push(SourceConstant.ITEM);
|
|
|
List<ProductInfo> list = productInfoService.list(IWrapper.<ProductInfo>getWrapper()
|
|
|
.eq(ProductInfo::getType, productType)
|
|
|
.keyword(keyword, new SqlField(ProductInfo::getName), new SqlField(ProductInfo::getCode)));
|
|
|
|
|
|
if (list.size() == 0) {
|
|
|
- DynamicDataSourceContextHolder.clear();
|
|
|
return new Page<>();
|
|
|
}
|
|
|
|
|
|
productInfoMap = list.stream().collect(Collectors.toMap(BaseIdPo::getId, Function.identity()));
|
|
|
- DynamicDataSourceContextHolder.clear();
|
|
|
- DynamicDataSourceContextHolder.push(SourceConstant.MES);
|
|
|
}
|
|
|
|
|
|
IWrapper<BomInfo> wrapper = getWrapper()
|
|
@@ -100,13 +94,11 @@ public class BomInfoServiceImpl extends ServiceImpl<BomInfoMapper, BomInfo> impl
|
|
|
item.setProductName(productInfo.getName());
|
|
|
}
|
|
|
} else {
|
|
|
- DynamicDataSourceContextHolder.push(SourceConstant.ITEM);
|
|
|
productInfoService.attributeAssign(records, BomInfo::getProductId, (item, productInfo) -> {
|
|
|
item.setProductType(productInfo.getType());
|
|
|
item.setProductCode(productInfo.getCode());
|
|
|
item.setProductName(productInfo.getName());
|
|
|
});
|
|
|
- DynamicDataSourceContextHolder.clear();
|
|
|
}
|
|
|
|
|
|
return page;
|
|
@@ -120,13 +112,11 @@ public class BomInfoServiceImpl extends ServiceImpl<BomInfoMapper, BomInfo> impl
|
|
|
List<BomDetail> bomDetailList = bomDetailService.list(q -> q.eq(BomDetail::getBomInfoId, id));
|
|
|
List<BomDetailVo> bomDetailVoList = BeanUtil.copyToList(bomDetailList, BomDetailVo.class);
|
|
|
|
|
|
- DynamicDataSourceContextHolder.push(SourceConstant.ITEM);
|
|
|
productInfoService.attributeAssign(bomDetailVoList, BomDetailVo::getProductId, (item, productInfo) -> {
|
|
|
item.setProductCode(productInfo.getCode());
|
|
|
item.setProductName(productInfo.getName());
|
|
|
item.setProductUnit(productInfo.getUnit());
|
|
|
});
|
|
|
- DynamicDataSourceContextHolder.clear();
|
|
|
|
|
|
result.setBomDetailVoList(bomDetailVoList);
|
|
|
return result;
|