暂存

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/ICorpsDescClient.java

@@ -28,6 +28,7 @@ public interface ICorpsDescClient {
 	String GET_BY_CNAME = API_PREFIX + "get_by_name";
 	String LIST_BY_NAME = API_PREFIX + "/listCorpByName";
 	String LIST_BANK_BY_CORP_ID=API_PREFIX+"/listBankByCorpId";
+	String GET_CORPS_DESC= API_PREFIX + "/getCorpsDesc";
 
 	/**
 	 * 获取CorpsDesc列表
@@ -80,4 +81,12 @@ public interface ICorpsDescClient {
 	@GetMapping(LIST_BANK_BY_CORP_ID)
 	List<CorpsBank> listBankByCorpId (@RequestParam("corpsId") Long corpsId);
 
+	/**
+	 * 获取商品信息
+	 * @param corpsDesc
+	 * @return
+	 */
+	@GetMapping(GET_CORPS_DESC)
+	CorpsDesc getCorpsDesc(CorpsDesc corpsDesc);
+
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/feign/CorpsDescClient.java

@@ -1,6 +1,7 @@
 package org.springblade.client.corps.feign;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
@@ -15,6 +16,7 @@ import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -97,4 +99,11 @@ public class CorpsDescClient implements ICorpsDescClient {
 		bankLambdaQueryWrapper.eq(CorpsBank::getPid,corpsId);
 		return bankService.list(bankLambdaQueryWrapper);
 	}
+
+	@Override
+	public CorpsDesc getCorpsDesc(CorpsDesc corpsDesc) {
+		corpsDesc.setTenantId(SecureUtil.getTenantId());
+		corpsDesc.setIsDeleted(0);
+		return service.getOne(new QueryWrapper<CorpsDesc>().setEntity(corpsDesc));
+	}
 }

blade-service/blade-client/src/main/java/org/springblade/client/goods/excel/GoodsExcel.java

@@ -72,6 +72,8 @@ public class GoodsExcel implements Serializable {
 
 	@ExcelProperty("备注")
 	private String remarks;
+	@ExcelProperty("供应商")
+	private String CorpName;
 
 
 

blade-service/blade-client/src/main/java/org/springblade/client/goods/service/impl/GoodsDescServiceImpl.java

@@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springblade.client.entity.*;
+import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.goods.excel.GoodsExcel;
 import org.springblade.client.goods.mapper.*;
 import org.springblade.client.goods.service.IGoodsDescService;
@@ -38,6 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -53,18 +55,13 @@ import java.util.stream.Collectors;
 public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc> implements IGoodsDescService {
 	private GoodsTypeDescServiceImpl goodsTypeDescService;  //商品-商品类别对应表
 	private GoodsTypeServiceImpl goodsTypeService;//商品类别信息
-	@Autowired
-	private GoodsTypeMapper goodsTypeMapper;
-	@Autowired
-	private GoodsDescMapper goodsDescMapper;
-	@Autowired
-	private GoodsPriceMapper goodsPriceMapper;
-	@Autowired
-	private GoodsTypeDescMapper goodsTypeDescMapper;
-	@Autowired
-	private GoodsFilesMapper goodsFilesMapper;
-	@Autowired
-	private GoodsSpecificationMapper goodsSpecificationMapper;
+	private final GoodsTypeMapper goodsTypeMapper;
+	private final GoodsDescMapper goodsDescMapper;
+	private final GoodsPriceMapper goodsPriceMapper;
+	private final GoodsTypeDescMapper goodsTypeDescMapper;
+	private final GoodsFilesMapper goodsFilesMapper;
+	private final GoodsSpecificationMapper goodsSpecificationMapper;
+	private final ICorpsDescClient corpsDescClient;
 
 
 	@Override
@@ -368,6 +365,12 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 					goodsDesc.setRemarks(e.getRemarks());
 					goodsDesc.setType(0L);
 					goodsDesc.setGoodsTypeId(String.valueOf(goodsType.getId()));
+					//获取供应商
+					R<CorpsDesc> corpByName = corpsDescClient.getCorpByName(e.getCorpName(), SecureUtil.getTenantId());
+					if (corpByName.isSuccess() && corpByName.getData() != null){
+						goodsDesc.setCorpId(corpByName.getData().getId());
+						goodsDesc.setCorpName(corpByName.getData().getCname());
+					}
 					//如果名称相等 就认为重复
 					LambdaQueryWrapper<GoodsDesc> queryWrapper = new LambdaQueryWrapper<>();
 					queryWrapper.eq(GoodsDesc::getTenantId,AuthUtil.getTenantId());