中心仓库存导出增加字段

blade-service-api/tire-center-warehouse-api/src/main/java/com/ecp/tire/center/warehouse/api/stock/vo/CenterStockExportExcelVo.java

@@ -21,6 +21,13 @@ public class CenterStockExportExcelVo implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
+
+	/**
+	 * 商品编码
+	 */
+	@ExcelProperty(value = "货主")
+	private String customerName;
+
 	/**
 	 * 商品编码
 	 */
@@ -55,6 +62,12 @@ public class CenterStockExportExcelVo implements Serializable {
 	private String productDescription;
 
 	/**
+	 * 商品类型名称
+	 */
+	@ExcelProperty(value = "商品类别")
+	private String goodsTypeName;
+
+	/**
 	 * 仓库/库区名称
 	 */
 	@ExcelProperty(value = "仓库")

blade-service/tire-center-warehouse/src/main/java/com/ecp/tire/center/warehouse/stock/controller/CenterStockDescController.java

@@ -12,6 +12,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.common.annotation.RepeatSubmit;
+import org.springblade.common.enums.CommonEnum;
 import org.springblade.common.enums.NumberEnum;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Query;
@@ -20,12 +21,19 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.salesPart.entity.PjCorpsDesc;
+import org.springblade.salesPart.entity.PjGoodsType;
+import org.springblade.salesPart.entity.PjGoodsTypeDesc;
+import org.springblade.salesPart.feign.IPJCorpClient;
+import org.springframework.beans.BeanUtils;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -41,6 +49,9 @@ public class CenterStockDescController {
 
 	private ICenterStockDescService centerStockDescService;
 
+	private IPJCorpClient corpClient;
+
+
 
 	@GetMapping("/list")
 	public R<IPage<CenterStockDescVo>> list(CenterStockDescVo centerStockDescVo, Query query) {
@@ -64,12 +75,24 @@ public class CenterStockDescController {
 			.eq(ObjectUtil.isNotEmpty(centerStockDescVo.getGoodsTypeId()), CenterStockDesc::getGoodsTypeId, centerStockDescVo.getGoodsTypeId())
 			.like(ObjectUtil.isNotEmpty(centerStockDescVo.getDot()), CenterStockDesc::getDot, centerStockDescVo.getDot())
 			.orderByAsc(CenterStockDesc::getCreateTime);
-		if ("0".equals(centerStockDescVo.getWhether())) {
+		if (CommonEnum.ZERO.info.equals(centerStockDescVo.getWhether())) {
 			lambdaQueryWrapper.ne(CenterStockDesc::getBalanceQuantity, NumberEnum.Zero.number);
 		}
 		lambdaQueryWrapper.like(StringUtils.hasText(centerStockDescVo.getCname()), CenterStockDesc::getCname, centerStockDescVo.getCname());
 		List<CenterStockDesc> list = centerStockDescService.list(lambdaQueryWrapper);
-		ExcelUtil.export(response, "库存信息", "库存信息", BeanUtil.copy(list, CenterStockExportExcelVo.class), CenterStockExportExcelVo.class);
+		List<CenterStockExportExcelVo> centerStockExportExcelVos = new ArrayList<>();
+		if (!CollectionUtils.isEmpty(list)) {
+			List<PjCorpsDesc> corpsDescList = corpClient.selectCorpListByCenter(user.getTenantId());
+			List<PjGoodsType> goodsTypeList = corpClient.selectGoodsTypeListByTenantId(user.getTenantId());
+			for (CenterStockDesc stockDesc : list) {
+				CenterStockExportExcelVo centerStockExportExcelVo = new CenterStockExportExcelVo();
+				BeanUtils.copyProperties(stockDesc, centerStockExportExcelVo);
+				centerStockExportExcelVo.setCustomerName(corpsDescList.stream().filter(corpsDesc -> corpsDesc.getId().equals(stockDesc.getCustomerId())).findFirst().map(PjCorpsDesc::getCname).orElse(""));
+				centerStockExportExcelVo.setGoodsTypeName(goodsTypeList.stream().filter(goodsType -> goodsType.getId().equals(stockDesc.getGoodsTypeId())).findFirst().map(PjGoodsType::getCname).orElse(""));
+				centerStockExportExcelVos.add(centerStockExportExcelVo);
+			}
+		}
+		ExcelUtil.export(response, "库存信息", "库存信息", centerStockExportExcelVos, CenterStockExportExcelVo.class);
 	}