From 5beed7e85abaa86c9833bdf82b0732e4149b991a Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Tue, 17 Oct 2023 12:35:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=93=81=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/IWarehouseTrayGoodsClient.java | 10 + .../DistributionParcelListController.java | 2 +- .../DistributionStockListController.java | 8 +- .../DistributionStockListInfoController.java | 8 +- .../excel/DistributionStockListExcel.java | 206 ++++++++++++------ .../mapper/DistributionParcelListMapper.xml | 1 + .../mapper/DistributionStockListMapper.java | 2 +- .../mapper/DistributionStockListMapper.xml | 2 +- .../IDistributionStockListInfoService.java | 3 +- .../IDistributionStockListService.java | 4 +- .../DistributionParcelListServiceImpl.java | 28 ++- .../DistributionStockArticleServiceImpl.java | 5 + .../DistributionStockListInfoServiceImpl.java | 10 +- .../DistributionStockListServiceImpl.java | 61 +++++- .../feign/WarehouseTrayGoodsClient.java | 19 ++ .../warehouse/mapper/TaskQuestMapper.xml | 6 +- .../warehouse/service/ITaskQuestService.java | 9 + .../service/impl/TaskQuestServiceImpl.java | 5 +- 18 files changed, 284 insertions(+), 105 deletions(-) diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java index 29886e418..49c399229 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java @@ -21,6 +21,7 @@ import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity; import org.springblade.common.constant.ModuleNameConstant; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -39,6 +40,7 @@ public interface IWarehouseTrayGoodsClient { String API_PREFIX = "warehousetraygoods/client"; String TOP = API_PREFIX + "/top10"; String GETTRAYIDLIST = API_PREFIX + "/trayIdList"; + String GETTRAYLIST = API_PREFIX + "/getTrayList"; /** * 通过主键删除 @@ -72,4 +74,12 @@ public interface IWarehouseTrayGoodsClient { @PostMapping(GETTRAYIDLIST) List getTrayIdList(@RequestParam String trayId,@RequestParam String trayBarCode); + /** + * 通过查询托盘上面的货物 + * + * @param warehouseTrayGoodsEntity + */ + @PostMapping(GETTRAYLIST) + List getTrayList(@RequestBody WarehouseTrayGoodsEntity warehouseTrayGoodsEntity); + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java index 564a4e90e..20e1edf2b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java @@ -181,7 +181,7 @@ public class DistributionParcelListController extends BladeController { distributionParcelListDTO.setId(Long.parseLong(i)); distributionParcelListDTO.setMaterialCode(materialOwnId.getProductCode()); distributionParcelListDTO.setMaterialName(materialOwnId.getName()); - distributionParcelListDTO.setMaterialUnit(DictBizCache.getValue(DictBizConstant.LOGPM_UNIT,materialOwnId.getLogpmUnit())); + distributionParcelListDTO.setMaterialUnit(materialOwnId.getLogpmUnit()); distributionParcelListDTO.setSku(materialOwnId.getSku()); distributionParcelListService.updateById(distributionParcelListDTO); }); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java index 1f52f00af..2a71277ed 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java @@ -198,12 +198,8 @@ public class DistributionStockListController extends BladeController { @ApiOperationSupport(order = 9) @ApiOperation(value = "导出数据", notes = "传入distributionStockList") public void exportDistributionStockList(@ApiIgnore @RequestParam Map distributionStockList, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionStockList, DistributionStockListEntity.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(DistributionStockList::getTenantId, bladeUser.getTenantId()); - //} - queryWrapper.lambda().eq(DistributionStockListEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = distributionStockListService.exportDistributionStockList(queryWrapper); + + List list = distributionStockListService.exportDistributionStockList(distributionStockList); ExcelUtil.export(response, "库存品管理数据" + DateUtil.time(), "库存品管理数据表", list, DistributionStockListExcel.class); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListInfoController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListInfoController.java index f4062319a..764956675 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListInfoController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListInfoController.java @@ -139,12 +139,8 @@ public class DistributionStockListInfoController extends BladeController { @ApiOperationSupport(order = 9) @ApiOperation(value = "导出数据", notes = "传入distributionStockListInfo") public void exportDistributionStockListInfo(@ApiIgnore @RequestParam Map distributionStockListInfo, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionStockListInfo, DistributionStockListInfoEntity.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(DistributionStockListInfo::getTenantId, bladeUser.getTenantId()); - //} - queryWrapper.lambda().eq(DistributionStockListInfoEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = distributionStockListInfoService.exportDistributionStockListInfo(queryWrapper); + + List list = distributionStockListInfoService.exportDistributionStockListInfo(distributionStockListInfo); ExcelUtil.export(response, "库存品明细数据" + DateUtil.time(), "库存品明细数据表", list, DistributionStockListInfoExcel.class); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockListExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockListExcel.java index d75c4917a..ba027d1d1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockListExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockListExcel.java @@ -41,124 +41,198 @@ public class DistributionStockListExcel implements Serializable { private static final long serialVersionUID = 1L; /** - * 租户号 + * 服务号 */ @ColumnWidth(20) - @ExcelProperty("租户号") - private String tenantId; + @ExcelProperty("服务号") + private String serviceNumber; /** - * 是否已删除 + * 服务类型 */ @ColumnWidth(20) - @ExcelProperty("是否已删除") - private Integer isDeleted; - /** - * 预留1 - */ - @ColumnWidth(20) - @ExcelProperty("预留1") - private String reserve1; - /** - * 预留2 - */ - @ColumnWidth(20) - @ExcelProperty("预留2") - private String reserve2; + @ExcelProperty("服务类型") + private String serviceTypeName; + /** - * 预留3 + * 服务类型 */ - @ColumnWidth(20) - @ExcelProperty("预留3") - private String reserve3; +// @ColumnWidth(20) +// @ExcelProperty("服务类型") +// private String serviceType; /** - * 预留4 + * 商场名称 */ @ColumnWidth(20) - @ExcelProperty("预留4") - private String reserve4; + @ExcelProperty("商场名称") + private String marketName; /** - * 预留5 + * 货物名称 */ @ColumnWidth(20) - @ExcelProperty("预留5") - private String reserve5; + @ExcelProperty("货物名称") + private String descriptionGoods; /** - * 订单自编号 + * 货物编码 */ @ColumnWidth(20) - @ExcelProperty("订单自编号") - private String orderSelfNumbering; + @ExcelProperty("货物编码") + private String cargoNumber; /** - * 入库批次号 + * 入库批次 */ @ColumnWidth(20) - @ExcelProperty("入库批次号") + @ExcelProperty("入库批次") private String incomingBatch; /** - * 货物名称 + * 库存数量 */ @ColumnWidth(20) - @ExcelProperty("货物名称") - private String descriptionGoods; + @ExcelProperty("库存数量") + private Integer quantityStock; /** - * 货物编号 + * 冻结数量 */ @ColumnWidth(20) - @ExcelProperty("货物编号") - private String cargoNumber; + @ExcelProperty("冻结数量") + private Integer quantityOccupied; /** - * 仓库 + * 出库数量 */ @ColumnWidth(20) - @ExcelProperty("仓库") - private String warehouse; + @ExcelProperty("出库数量") + private Integer outboundQuantity; /** - * 商场 + * 品牌 */ @ColumnWidth(20) - @ExcelProperty("商场") - private String market; + @ExcelProperty("品牌") + private String brandName; + /** - * 货物单位 + * 门店名称 */ @ColumnWidth(20) - @ExcelProperty("货物单位") - private String cargoUnit; + @ExcelProperty("门店名称") + private String storeName; /** - * 门店 + * 所在托盘 */ @ColumnWidth(20) - @ExcelProperty("门店") - private String shop; + @ExcelProperty("所在托盘") + private String trayCode; /** - * 库位信息 + * 仓库名称 */ @ColumnWidth(20) - @ExcelProperty("库位信息") - private String storageLocation; + @ExcelProperty("仓库名称") + private String warehouseName; + /** - * 商城名称 + * 物料单位 */ @ColumnWidth(20) - @ExcelProperty("商城名称") - private String mallName; + @ExcelProperty("物料单位") + private String cargoUnit; /** - * 库存数量 + * 包装数量 */ @ColumnWidth(20) - @ExcelProperty("库存数量") - private Integer quantityStock; + @ExcelProperty("包装数量") + private String packNum; /** - * 出库数量 + * 拆包数量 */ @ColumnWidth(20) - @ExcelProperty("出库数量") - private Integer outboundQuantity; + @ExcelProperty("拆包数量") + private Integer unpackingQuantity; /** - * 发运车次 + * 拆包状态 */ @ColumnWidth(20) - @ExcelProperty("发运车次") - private String despatch; + @ExcelProperty("拆包状态") + private String unpack; + + + + + +// /** +// * 订单自编号 +// */ +// @ColumnWidth(20) +// @ExcelProperty("订单自编号") +// private String orderSelfNumbering; +// /** +// * 入库批次号 +// */ +// @ColumnWidth(20) +// @ExcelProperty("入库批次号") +// private String incomingBatch; +// /** +// * 货物名称 +// */ +// @ColumnWidth(20) +// @ExcelProperty("货物名称") +// private String descriptionGoods; +// /** +// * 货物编号 +// */ +// @ColumnWidth(20) +// @ExcelProperty("货物编号") +// private String cargoNumber; +// /** +// * 仓库 +// */ +// @ColumnWidth(20) +// @ExcelProperty("仓库") +// private String warehouse; +// /** +// * 商场 +// */ +// @ColumnWidth(20) +// @ExcelProperty("商场") +// private String market; +// /** +// * 货物单位 +// */ +// @ColumnWidth(20) +// @ExcelProperty("货物单位") +// private String cargoUnit; +// /** +// * 门店 +// */ +// @ColumnWidth(20) +// @ExcelProperty("门店") +// private String shop; +// /** +// * 库位信息 +// */ +// @ColumnWidth(20) +// @ExcelProperty("库位信息") +// private String storageLocation; +// /** +// * 商城名称 +// */ +// @ColumnWidth(20) +// @ExcelProperty("商城名称") +// private String mallName; +// /** +// * 库存数量 +// */ +// @ColumnWidth(20) +// @ExcelProperty("库存数量") +// private Integer quantityStock; +// /** +// * 出库数量 +// */ +// @ColumnWidth(20) +// @ExcelProperty("出库数量") +// private Integer outboundQuantity; +// /** +// * 发运车次 +// */ +// @ColumnWidth(20) +// @ExcelProperty("发运车次") +// private String despatch; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index bf50681c7..a3d4b330d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -435,6 +435,7 @@ and ldpl.stock_article_id = #{param.stockArticleIdsLike} + and ldpl.stock_article_id = #{param.stockArticleId} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java index fb517a816..4fb031d6f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java @@ -56,7 +56,7 @@ public interface DistributionStockListMapper extends BaseMapper exportDistributionStockList(@Param("ew") Wrapper queryWrapper); + List exportDistributionStockList(@Param("ew") Wrapper queryWrapper); IPage pageOwn(IPage page,@Param("param") DistributionStockListEntity distributionStockListEntity); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml index 6d412c0d8..98e605506 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml @@ -94,7 +94,7 @@ - SELECT * FROM logpm_distribution_stock_list ${ew.customSqlSegment} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListInfoService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListInfoService.java index c5ee8fa40..7eae4c14e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListInfoService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListInfoService.java @@ -24,6 +24,7 @@ import com.logpm.distribution.vo.DistributionStockListInfoVO; import org.springblade.core.mp.base.BaseService; import java.util.List; +import java.util.Map; /** * 库存品明细 服务类 @@ -48,6 +49,6 @@ public interface IDistributionStockListInfoService extends BaseService exportDistributionStockListInfo(Wrapper queryWrapper); + List exportDistributionStockListInfo(Map distributionStockListInfo); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java index ba08da887..d9247b3a3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java @@ -57,10 +57,10 @@ public interface IDistributionStockListService extends BaseService exportDistributionStockList(Wrapper queryWrapper); + List exportDistributionStockList(Map distributionStockList); /** * 查询订单下的包件信息 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index cee4f39f6..2f9025402 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -227,6 +227,10 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl pageOweList(IPage page, Map distributionParcelList) { + Object o = distributionParcelList.get("parcelType"); + if(ObjectUtils.isNotNull(o)){ + distributionParcelList.remove("parcelType"); + } DistributionParcelListDTO distributionParcelListDTO = JSONObject.parseObject(JSONObject.toJSONString(distributionParcelList), DistributionParcelListDTO.class); if(Func.isNotEmpty(distributionParcelListDTO.getStockArticleIds())){ String trim = distributionParcelListDTO.getStockArticleIds().trim(); @@ -236,19 +240,23 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl list2 = distributionStockArticleMapper.selectListGrounding(list); - if(!list2.isEmpty()){ - boolean b = list2.stream().anyMatch(i -> i.getGroundingStatus().equals(OrderPackageGroundingStatusConstant.yishangjia.getValue())); - if(b){ - throw new ServiceException("选择的订单有上架的包件，请下架后在操作！"); - }else{ - boolean b1 = list2.stream().anyMatch(i -> ObjectUtils.isNotNull(i.getAssociationType())); - if(b1){ - throw new ServiceException("选择的订单在托盘上面有包件，请解托后在操作！"); + if(ObjectUtils.isNotNull(o) && String.valueOf(o).equals("2")){ + //查询包件上架状态 + //查询包件有没有上架，打托信息 + List list2 = distributionStockArticleMapper.selectListGrounding(list); + if(!list2.isEmpty()){ + boolean b = list2.stream().anyMatch(i -> i.getGroundingStatus().equals(OrderPackageGroundingStatusConstant.yishangjia.getValue())); + if(b){ + throw new ServiceException("选择的订单有上架的包件，请下架后在操作！"); + }else{ + boolean b1 = list2.stream().anyMatch(i -> ObjectUtils.isNotNull(i.getAssociationType())); + if(b1){ + throw new ServiceException("选择的订单在托盘上面有包件，请解托后在操作！"); + } } } } + } return baseMapper.pageOweList(page,distributionParcelListDTO); } 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 fb3e6af7c..dd1f9663f 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 @@ -139,6 +139,11 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl exportDistributionStockListInfo(Wrapper queryWrapper) { + public List exportDistributionStockListInfo(Map distributionStockListInfo) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionStockListInfo, DistributionStockListInfoEntity.class); + queryWrapper.lambda().eq(DistributionStockListInfoEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + + List distributionStockListInfoList = baseMapper.exportDistributionStockListInfo(queryWrapper); //distributionStockListInfoList.forEach(distributionStockListInfo -> { // distributionStockListInfo.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistributionStockListInfo.getType())); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java index cb3e12caa..04adecd85 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java @@ -18,6 +18,7 @@ package com.logpm.distribution.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -39,16 +40,23 @@ import com.logpm.distribution.service.IDistributionStockListService; import com.logpm.distribution.service.IDistributionUnpackingDetailsService; import com.logpm.distribution.vo.*; import com.logpm.distribution.vo.app.StockMallVO; +import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity; +import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.DictBizConstant; +import org.springblade.common.constant.DistributionTypeConstant; +import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.mp.support.Condition; 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; import org.springblade.system.cache.DictBizCache; +import org.springblade.system.cache.DictCache; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -80,6 +88,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl exportDistributionStockList(Wrapper queryWrapper) { - List distributionStockListList = baseMapper.exportDistributionStockList(queryWrapper); - //distributionStockListList.forEach(distributionStockList -> { - // distributionStockList.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistributionStockList.getType())); - //}); - return distributionStockListList; + public List exportDistributionStockList(Map distributionStockList) { + Object o = distributionStockList.get("row"); + Object ids = distributionStockList.get("ids"); + if(ObjectUtils.isNotNull(ids)){ + distributionStockList.remove("ids"); + } + + BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse(); + if(ObjectUtils.isNotNull(myCurrentWarehouse)){ + distributionStockList.put("warehouseId",myCurrentWarehouse.getId()); + }else{ + throw new ServiceException("请选择仓库，在进行导出数据！！！"); + } + QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionStockList, DistributionStockListEntity.class); + queryWrapper.lambda().eq(DistributionStockListEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + if(ObjectUtils.isNotNull(ids)){ + queryWrapper.in(ObjectUtils.isNotNull(ids),"id",String.valueOf(ids).split(",")); + } + List distributionStockListEntities = baseMapper.exportDistributionStockList(queryWrapper); + List excelList = new ArrayList<>(); + distributionStockListEntities.forEach(stockList -> { +// stockList.setServiceType(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, stockList.getServiceType())); + DistributionStockListExcel distributionStockListExcel = new DistributionStockListExcel(); + BeanUtil.copyProperties(stockList,distributionStockListExcel); + String value = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, stockList.getServiceType()); + distributionStockListExcel.setServiceTypeName(value); + distributionStockListExcel.setUnpack(stockList.getUnpack() ? "是":"否"); + //查询包装数量 + BasicMaterialEntity materialOwnId = basicMaterialClient.getMaterialOwnId(stockList.getMaterialId()); + if(ObjectUtils.isNotNull(materialOwnId)){ + distributionStockListExcel.setPackNum(materialOwnId.getPackageNum()); + } + //查询托盘信息 + WarehouseTrayGoodsEntity warehouseTrayGoodsEntity = new WarehouseTrayGoodsEntity(); + warehouseTrayGoodsEntity.setMarketId(stockList.getMarketId()); + warehouseTrayGoodsEntity.setWarehouseId(myCurrentWarehouse.getId()); + warehouseTrayGoodsEntity.setIncomingBatch(stockList.getIncomingBatch()); + warehouseTrayGoodsEntity.setAssociationId(stockList.getMaterialId()); + warehouseTrayGoodsEntity.setAssociationType("4"); + List trayList = warehouseTrayGoodsClient.getTrayList(warehouseTrayGoodsEntity); + if(!trayList.isEmpty()){ + distributionStockListExcel.setTrayCode(trayList.stream().map(WarehouseTrayGoodsEntity::getTrayCode).collect(Collectors.joining(","))); + } + excelList.add(distributionStockListExcel); + }); + return excelList; } @Override diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayGoodsClient.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayGoodsClient.java index 15fd2f0b0..53542f255 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayGoodsClient.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayGoodsClient.java @@ -2,6 +2,7 @@ package com.logpm.warehouse.feign; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity; import com.logpm.warehouse.service.IWarehouseTrayGoodsService; import com.logpm.warehouse.service.IWarehouseTrayTypeService; @@ -59,4 +60,22 @@ public class WarehouseTrayGoodsClient implements IWarehouseTrayGoodsClient { queryWrapper.eq("association_type","3"); return warehouseTrayGoodsService.list(queryWrapper); } + + /** + * 查询托盘信息 + * + * @param warehouseTrayGoodsEntity + * @return + */ + @Override + @PostMapping(GETTRAYLIST) + public List getTrayList(WarehouseTrayGoodsEntity warehouseTrayGoodsEntity) { + return warehouseTrayGoodsService.list(Wrappers.query().lambda() + .eq(ObjectUtils.isNotNull(warehouseTrayGoodsEntity.getAssociationId()),WarehouseTrayGoodsEntity:: getAssociationId,warehouseTrayGoodsEntity.getAssociationId()) + .eq(ObjectUtils.isNotNull(warehouseTrayGoodsEntity.getWarehouseId()),WarehouseTrayGoodsEntity:: getWarehouseId,warehouseTrayGoodsEntity.getWarehouseId()) + .eq(ObjectUtils.isNotNull(warehouseTrayGoodsEntity.getIncomingBatch()),WarehouseTrayGoodsEntity:: getIncomingBatch,warehouseTrayGoodsEntity.getIncomingBatch()) + .eq(ObjectUtils.isNotNull(warehouseTrayGoodsEntity.getMarketId()),WarehouseTrayGoodsEntity::getMarketId ,warehouseTrayGoodsEntity.getMarketId()) + .eq(ObjectUtils.isNotNull(warehouseTrayGoodsEntity.getAssociationType()),WarehouseTrayGoodsEntity::getAssociationType ,warehouseTrayGoodsEntity.getAssociationType()) + ); + } } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml index 58e6b488c..ec84df745 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml @@ -134,12 +134,12 @@