From 74ca7ecc28f92eba8f793ce573c8e9c154159a78 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Tue, 24 Oct 2023 19:18:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionStockArticleController.java | 13 +--- .../excel/DistributionStockArticleExcel.java | 67 +++++-------------- .../DistributionStockArticleMapper.java | 2 +- .../mapper/DistributionStockArticleMapper.xml | 2 +- .../IDistributionStockArticleService.java | 7 +- .../DistributionStockArticleServiceImpl.java | 56 +++++++++++++--- 6 files changed, 66 insertions(+), 81 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java index 03f76f312..643eb04bf 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java @@ -16,10 +16,8 @@ */ package com.logpm.distribution.controller; -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 com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; @@ -38,7 +36,6 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.common.utils.CommonUtil; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.mp.support.Condition; @@ -48,7 +45,6 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; -import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.system.feign.IDictBizClient; import org.springblade.system.feign.IUserClient; import org.springframework.web.bind.annotation.*; @@ -60,7 +56,6 @@ import javax.validation.Valid; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; /** * 配送在库订单 控制器 @@ -353,12 +348,8 @@ public class DistributionStockArticleController extends BladeController { @ApiOperationSupport(order = 9) @ApiOperation(value = "导出数据", notes = "传入distributionStockArticle") public void exportDistributionStockArticle(@ApiIgnore @RequestParam Map distributionStockArticle, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionStockArticle, DistributionStockArticleEntity.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(DistributionStockArticle::getTenantId, bladeUser.getTenantId()); - //} - queryWrapper.lambda().eq(DistributionStockArticleEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = distributionStockArticleService.exportDistributionStockArticle(queryWrapper); + + List list = distributionStockArticleService.exportDistributionStockArticle(distributionStockArticle); ExcelUtil.export(response, "配送在库订单数据" + DateUtil.time(), "配送在库订单数据表", list, DistributionStockArticleExcel.class); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockArticleExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockArticleExcel.java index 2438c4892..986231616 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockArticleExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockArticleExcel.java @@ -40,49 +40,6 @@ import java.util.Date; public class DistributionStockArticleExcel implements Serializable { private static final long serialVersionUID = 1L; - - /** - * 租户号 - */ - @ColumnWidth(20) - @ExcelProperty("租户号") - private String tenantId; - /** - * 是否已删除 - */ - @ColumnWidth(20) - @ExcelProperty("是否已删除") - private Integer isDeleted; - /** - * 预留1 - */ - @ColumnWidth(20) - @ExcelProperty("预留1") - private String reserve1; - /** - * 预留2 - */ - @ColumnWidth(20) - @ExcelProperty("预留2") - private String reserve2; - /** - * 预留3 - */ - @ColumnWidth(20) - @ExcelProperty("预留3") - private String reserve3; - /** - * 预留4 - */ - @ColumnWidth(20) - @ExcelProperty("预留4") - private String reserve4; - /** - * 预留5 - */ - @ColumnWidth(20) - @ExcelProperty("预留5") - private String reserve5; /** * 服务号 */ @@ -94,7 +51,7 @@ public class DistributionStockArticleExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("订单自编号") - private String orderSelfNumbering; + private String orderCode; /** * 商场名称 */ @@ -130,7 +87,7 @@ public class DistributionStockArticleExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("在库时间") - private Date storeTime; + private String storeTime; /** * 订单总件数 */ @@ -148,7 +105,7 @@ public class DistributionStockArticleExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("是否齐套") - private Integer completeSet; + private String completeSet; /** * 品牌 */ @@ -198,16 +155,22 @@ public class DistributionStockArticleExcel implements Serializable { @ExcelProperty("收货单位") private String consigneeUnit; /** - * 类型;1 预约单 2库存单 + * 订单来源 */ @ColumnWidth(20) - @ExcelProperty("类型;1 预约单 2库存单") - private Integer genre; + @ExcelProperty("订单来源") + private String resource; + /** + * 类型;1 预约单 2库存单 + */ +// @ColumnWidth(20) +// @ExcelProperty("类型;1 预约单 2库存单") +// private Integer genre; /** * 状态;1 配送 2 待配送 */ - @ColumnWidth(20) - @ExcelProperty("状态;1 配送 2 待配送") - private Integer state; +// @ColumnWidth(20) +// @ExcelProperty("状态;1 配送 2 待配送") +// private Integer state; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java index 50ff86326..4f6e94134 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java @@ -58,7 +58,7 @@ public interface DistributionStockArticleMapper extends BaseMapper exportDistributionStockArticle(@Param("ew") Wrapper queryWrapper); + List exportDistributionStockArticle(@Param("ew") Wrapper queryWrapper); void addHandQuantity(@Param("id") Long id,@Param("num") int num); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index e9b8a828a..d348d80a5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -56,7 +56,7 @@ - SELECT * FROM logpm_distribution_stock_article ${ew.customSqlSegment} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java index db9243e33..e73bf224a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java @@ -16,8 +16,6 @@ */ package com.logpm.distribution.service; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.dto.DistributionStockArticleDTO; import com.logpm.distribution.dto.app.queryOrderDTO; @@ -56,10 +54,9 @@ public interface IDistributionStockArticleService extends BaseService exportDistributionStockArticle(Wrapper queryWrapper); + List exportDistributionStockArticle(Map distributionStockArticle); Boolean saveStock(String ids); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index c719a8e2e..97890883c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -16,9 +16,7 @@ */ package com.logpm.distribution.service.impl; -import cn.hutool.core.util.ArrayUtil; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -62,6 +60,7 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.ObjectUtil; @@ -132,14 +131,49 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl exportDistributionStockArticle(Wrapper queryWrapper) { - List distributionStockArticleList = baseMapper.exportDistributionStockArticle(queryWrapper); - //distributionStockArticleList.forEach(distributionStockArticle -> { - // distributionStockArticle.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistributionStockArticle.getType())); - //}); - return distributionStockArticleList; + public List exportDistributionStockArticle(Map distributionStockArticle) { + + Object o = distributionStockArticle.get("ids"); + if(ObjectUtils.isNotNull(o)){ + distributionStockArticle.remove("ids"); + } + + + QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionStockArticle, DistributionStockArticleEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(DistributionStockArticle::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(DistributionStockArticleEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + if(ObjectUtils.isNotNull(o)){ + queryWrapper.in("id",String.valueOf(o).split(",")); + } + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(ObjectUtils.isNull(myCurrentWarehouse)){ + throw new ServiceException("没有仓库信息！"); + } + queryWrapper.eq("warehouse_id",myCurrentWarehouse.getId()); + queryWrapper.apply("order_status != 70"); + List list = baseMapper.exportDistributionStockArticle(queryWrapper); + List listExcel = new ArrayList<>(); + list.forEach(s -> { +// distributionStockArticle.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistributionStockArticle.getType())); + DistributionStockArticleExcel stockArticleExcel = new DistributionStockArticleExcel(); + BasicdataWarehouseEntity entityWarehouse = warehouseClient.getEntityWarehouseId(s.getWarehouseId()); + BeanUtil.copyProperties(s,stockArticleExcel); + stockArticleExcel.setWarehouseCode(entityWarehouse.getWarehouseCode()); + String s1 = s.getCompleteSet().equals("1") ? "否" : "是"; + stockArticleExcel.setCompleteSet(s1); + String value = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, s.getTypeService()); + stockArticleExcel.setTypeService(value); + listExcel.add(stockArticleExcel); + }); + return listExcel; } /** @@ -1013,7 +1047,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl