2023年9月15日16:36:33

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjOrderItems.java

@@ -16,21 +16,18 @@
  */
 package org.springblade.salesPart.entity;
 
-import java.math.BigDecimal;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.springblade.core.secure.utils.AuthUtil;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
 /**
  * 配件销售采购明细实体类
  *
@@ -45,80 +42,81 @@ public class PjOrderItems implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	/**
-	* 主键
-	*/
-		@ApiModelProperty(value = "主键")
-		private Long id;
+	 * 主键
+	 */
+	@ApiModelProperty(value = "主键")
+	private Long id;
 	/**
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")
-	private String tenantId = AuthUtil.getTenantId();;
+	private String tenantId = AuthUtil.getTenantId();
+	;
 	/**
-	* 主表id
-	*/
-		@ApiModelProperty(value = "主表id")
-		private Long pid;
+	 * 主表id
+	 */
+	@ApiModelProperty(value = "主表id")
+	private Long pid;
 	/**
 	 * 来源单号
 	 */
 	@ApiModelProperty(value = "来源单号")
 	private String billNo;
 	/**
-	* 创建人
-	*/
-		@ApiModelProperty(value = "创建人")
-		private Long createUser;
-	/**
-	* 创建部门
-	*/
-		@ApiModelProperty(value = "创建部门")
-		private Long createDept;
-	/**
-	* 创建时间
-	*/
-		@ApiModelProperty(value = "创建时间")
-		private Date createTime;
-	/**
-	* 修改人
-	*/
-		@ApiModelProperty(value = "修改人")
-		private Long updateUser;
-	/**
-	* 修改时间
-	*/
-		@ApiModelProperty(value = "修改时间")
-		private Date updateTime;
-	/**
-	* 是否已删除（0 否 1是）
-	*/
-		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-		private Integer isDeleted;
-	/**
-	* 备注
-	*/
-		@ApiModelProperty(value = "备注")
-		private String remarks;
-	/**
-	* 订单状态
-	*/
-		@ApiModelProperty(value = "订单状态")
-		private String status;
-	/**
-	* 物料编号
-	*/
-		@ApiModelProperty(value = "物料编号")
-		private String goodsNo;
-	/**
-	* 商品名称
-	*/
-		@ApiModelProperty(value = "商品名称")
-		private String goodsName;
-	/**
-	* 商品id
-	*/
-		@ApiModelProperty(value = "商品id")
-		private Long goodsId;
+	 * 创建人
+	 */
+	@ApiModelProperty(value = "创建人")
+	private Long createUser;
+	/**
+	 * 创建部门
+	 */
+	@ApiModelProperty(value = "创建部门")
+	private Long createDept;
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 * 修改人
+	 */
+	@ApiModelProperty(value = "修改人")
+	private Long updateUser;
+	/**
+	 * 修改时间
+	 */
+	@ApiModelProperty(value = "修改时间")
+	private Date updateTime;
+	/**
+	 * 是否已删除（0 否 1是）
+	 */
+	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	private Integer isDeleted;
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty(value = "备注")
+	private String remarks;
+	/**
+	 * 订单状态
+	 */
+	@ApiModelProperty(value = "订单状态")
+	private String status;
+	/**
+	 * 物料编号
+	 */
+	@ApiModelProperty(value = "物料编号")
+	private String goodsNo;
+	/**
+	 * 商品名称
+	 */
+	@ApiModelProperty(value = "商品名称")
+	private String goodsName;
+	/**
+	 * 商品id
+	 */
+	@ApiModelProperty(value = "商品id")
+	private Long goodsId;
 
 	/**
 	 * 品牌id
@@ -127,71 +125,71 @@ public class PjOrderItems implements Serializable {
 	private Long brandId;
 
 	/**
-	* 品牌名称
-	*/
-		@ApiModelProperty(value = "品牌名称")
-		private String brandName;
+	 * 品牌名称
+	 */
+	@ApiModelProperty(value = "品牌名称")
+	private String brandName;
 
 	/**
-	* 规格型号
-	*/
-		@ApiModelProperty(value = "规格型号")
-		private String propertyName;
-	/**
-	* 花纹
-	*/
-		@ApiModelProperty(value = "花纹")
-		private String pattern;
-	/**
-	* 商品描述
-	*/
-		@ApiModelProperty(value = "商品描述")
-		private String goodsDescription;
-	/**
-	* 数量
-	*/
-		@ApiModelProperty(value = "数量")
-		private BigDecimal goodsNum;
-	/**
-	* 单位
-	*/
-		@ApiModelProperty(value = "单位")
-		private String units;
-	/**
-	* 价格
-	*/
-		@ApiModelProperty(value = "价格")
-		private BigDecimal price;
-	/**
-	* 小计
-	*/
-		@ApiModelProperty(value = "小计")
-		private BigDecimal subTotalMoney;
-	/**
-	* 成本价
-	*/
-		@ApiModelProperty(value = "成本价")
-		private BigDecimal costprie;
-	/**
-	* 利润
-	*/
-		@ApiModelProperty(value = "利润")
-		private BigDecimal profit;
-	/**
-	* 发货数
-	*/
-		@ApiModelProperty(value = "发货数")
-		private BigDecimal sendNum;
-	/**
-	* 批次号
-	*/
-		@ApiModelProperty(value = "批次号")
-		private String dot;
-	/**
-	* 单据类型
-	*/
-		@ApiModelProperty(value = "单据类型")
-		private String bizType;
+	 * 规格型号
+	 */
+	@ApiModelProperty(value = "规格型号")
+	private String propertyName;
+	/**
+	 * 花纹
+	 */
+	@ApiModelProperty(value = "花纹")
+	private String pattern;
+	/**
+	 * 商品描述
+	 */
+	@ApiModelProperty(value = "商品描述")
+	private String goodsDescription;
+	/**
+	 * 数量
+	 */
+	@ApiModelProperty(value = "数量")
+	private BigDecimal goodsNum;
+	/**
+	 * 单位
+	 */
+	@ApiModelProperty(value = "单位")
+	private String units;
+	/**
+	 * 价格
+	 */
+	@ApiModelProperty(value = "价格")
+	private BigDecimal price;
+	/**
+	 * 小计
+	 */
+	@ApiModelProperty(value = "小计")
+	private BigDecimal subTotalMoney;
+	/**
+	 * 成本价
+	 */
+	@ApiModelProperty(value = "成本价")
+	private BigDecimal costprie;
+	/**
+	 * 利润
+	 */
+	@ApiModelProperty(value = "利润")
+	private BigDecimal profit;
+	/**
+	 * 发货数
+	 */
+	@ApiModelProperty(value = "发货数")
+	private BigDecimal sendNum;
+	/**
+	 * 批次号
+	 */
+	@ApiModelProperty(value = "批次号")
+	private String dot;
+	/**
+	 * 单据类型
+	 */
+	@ApiModelProperty(value = "单据类型")
+	private String bizType;
 
 	/**
 	 * 所属公司id
@@ -252,5 +250,10 @@ public class PjOrderItems implements Serializable {
 	 */
 	@ApiModelProperty(value = "参考库存")
 	private BigDecimal inventory;
