diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erpspu/SmErpSpuStockExcel.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erpspu/SmErpSpuStockExcel.java new file mode 100644 index 000000000..e698cb134 --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erpspu/SmErpSpuStockExcel.java @@ -0,0 +1,80 @@ +package com.bsd.pjcloud.supermarket.vo.erpspu; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.bsd.pjcloud.common.core.util.MoneyDeserializer; +import com.bsd.pjcloud.common.core.util.MoneySerializer; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class SmErpSpuStockExcel implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 货号 + */ + @Schema(description="货号") + @ExcelProperty("货号") + private String productCode; + + /** + * 商品名称 + */ + @Schema(description="商品名称") + @ExcelProperty("商品名称") + private String productName; + + + /** + * 库存 + */ + @Schema(description="库存") + @ExcelProperty("库存") + private Double stock; + + + /** + * 单位 + */ + @Schema(description="单位") + @ExcelProperty("单位") + private String unit; + + + /** + * 条码 + */ + @Schema(description="条码") + @ExcelProperty("条码") + private String barCode; + + /** + * 规格 + */ + @Schema(description="规格") + @ExcelProperty("规格") + private String spec; + + + /** + * 内装数量 + */ + @Schema(description="内装") + @ExcelProperty("内装") + private Integer packageNum; + + + /** + * 零售价/单位分 + */ + @Schema(description="零售价/单位分") + @ExcelProperty("零售价/元") + private Double retailPrice; + + +} diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java index a696b78e9..164295a08 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java @@ -25,6 +25,7 @@ import com.bsd.pjcloud.supermarket.service.*; import com.bsd.pjcloud.supermarket.vo.ad.SmErpSpuDetailsVo; import com.bsd.pjcloud.supermarket.vo.ad.SpuVo; import com.bsd.pjcloud.supermarket.vo.erpspu.SmErpSpuSimpleVo; +import com.bsd.pjcloud.supermarket.vo.erpspu.SmErpSpuStockExcel; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Qualifier; @@ -188,8 +189,8 @@ public class SmErpSpuController { @ResponseExcel @GetMapping("/export") @PreAuthorize("@pms.hasPermission('supermarket_supermarketSpu_export')" ) - public List export(SmErpSpuEntity supermarketSpu, Long[] ids) { - return smErpSpuService.list(Wrappers.lambdaQuery(supermarketSpu).in(ArrayUtil.isNotEmpty(ids), SmErpSpuEntity::getId, ids)); + public List export(SmErpSpuEntity supermarketSpu, Long[] ids) { + return smErpSpuService.exportSupermarketSpuStockExcel(supermarketSpu, ids); } diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpSpuMapper.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpSpuMapper.java index 7848bc318..5d7c0c7be 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpSpuMapper.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpSpuMapper.java @@ -7,6 +7,7 @@ import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; import com.bsd.pjcloud.supermarket.dto.SupermarketSpuQueryDTO; import com.bsd.pjcloud.supermarket.entity.SmErpSpuEntity; import com.bsd.pjcloud.supermarket.vo.ad.SpuVo; +import com.bsd.pjcloud.supermarket.vo.erpspu.SmErpSpuStockExcel; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springdoc.core.annotations.ParameterObject; @@ -43,4 +44,7 @@ public interface SmErpSpuMapper extends PjcloudBaseMapper { Page selectListAllScope(@ParameterObject Page page, @Param("supermarketSpuQueryDTO") SupermarketSpuQueryDTO supermarketSpuQueryDTO , DataScope dataScope); + + + List exportSupermarketSpuStockExcel(@Param("supermarketSpu") SmErpSpuEntity supermarketSpu, @Param("ids") Long[] ids,DataScope dataScope); } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java index 2e21954d7..348006929 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java @@ -14,6 +14,7 @@ import com.bsd.pjcloud.supermarket.entity.SmErpSpuEntity; import com.bsd.pjcloud.supermarket.vo.ad.SmErpSpuDetailsVo; import com.bsd.pjcloud.supermarket.vo.ad.SpuVo; import com.bsd.pjcloud.supermarket.vo.cgplan.ErpSpuWithUnitPageVo; +import com.bsd.pjcloud.supermarket.vo.erpspu.SmErpSpuStockExcel; import com.bsd.pjcloud.supermarket.vo.sm.smspu.SmErpPageScopeVo; import org.springdoc.core.annotations.ParameterObject; import org.springframework.validation.BindingResult; @@ -111,6 +112,13 @@ public interface SmErpSpuService extends IService { R importErpSpu(List smErpSupplierImportDtos, BindingResult bindingResult); + /** + * 导出 + * @param supermarketSpu + * @param ids + * @return + */ + List exportSupermarketSpuStockExcel(SmErpSpuEntity supermarketSpu, Long[] ids); // R calculateCostPrice(); diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java index 39d39d014..192f86cbe 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java @@ -32,6 +32,7 @@ import com.bsd.pjcloud.supermarket.vo.ad.SmErpSpuDetailsVo; import com.bsd.pjcloud.supermarket.vo.ad.SmErpUnitVo; import com.bsd.pjcloud.supermarket.vo.cgplan.ErpSpuWithUnitPageVo; import com.bsd.pjcloud.supermarket.vo.cgplan.ErpUnitVo; +import com.bsd.pjcloud.supermarket.vo.erpspu.SmErpSpuStockExcel; import com.bsd.pjcloud.supermarket.vo.sm.smspu.SmErpPageScopeVo; import com.bsd.pjcloud.wallet.api.feign.RemoteMchService; import com.bsd.pjcloud.wallet.api.vo.MchManageVo; @@ -905,6 +906,11 @@ public class SmErpSpuServiceImpl extends ServiceImpl exportSupermarketSpuStockExcel(SmErpSpuEntity supermarketSpu, Long[] ids) { + return baseMapper.exportSupermarketSpuStockExcel(supermarketSpu, ids,DataScope.of()); + } + /** * 解析供应商ID(存在则返回,不存在则创建) * diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml index 8b42c0ea2..c7450bda8 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml @@ -98,4 +98,37 @@ ORDER BY es.sort DESC,es.id DESC + \ No newline at end of file