|
|
@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.poi.ss.formula.functions.T;
|
|
|
+import org.springblade.client.entity.StorageDesc;
|
|
|
+import org.springblade.client.feign.IStorageClient;
|
|
|
import org.springblade.core.mp.support.Condition;
|
|
|
import org.springblade.core.secure.utils.AuthUtil;
|
|
|
import org.springblade.core.secure.utils.SecureUtil;
|
|
|
@@ -36,6 +38,8 @@ public class StockGoodsClient implements IStockGoodsClient{
|
|
|
|
|
|
private IStockGoodsService stockGoodsService;//库存
|
|
|
|
|
|
+ private IStorageClient iStorageClient;
|
|
|
+
|
|
|
/**
|
|
|
* 查询库存总账 是否存在
|
|
|
* @param corpId 客户id
|
|
|
@@ -144,6 +148,19 @@ public class StockGoodsClient implements IStockGoodsClient{
|
|
|
List<StockGoods> goodsList = stockGoodsService.list(stockGoodsLambdaQueryWrapper);
|
|
|
if(CollectionUtils.isNotEmpty(goodsList))
|
|
|
{
|
|
|
+ goodsList.forEach(e->{
|
|
|
+ //获取仓库信息
|
|
|
+ if (e.getStorageId() != null){
|
|
|
+ //仓库信息
|
|
|
+ StorageDesc storageDesc = iStorageClient.findById(e.getStorageId());
|
|
|
+ if(storageDesc!=null)
|
|
|
+ {
|
|
|
+ e.setStockName(storageDesc.getCname());
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
return goodsList;
|
|
|
}
|
|
|
else
|