+	/**
+	 * 附件
+	 */
+	@TableField(exist = false)
+	private List<PjGoodsFiles> goodsFilesList;
 
 }

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjStockDesc.java

@@ -16,22 +16,18 @@
  */
 package org.springblade.salesPart.entity;
 
-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-import com.baomidou.mybatisplus.annotation.Version;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.springblade.core.secure.utils.AuthUtil;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
 /**
  * 配件批发库存表实体类
  *
@@ -46,60 +42,61 @@ public class PjStockDesc implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	/**
-	* 主键
-	*/
-		@ApiModelProperty(value = "主键")
-		private Long id;
+	 * 主键
+	 */
+	@ApiModelProperty(value = "主键")
+	private Long id;
 	/**
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")
-	private String tenantId = AuthUtil.getTenantId();;
-	/**
-	* 创建人
-	*/
-		@ApiModelProperty(value = "创建人")
-		private Long createUser;
-	/**
-	* 创建部门
-	*/
-		@ApiModelProperty(value = "创建部门")
-		private Long createDept;
-	/**
-	* 创建时间
-	*/
-		@ApiModelProperty(value = "创建时间")
-		private Date createTime;
-	/**
-	* 修改人
-	*/
-		@ApiModelProperty(value = "修改人")
-		private Long updateUser;
-	/**
-	* 修改时间
-	*/
-		@ApiModelProperty(value = "修改时间")
-		private Date updateTime;
-	/**
-	* 是否已删除（0 否 1是）
-	*/
-		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-		private Integer isDeleted;
-	/**
-	* 备注
-	*/
-		@ApiModelProperty(value = "备注")
-		private String remarks;
-	/**
-	* 订单状态
-	*/
-		@ApiModelProperty(value = "订单状态")
-		private String status;
-	/**
-	* 仓库/库区id
-	*/
-		@ApiModelProperty(value = "仓库/库区id")
-		private Long storageId;
+	private String tenantId = AuthUtil.getTenantId();
+	;
+	/**
+	 * 创建人
+	 */
+	@ApiModelProperty(value = "创建人")
+	private Long createUser;
+	/**
+	 * 创建部门
+	 */
+	@ApiModelProperty(value = "创建部门")
+	private Long createDept;
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 * 修改人
+	 */
+	@ApiModelProperty(value = "修改人")
+	private Long updateUser;
+	/**
+	 * 修改时间
+	 */
+	@ApiModelProperty(value = "修改时间")
+	private Date updateTime;
+	/**
+	 * 是否已删除（0 否 1是）
+	 */
+	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	private Integer isDeleted;
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty(value = "备注")
+	private String remarks;
+	/**
+	 * 订单状态
+	 */
+	@ApiModelProperty(value = "订单状态")
+	private String status;
+	/**
+	 * 仓库/库区id
+	 */
+	@ApiModelProperty(value = "仓库/库区id")
+	private Long storageId;
 
 	/**
 	 * 仓库/库区名称
@@ -108,25 +105,25 @@ public class PjStockDesc implements Serializable {
 	private String storageName;
 
 	/**
-	* 商品id
-	*/
-		@ApiModelProperty(value = "商品id")
-		private Long goodsId;
+	 * 商品id
+	 */
+	@ApiModelProperty(value = "商品id")
+	private Long goodsId;
 	/**
-	* 物料编号
-	*/
-		@ApiModelProperty(value = "物料编号")
-		private String code;
+	 * 物料编号
+	 */
+	@ApiModelProperty(value = "物料编号")
+	private String code;
 	/**
-	* 商品名称
-	*/
-		@ApiModelProperty(value = "商品名称")
-		private String cname;
+	 * 商品名称
+	 */
+	@ApiModelProperty(value = "商品名称")
+	private String cname;
 	/**
-	* 品牌id
-	*/
-		@ApiModelProperty(value = "品牌id")
-		private Long brandId;
+	 * 品牌id
+	 */
+	@ApiModelProperty(value = "品牌id")
+	private Long brandId;
 
 	/**
 	 * 品牌名称
@@ -135,25 +132,25 @@ public class PjStockDesc implements Serializable {
 	private String brandName;
 
 	/**
-	* 规格型号
-	*/
-		@ApiModelProperty(value = "规格型号")
-		private String typeno;
+	 * 规格型号
+	 */
+	@ApiModelProperty(value = "规格型号")
+	private String typeno;
 	/**
-	* 花纹
-	*/
-		@ApiModelProperty(value = "花纹")
-		private String brandItem;
+	 * 花纹
+	 */
+	@ApiModelProperty(value = "花纹")
+	private String brandItem;
 	/**
-	* 商品描述
-	*/
-		@ApiModelProperty(value = "商品描述")
-		private String productDescription;
+	 * 商品描述
+	 */
+	@ApiModelProperty(value = "商品描述")
+	private String productDescription;
 	/**
-	* 分类id
-	*/
-		@ApiModelProperty(value = "分类id")
-		private String goodsTypeId;
+	 * 分类id
+	 */
+	@ApiModelProperty(value = "分类id")
+	private String goodsTypeId;
 
 	/**
 	 * 分类id
@@ -161,15 +158,15 @@ public class PjStockDesc implements Serializable {
 	@ApiModelProperty(value = "分类")
 	private String goodsTypeName;
 	/**
-	* 结余数量
-	*/
-		@ApiModelProperty(value = "结余数量")
-		private BigDecimal balanceQuantity;
+	 * 结余数量
+	 */
+	@ApiModelProperty(value = "结余数量")
+	private BigDecimal balanceQuantity;
 	/**
-	* 所属公司id
-	*/
-		@ApiModelProperty(value = "所属公司id")
-		private Long salesCompanyId;
+	 * 所属公司id
+	 */
+	@ApiModelProperty(value = "所属公司id")
+	private Long salesCompanyId;
 
 	/**
 	 * 所属公司id
@@ -177,10 +174,10 @@ public class PjStockDesc implements Serializable {
 	@TableField(exist = false)
 	private String salesCompanyIds;
 	/**
-	* 所属公司名称
-	*/
-		@ApiModelProperty(value = "所属公司名称")
-		private String salesCompanyName;
+	 * 所属公司名称
+	 */
+	@ApiModelProperty(value = "所属公司名称")
+	private String salesCompanyName;
 
 	/**
 	 * 批次号
@@ -226,5 +223,10 @@ public class PjStockDesc implements Serializable {
 	 */
 	@TableField(exist = false)
 	private String whether;
