From 650b3f3bb97f462b8ee79ea9c4989c8cc168c0ec Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Wed, 30 Aug 2023 11:06:11 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BB=93=E5=BA=93=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/IBasicdataWarehouseClient.java | 17 +++++++++ .../BasicdataGoodsAreaController.java | 11 ++++++ .../BasicdataGoodsShelfController.java | 11 ++++++ .../BasicdataWarehouseController.java | 13 +++---- .../feign/BasicdataWarehouseClient.java | 13 +++++++ .../mapper/BasicdataGoodsAllocationMapper.xml | 6 +++ .../mapper/BasicdataGoodsAreaMapper.xml | 6 +++ .../mapper/BasicdataGoodsShelfMapper.xml | 6 +++ .../basicdata/mapper/BasicdataTrayMapper.xml | 6 +++ .../mapper/BasicdataWarehouseMapper.java | 2 +- .../mapper/BasicdataWarehouseMapper.xml | 2 +- .../service/IBasicdataWarehouseService.java | 10 ++++- .../BasicdataGoodsAllocationServiceImpl.java | 37 +++++++++++++++++++ .../impl/BasicdataGoodsAreaServiceImpl.java | 13 +++---- .../impl/BasicdataGoodsShelfServiceImpl.java | 22 ++++++++--- .../impl/BasicdataTrayServiceImpl.java | 7 ++++ .../impl/BasicdataWarehouseServiceImpl.java | 34 ++++++++++++++++- .../DistributionDeliveryListServiceImpl.java | 2 +- .../WarehouseGoodsAllocationMapper.java | 3 ++ .../mapper/WarehouseGoodsAllocationMapper.xml | 6 +++ .../WarehouseGoodsAllocationServiceImpl.java | 26 +++++++++---- 21 files changed, 219 insertions(+), 34 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java index 166c160cf..604e24882 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java @@ -21,6 +21,7 @@ import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.vo.BasicdataWarehouseVO; import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.mp.support.BladePage; +import org.springblade.core.tool.api.R; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -102,6 +103,22 @@ public interface IBasicdataWarehouseClient { BasicdataWarehouseEntity getMyCurrentWarehouse(); + /** + * 获取当前登录人的能查看的仓库 + * @return + */ + @GetMapping(API_PREFIX+"/getMyWatchWarehouse") + List getMyWatchWarehouse(); + + + /** + * 清除当前登录人仓库缓存 + * @return + */ + @GetMapping(API_PREFIX+"/clearWarehouseCache") + R clearWarehouseCache(); + + @GetMapping(API_PREFIX+"/getEntityWarehouseId") diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java index ba12b37fb..5a3b01e98 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java @@ -17,7 +17,9 @@ package com.logpm.basicdata.controller; import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity; +import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.excel.BasicdataGoodsAreaExcel; +import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.basicdata.service.IBasicdataGoodsAreaService; import com.logpm.basicdata.vo.BasicdataGoodsAreaVO; import com.logpm.basicdata.vo.BasicdataNodeVO; @@ -46,6 +48,7 @@ import org.springblade.core.tool.constant.BladeConstant; import springfox.documentation.annotations.ApiIgnore; import java.util.Map; import java.util.List; +import java.util.Objects; import javax.servlet.http.HttpServletResponse; /** @@ -63,6 +66,8 @@ public class BasicdataGoodsAreaController extends BladeController { private final IBasicdataGoodsAreaService basicdataGoodsAreaService; + private final IBasicdataWarehouseClient basicdataWarehouseClient; + /** * 货区 详情 */ @@ -116,6 +121,12 @@ public class BasicdataGoodsAreaController extends BladeController { @ApiOperationSupport(order = 4) @ApiOperation(value = "新增", notes = "传入warehouseGoodsArea") public R save(@Valid @RequestBody BasicdataGoodsAreaEntity basicdataGoodsAreaEntity) { + //获取当前登录人仓库 + BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getMyCurrentWarehouse(); + if (Objects.isNull(basicdataWarehouseEntity)){ + return R.fail("无选择仓库,无法新增"); + } + basicdataGoodsAreaEntity.setWarehouseId(basicdataWarehouseEntity.getId()); return R.status(basicdataGoodsAreaService.save(basicdataGoodsAreaEntity)); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsShelfController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsShelfController.java index fb7eadd47..330a25b17 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsShelfController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsShelfController.java @@ -18,7 +18,9 @@ package com.logpm.basicdata.controller; import com.logpm.basicdata.dto.BasicdataGoodsShelfDTO; import com.logpm.basicdata.entity.BasicdataGoodsShelfEntity; +import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.excel.BasicdataGoodsShelfExcel; +import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.basicdata.service.IBasicdataGoodsShelfService; import com.logpm.basicdata.vo.BasicdataGoodsShelfVO; import io.swagger.annotations.Api; @@ -45,6 +47,7 @@ import springfox.documentation.annotations.ApiIgnore; import java.util.Map; import java.util.List; +import java.util.Objects; import javax.servlet.http.HttpServletResponse; /** @@ -61,6 +64,8 @@ public class BasicdataGoodsShelfController extends BladeController { private final IBasicdataGoodsShelfService basicdataGoodsShelfService; + private final IBasicdataWarehouseClient basicdataWarehouseClient; + /** * 货架 详情 */ @@ -102,6 +107,12 @@ public class BasicdataGoodsShelfController extends BladeController { @ApiOperationSupport(order = 4) @ApiOperation(value = "新增", notes = "传入BasicdataGoodsShelf") public R save(@Valid @RequestBody BasicdataGoodsShelfDTO basicdataGoodsShelfDTO) { + //获取当前登录人仓库 + BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getMyCurrentWarehouse(); + if (Objects.isNull(basicdataWarehouseEntity)){ + return R.fail("无选择仓库,无法新增"); + } + basicdataGoodsShelfDTO.setWarehouseId(basicdataWarehouseEntity.getId()); return R.status(basicdataGoodsShelfService.insertGoodsshelf(basicdataGoodsShelfDTO)); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java index 845eb70e4..652edf8df 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java @@ -109,17 +109,16 @@ public class BasicdataWarehouseController extends BladeController { if (Objects.isNull(myCurrentWarehouse)){ myWarehouseList = basicdataWarehouseClient.getMyWarehouseList(); }else {myWarehouseList.add(myCurrentWarehouse);} - - if (myWarehouseList.size()==0){ - return R.data(null); - } +// if (myWarehouseList.size()==0){ +// return R.data(null); +// } List collect = myWarehouseList.stream() .map(BasicdataWarehouseEntity::getId) .collect(Collectors.toList()); QueryWrapper qw = Condition.getQueryWrapper(warehouseWarehouse, BasicdataWarehouseEntity.class); qw.lambda().apply(startDate != null, "date_format (start_date,'%Y-%m-%d') >= date_format ({0},'%Y-%m-%d')", startDate) .apply(endDate != null, "date_format (end_date,'%Y-%m-%d') <= date_format ({0},'%Y-%m-%d')", endDate) - .in(BasicdataWarehouseEntity::getId,collect + .in(collect.size()>0,BasicdataWarehouseEntity::getId,collect ); // qw.lambda().eq(BasicdataWarehouseEntity::getTenantId, AuthUtil.getTenantId()); // qw.lambda().eq(BasicdataWarehouseEntity::getDepartment, deptId); @@ -247,8 +246,8 @@ public class BasicdataWarehouseController extends BladeController { @GetMapping("/warehouseList") @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "传入BasicdataGoodsShelf") - public R> getWarehouseList() { - List basicdataGoodsShelfVOList = warehouseService.getWarehouseList(); + public R> getWarehouseList() { + List basicdataGoodsShelfVOList = warehouseService.getWarehouseList(); return R.data(basicdataGoodsShelfVOList); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java index e794ef1e2..267dcb31a 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java @@ -27,6 +27,7 @@ import lombok.AllArgsConstructor; import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; @@ -147,6 +148,18 @@ public class BasicdataWarehouseClient implements IBasicdataWarehouseClient { return warehouseEntity; } + @Override + @GetMapping(API_PREFIX+"/getMyWatchWarehouse") + public List getMyWatchWarehouse() { + return warehouseWarehouseService.getMyWatchWarehouse(); + } + + @Override + @GetMapping(API_PREFIX+"/clearWarehouseCache") + public R clearWarehouseCache() { + return warehouseWarehouseService.clearWarehouseCache(); + } + @Override public BasicdataWarehouseEntity getWarehouseByDepartment(String deptId) { QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml index 8e7720205..b314e0926 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml @@ -103,6 +103,12 @@ AND goods_allocation.goods_area_id=#{po.goodsAreaId} + + and goods_allocation.warehouse_id in + + #{item} + + and warehouse.name like concat('%', #{po.warehouseName},'%') diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml index c991a59b9..d546637a5 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml @@ -74,6 +74,12 @@ and goods_area.warehouse_id = #{po.warehouseId} + + and goods_area.warehouse_id in + + #{item} + + and goods_area.enable_status = #{po.enableStatus} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml index 57b814679..641c25e3d 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml @@ -87,6 +87,12 @@ goods_shelf.is_deleted=0 and goods_shelf.goods_area_id = #{po.goodsAreaId} + + + and goods_shelf.warehouse_id in + + #{item} + and warehouse.name like concat('%', #{po.warehouseName},'%') diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml index 721f7eb1f..b8c1ad45a 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml @@ -69,6 +69,12 @@ and warehouse.id = #{po.warehouseId} + + and tray.warehouse_id in + + #{item} + + and tray.tray_status = #{po.trayStatus} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.java index ec61d2d60..c54135ff5 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.java @@ -63,7 +63,7 @@ public interface BasicdataWarehouseMapper extends BaseMapper getWarehouseList(); + List getWarehouseList(); /** diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml index ec933ee31..1e3b9386b 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml @@ -77,7 +77,7 @@ SELECT a.id,a.name,b.headline FROM logpm_warehouse_warehouse AS a left JOIN logpm_warehouse_goods_area AS b ON a.id=b.warehouse_id - SELECT tenant_id, create_user, diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataWarehouseService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataWarehouseService.java index a42b99c97..ae425bb32 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataWarehouseService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataWarehouseService.java @@ -63,7 +63,7 @@ public interface IBasicdataWarehouseService extends BaseService getWarehouseList(); + List getWarehouseList(); /** @@ -106,4 +106,12 @@ public interface IBasicdataWarehouseService extends BaseService getMyWatchWarehouse(); + /** + * 根据当前登录用户查询能看到的仓库 + */ + R clearWarehouseCache(); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java index 7ad1e38ea..00e784dd7 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java @@ -27,9 +27,11 @@ import com.logpm.basicdata.dto.BasicdataGoodsAllocationDTO; import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.excel.BasicdataGoodsAllocationExcel; +import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.basicdata.mapper.BasicdataGoodsAllocationMapper; import com.logpm.basicdata.mapper.BasicdataGoodsAreaMapper; import com.logpm.basicdata.service.IBasicdataGoodsAllocationService; +import com.logpm.basicdata.service.IBasicdataWarehouseService; import com.logpm.basicdata.vo.BasicdataGoodsAllocationVO; import com.logpm.basicdata.vo.BasicdataNodeVO; import com.logpm.basicdata.vo.FreightSpaceVO; @@ -59,6 +61,7 @@ import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; import java.util.*; +import java.util.stream.Collectors; /** * 货位 服务实现类 @@ -78,6 +81,10 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl selectBasicdataGoodsAllocationPage(IPage page, BasicdataGoodsAllocationVO BasicdataGoodsAllocation) { @@ -96,6 +103,30 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl getNode() { +// List myWarehouseList = basicdataWarehouseService.getMyWarehouseList(); +// ArrayList basicdataNodeVOS = new ArrayList<>(); +// for (BasicdataWarehouseEntity basicdataWarehouseEntity : myWarehouseList) { +// BasicdataNodeVO basicdataNodeVO = new BasicdataNodeVO(); +// basicdataNodeVO.setLabel(String.valueOf(basicdataWarehouseEntity.getId())); +// basicdataNodeVO.setValue(basicdataWarehouseEntity.getName()); +// List goodeAreaNodes = goodsAllocationMapper.selectSecondNode(basicdataNodeVO.getValue()); +// //判断仓库下是否存在货区节点，存在则添加，不存在则设置没有下级节点 +// if (!Func.isEmpty(goodeAreaNodes)) { +// basicdataNodeVO.setChildren(goodeAreaNodes); +// for (BasicdataNodeVO goodeAreaNode : goodeAreaNodes) { +// //遍历货区节点信息，查询货区对应货架节点 +// List goodsShelfNode = goodsAllocationMapper.selectThirdNode(basicdataNodeVO.getValue(), goodeAreaNode.getValue()); +// if (!Func.isEmpty(goodsShelfNode)) { +// goodeAreaNode.setChildren(goodsShelfNode); +// } else { +// goodeAreaNode.setLeaf(true); +// } +// } +// } else { +// basicdataNodeVO.setLeaf(true); +// } +// basicdataNodeVOS.add(basicdataNodeVO); +// } //查询一级仓库节点信息 List basicdataWarehouseVOList = goodsAreaMapper.selectFirstNode(); //遍历仓库节点查询货区节点信息 @@ -155,6 +186,12 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl selectGoodsAllocationList(Query query, Map basicdataGoodsAllocation) { IPage page = Condition.getPage(query); //这里前端进行了封装，不需要再进行处理了 + //获取当前登录人仓库 + List myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse(); + List collect = myWatchWarehouse.stream() + .map(BasicdataWarehouseEntity::getId) + .collect(Collectors.toList()); + basicdataGoodsAllocation.put("warehouseList",collect); IPage goodsAllocationVOIPage = goodsAllocationMapper.selectGoodsAllocationList(page, basicdataGoodsAllocation); return goodsAllocationVOIPage; diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java index eb79ebeab..8b94b0172 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java @@ -54,6 +54,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import java.util.*; +import java.util.stream.Collectors; /** * 货区 服务实现类 @@ -99,13 +100,11 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl getBasicdataGoodsAreaList(Map basicdataGoodsArea, IPage page) { //获取当前登录人仓库 -// BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getMyCurrentWarehouse(); -// if (Objects.isNull(basicdataWarehouseEntity)){ -// List myWarehouseList = basicdataWarehouseClient.getMyWarehouseList(); -// if (myWarehouseList.size()==0){ -// return null; -// } -// } + List myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse(); + List collect = myWatchWarehouse.stream() + .map(BasicdataWarehouseEntity::getId) + .collect(Collectors.toList()); + basicdataGoodsArea.put("warehouseList",collect); IPage goodsAreaVOIPage = basicdataGoodsAreaMapper.getBasicdataGoodsAreaList(page,basicdataGoodsArea); return goodsAreaVOIPage; } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java index b7b0e7636..7935e4d3a 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java @@ -114,6 +114,12 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl getGoodsShelfList(IPage page, Map basicdataGoodsShelf) { + //获取当前登录人仓库 + List myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse(); + List collect = myWatchWarehouse.stream() + .map(BasicdataWarehouseEntity::getId) + .collect(Collectors.toList()); + basicdataGoodsShelf.put("warehouseList",collect); IPage basicdataGoodsShelfVOIPage = basicdataGoodsShelfMapper.getGoodsShelfList(page, basicdataGoodsShelf); return basicdataGoodsShelfVOIPage; } @@ -133,10 +139,10 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl>>>>>>>>>{}",rowNum); Integer storeyNum = basicdataGoodsShelfDTO.getStoreyNum();//行 log.info("行>>>>>>>>>>{}",storeyNum); - Long ck = 1687637854291722242l; + //Long ck = 1687637854291722242l; //获取当前登录人仓库 BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getMyCurrentWarehouse(); + if (Objects.isNull(basicdataWarehouseEntity)){ + return R.fail("当前登录人没有选择仓库"); + } + Long ck = basicdataWarehouseEntity.getId(); //查询租户对应的库位码前缀规则 // String allocationCode = basicTenantCodeClient.shelfCode(user.getTenantId(),"5"); //判断新增货位 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java index a7fafc1a8..5db82c33f 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java @@ -71,6 +71,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.util.*; +import java.util.stream.Collectors; /** * 托盘 服务实现类 @@ -156,6 +157,12 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl selectTrayList(IPage page, Map basicdataTray) { + //获取当前登录人仓库 + List myWatchWarehouse = basicdataWarehouseService.getMyWatchWarehouse(); + List collect = myWatchWarehouse.stream() + .map(BasicdataWarehouseEntity::getId) + .collect(Collectors.toList()); + basicdataTray.put("warehouseList",collect); IPage trayList= trayMapper.selectTrayList(page,basicdataTray); return trayList; } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java index ea934e1ef..736fc3edc 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java @@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.excel.BasicdataWarehouseExcel; +import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.basicdata.mapper.BasicdataGoodsAreaMapper; import com.logpm.basicdata.mapper.BasicdataWarehouseMapper; import com.logpm.basicdata.service.IBasicdataWarehouseService; @@ -41,7 +42,9 @@ import org.springblade.system.feign.IDeptClient; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * 仓库 服务实现类 @@ -57,6 +60,8 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl getWarehouseList() { - List basicdataGoodsShelfVOList = warehouseMapper.getWarehouseList(); + public List getWarehouseList() { + List myWatchWarehouse = basicdataWarehouseService.getMyWatchWarehouse(); + if (myWatchWarehouse.size()>0){ + return myWatchWarehouse; + } + List basicdataGoodsShelfVOList = warehouseMapper.getWarehouseList(); return basicdataGoodsShelfVOList; } @@ -211,4 +220,25 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl getMyWatchWarehouse() { + //获取当前登录人仓库 + List myWarehouseList = new ArrayList<>(); + BasicdataWarehouseEntity myCurrentWarehouse = this.getMyCurrentWarehouse(); + if (Objects.isNull(myCurrentWarehouse)){ + myWarehouseList = this.getMyWarehouseList(); + }else { + myWarehouseList.add(myCurrentWarehouse); + } + return myWarehouseList; + } + + @Override + public R clearWarehouseCache() { + BladeUser user = AuthUtil.getUser(); + String str = user.getTenantId() +"--"+ user.getUserId(); + Long del = redis.del(redis.keys(str)); + return del>0?R.success("成功"):R.fail("失败"); + } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index b1685fab5..0d8be649c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -2056,7 +2056,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl selectCargoSumId(); + + List AllWarehouse(); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml index 0550a634b..02702f920 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml @@ -264,6 +264,12 @@ WHERE is_deleted = 0 and enable_status = '1' + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java index ebe431841..f22a3217c 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java @@ -19,6 +19,7 @@ package com.logpm.warehouse.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; +import com.logpm.oldproject.entity.WarehouseEntity; import com.logpm.warehouse.dto.*; import com.logpm.warehouse.entity.*; import com.logpm.warehouse.service.IWarehouseUpdownGoodsService; @@ -37,6 +38,7 @@ import org.springblade.core.mp.base.BaseServiceImpl; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Objects; /** * 货位 服务实现类 @@ -116,19 +118,27 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl selectVisCargo() { //获取当前登录人仓库 - BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getMyCurrentWarehouse(); - log.info("获取当前登录人仓库>>>>>>>>>>>>>>>>>>>>{}",basicdataWarehouseEntity); - List records = baseMapper.topWarehouse(basicdataWarehouseEntity.getId()); - for (WarehouseVisCargo record : records) { + List myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse(); + if (myWatchWarehouse.size()==0){ + myWatchWarehouse = baseMapper.AllWarehouse(); + } + ArrayList arrayList = new ArrayList<>(); + for (BasicdataWarehouseEntity basicdataWarehouseEntity : myWatchWarehouse) { //查询仓库下的货区 - List warehouseGoodsAreaEntities =baseMapper.topArea(record.getId()); + List warehouseGoodsAreaEntities =baseMapper.topArea(basicdataWarehouseEntity.getId()); for (WarehouseGoodsAreaVO warehouseGoodsAreaVO : warehouseGoodsAreaEntities) { - List warehouseGoodsShelfEntities = baseMapper.topShelf(warehouseGoodsAreaVO.getId()); + List warehouseGoodsShelfEntities = baseMapper.topShelf(warehouseGoodsAreaVO.getId()); warehouseGoodsAreaVO.setWarehouseGoodsShelfEntitieList(warehouseGoodsShelfEntities); } - record.setWarehouseGoodsAreaVOList(warehouseGoodsAreaEntities); + WarehouseVisCargo warehouseVisCargo = new WarehouseVisCargo(); + Func.copy(basicdataWarehouseEntity,warehouseVisCargo); + warehouseVisCargo.setWarehouseGoodsAreaVOList(warehouseGoodsAreaEntities); + arrayList.add(warehouseVisCargo); } - return records; + + + + return arrayList; } @Override