+	/**
+	 * 附件
+	 */
+	@TableField(exist = false)
+	private List<PjGoodsFiles> goodsFilesList;
 
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/controller/OrderController.java

@@ -697,8 +697,8 @@ public class OrderController extends BladeController {
 		Map<String, Object> map = new HashMap<>();
 		LambdaQueryWrapper<PjOrder> lambdaQueryWrapperXS = new LambdaQueryWrapper<PjOrder>().eq(PjOrder::getIsDeleted, 0)
 			.eq(PjOrder::getTenantId, AuthUtil.getTenantId())
-			.gt(ObjectUtils.isNotNull(statusDate), PjOrder::getBusinesDate, statusDate)
-			.lt(ObjectUtils.isNotNull(endDate), PjOrder::getBusinesDate, endDate)
+			.ge(ObjectUtils.isNotNull(statusDate), PjOrder::getBusinesDate, statusDate)
+			.le(ObjectUtils.isNotNull(endDate), PjOrder::getBusinesDate, endDate)
 			.eq(PjOrder::getBsType, "XS");
 		if (AuthUtil.getUserRole().contains("业务员")) {
 			lambdaQueryWrapperXS.gt(PjOrder::getSalerId, AuthUtil.getTenantId());
@@ -706,8 +706,8 @@ public class OrderController extends BladeController {
 		List<PjOrder> pjOrderListXS = orderService.list(lambdaQueryWrapperXS);
 		List<PjOrder> pjOrderListCG = orderService.list(new LambdaQueryWrapper<PjOrder>().eq(PjOrder::getIsDeleted, 0)
 			.eq(PjOrder::getTenantId, AuthUtil.getTenantId())
-			.gt(ObjectUtils.isNotNull(statusDate), PjOrder::getBusinesDate, statusDate)
-			.lt(ObjectUtils.isNotNull(endDate), PjOrder::getBusinesDate, endDate)
+			.ge(ObjectUtils.isNotNull(statusDate), PjOrder::getBusinesDate, statusDate)
+			.le(ObjectUtils.isNotNull(endDate), PjOrder::getBusinesDate, endDate)
 			.eq(PjOrder::getBsType, "CG"));
 		//销售
 		BigDecimal income = new BigDecimal("0.00");

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -37,6 +37,7 @@ import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.pay.tonglianPayment.entity.WechatMark;
 import org.springblade.pay.tonglianPayment.fegin.IPaymentClient;
+import org.springblade.salesPart.brand.service.IBrandFilesService;
 import org.springblade.salesPart.check.dto.PjAuditProecessDTO;
 import org.springblade.salesPart.check.entity.PjAuditPathsActs;
 import org.springblade.salesPart.check.entity.PjAuditPathsLevels;
@@ -48,6 +49,7 @@ import org.springblade.salesPart.entity.*;
 import org.springblade.salesPart.enums.OrderTypeEnum;
 import org.springblade.salesPart.excel.PjOrderStatisticsExcel;
 import org.springblade.salesPart.goods.mapper.GoodsDescMapper;
+import org.springblade.salesPart.goods.service.IGoodsFilesService;
 import org.springblade.salesPart.history.mapper.HistoryMapper;
 import org.springblade.salesPart.order.mapper.OrderItemsMapper;
 import org.springblade.salesPart.order.mapper.OrderMapper;
@@ -123,6 +125,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 
 	private final IAuditProecessService auditProecessService;
 
+	private final IGoodsFilesService goodsFilesService;
+	private final IBrandFilesService brandFilesService;
+
 	/**
 	 * 获取销售订单详情
 	 *
@@ -138,7 +143,24 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		itemsLambdaQueryWrapper.eq(PjOrderItems::getTenantId, AuthUtil.getTenantId())
 			.eq(PjOrderItems::getIsDeleted, 0)
 			.eq(PjOrderItems::getPid, detail.getId());
-		detail.setOrderItemsList(orderItemsMapper.selectList(itemsLambdaQueryWrapper));
+		List<PjOrderItems> list = orderItemsMapper.selectList(itemsLambdaQueryWrapper);
+		for (PjOrderItems item : list) {
+			List<PjGoodsFiles> goodsFilesList = new ArrayList<>();
+			goodsFilesList = goodsFilesService.list(new LambdaQueryWrapper<PjGoodsFiles>()
+				.eq(PjGoodsFiles::getMainImage, 0)
+				.eq(PjGoodsFiles::getPid, item.getId())
+				.eq(PjGoodsFiles::getTenantId, AuthUtil.getTenantId())
+				.eq(PjGoodsFiles::getIsDeleted, 0));
+			if (goodsFilesList.size() == 0 && ObjectUtils.isNotNull(item.getBrandId())) {
+				goodsFilesList = BeanUtil.copy(brandFilesService.list(new LambdaQueryWrapper<PjBrandFiles>()
+					.eq(PjBrandFiles::getMainImage, 0)
+					.eq(PjBrandFiles::getPid, item.getBrandId())
+					.eq(PjBrandFiles::getTenantId, AuthUtil.getTenantId())
+					.eq(PjBrandFiles::getIsDeleted, 0)), PjGoodsFiles.class);
+			}
+			item.setGoodsFilesList(goodsFilesList);
+		}
+		detail.setOrderItemsList(list);
 
 		//获得支付记录
 		List<WechatMark> wechatMarkList = new ArrayList<>();
@@ -268,9 +290,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 			LocalDate lastDay = yearMonth.atEndOfMonth();
 			Map<String, BigDecimal> sum = new HashMap<>();
 			if (!AuthUtil.getUserRole().contains("admin")) {
-				sum = baseMapper.columnar(firstDay, lastDay, AuthUtil.getTenantId(),Long.parseLong(AuthUtil.getDeptId()));
-			}else{
-				sum = baseMapper.columnar(firstDay, lastDay, AuthUtil.getTenantId(),null);
+				sum = baseMapper.columnar(firstDay, lastDay, AuthUtil.getTenantId(), Long.parseLong(AuthUtil.getDeptId()));
+			} else {
+				sum = baseMapper.columnar(firstDay, lastDay, AuthUtil.getTenantId(), null);
 
 			}
 			number.add(sum.get("goodsTotalNum"));

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/productLaunch/controller/ProductLaunchController.java

@@ -132,6 +132,13 @@ public class ProductLaunchController extends BladeController {
 				item.setSharedCompany(deptName);
 			}
 			item.setFilesList(productLaunchFilesService.list(new QueryWrapper<PjProductLaunchFiles>().eq("pid", item.getId()).eq("is_deleted", 0).eq("main_image", 0)));
+			if (item.getFilesList().size() == 0 && ObjectUtils.isNotNull(item.getBrandId())) {
+				item.setFilesList(BeanUtil.copy(brandFilesService.list(new LambdaQueryWrapper<PjBrandFiles>()
+					.eq(PjBrandFiles::getMainImage, 0)
+					.eq(PjBrandFiles::getPid, item.getBrandId())
+					.eq(PjBrandFiles::getTenantId, AuthUtil.getTenantId())
+					.eq(PjBrandFiles::getIsDeleted, 0)), PjProductLaunchFiles.class));
+			}
 		}
 		return R.data(pages);
 	}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/stock/controller/StockDescController.java

@@ -33,9 +33,13 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.salesPart.brand.service.IBrandFilesService;
+import org.springblade.salesPart.entity.PjBrandFiles;
+import org.springblade.salesPart.entity.PjGoodsFiles;
 import org.springblade.salesPart.entity.PjProductLaunch;
 import org.springblade.salesPart.entity.PjStockDesc;
 import org.springblade.salesPart.excel.StockExportExcel;
+import org.springblade.salesPart.goods.service.IGoodsFilesService;
 import org.springblade.salesPart.productLaunch.service.IProductLaunchService;
 import org.springblade.salesPart.stock.service.IStockDescService;
 import org.springblade.salesPart.vo.StockDescVO;
@@ -43,6 +47,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -60,6 +65,8 @@ public class StockDescController extends BladeController {
 
 	private final IStockDescService stockDescService;
 	private final IProductLaunchService productLaunchService;
+	private final IGoodsFilesService goodsFilesService;
+	private final IBrandFilesService brandFilesService;
 
 	/**
 	 * 详情
@@ -95,7 +102,22 @@ public class StockDescController extends BladeController {
 			lambdaQueryWrapper.ne(PjStockDesc::getStoreInventory, 0);
 		}
 		IPage<PjStockDesc> pages = stockDescService.page(Condition.getPage(query), lambdaQueryWrapper);
-
+		for (PjStockDesc item:pages.getRecords()) {
+			List<PjGoodsFiles> goodsFilesList = new ArrayList<>();
+			goodsFilesList = goodsFilesService.list(new LambdaQueryWrapper<PjGoodsFiles>()
+				.eq(PjGoodsFiles::getMainImage, 0)
+				.eq(PjGoodsFiles::getPid, item.getId())
+				.eq(PjGoodsFiles::getTenantId, AuthUtil.getTenantId())
+				.eq(PjGoodsFiles::getIsDeleted, 0));
+			if (goodsFilesList.size() == 0 && ObjectUtils.isNotNull(item.getBrandId())) {
+				goodsFilesList = BeanUtil.copy(brandFilesService.list(new LambdaQueryWrapper<PjBrandFiles>()
+					.eq(PjBrandFiles::getMainImage, 0)
+					.eq(PjBrandFiles::getPid, item.getBrandId())
+					.eq(PjBrandFiles::getTenantId, AuthUtil.getTenantId())
+					.eq(PjBrandFiles::getIsDeleted, 0)), PjGoodsFiles.class);
+			}
+			item.setGoodsFilesList(goodsFilesList);
+		}
 		return R.data(pages);
 	}