From 937353ca952a97e0c661821518f73e49996e7ca1 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Wed, 30 Aug 2023 17:43:15 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=8F=AD=E7=BB=84=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/BasicdataTeamGroupEntity.java | 2 +- .../controller/BasicdataTeamGroupController.java | 15 ++++++++++++++- .../controller/BasicdataWarehouseController.java | 11 +++++++++++ .../basicdata/excel/BasicdataTeamGroupExcel.java | 2 +- .../basicdata/mapper/BasicdataTeamGroupMapper.xml | 2 +- .../impl/BasicdataTeamGroupServiceImpl.java | 14 ++++++++------ .../impl/BasicdataWarehouseServiceImpl.java | 3 +++ .../warehouse/dto/WarehouseVisualizationDTO.java | 8 ++++++++ 8 files changed, 47 insertions(+), 10 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataTeamGroupEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataTeamGroupEntity.java index 0fbccd24d..52335519b 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataTeamGroupEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataTeamGroupEntity.java @@ -70,7 +70,7 @@ public class BasicdataTeamGroupEntity extends TenantEntity { * 仓库 */ @ApiModelProperty(value = "仓库") - private String belongTo; + private Long warehouseId; /** * 仓库名称 */ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataTeamGroupController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataTeamGroupController.java index 25554fecd..8405a9aed 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataTeamGroupController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataTeamGroupController.java @@ -16,6 +16,8 @@ */ package com.logpm.basicdata.controller; +import com.logpm.basicdata.entity.BasicdataWarehouseEntity; +import com.logpm.basicdata.service.IBasicdataWarehouseService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -42,6 +44,8 @@ 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 java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; /** @@ -58,6 +62,8 @@ public class BasicdataTeamGroupController extends BladeController { private final IBasicdataTeamGroupService basicdataTeamGroupService; + private final IBasicdataWarehouseService basicdataWarehouseService; + /** * 基础班组表 详情 */ @@ -75,7 +81,13 @@ public class BasicdataTeamGroupController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入basicdataTeamGroup") public R> list(@ApiIgnore @RequestParam Map basicdataTeamGroup, Query query) { - IPage pages = basicdataTeamGroupService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataTeamGroup, BasicdataTeamGroupEntity.class)); + QueryWrapper queryWrapper = Condition.getQueryWrapper(basicdataTeamGroup, BasicdataTeamGroupEntity.class); + //获取当前登录人仓库 + List myWatchWarehouse = basicdataWarehouseService.getMyWatchWarehouse(); + //取出id + List collect = myWatchWarehouse.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()); + queryWrapper.lambda().in(collect.size()>0,BasicdataTeamGroupEntity::getWarehouseId,collect); + IPage pages = basicdataTeamGroupService.page(Condition.getPage(query),queryWrapper ); return R.data(pages); } @@ -108,6 +120,7 @@ public class BasicdataTeamGroupController extends BladeController { @ApiOperationSupport(order = 4) @ApiOperation(value = "新增", notes = "传入basicdataTeamGroup") public R save(@Valid @RequestBody BasicdataTeamGroupEntity basicdataTeamGroup) { + return R.status(basicdataTeamGroupService.save(basicdataTeamGroup)); } 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 652edf8df..ddc2931c3 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 @@ -289,6 +289,17 @@ public class BasicdataWarehouseController extends BladeController { return R.data(obj); } + /** + * + *根据当前登录用户查询能看到的仓库 + */ + @GetMapping("/clearWarehouseCache") + @ApiOperationSupport(order = 3) + public R clearWarehouseCache() { + R r = warehouseService.clearWarehouseCache(); + return r; + } + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataTeamGroupExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataTeamGroupExcel.java index e5405ad8a..b8d367fae 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataTeamGroupExcel.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataTeamGroupExcel.java @@ -94,7 +94,7 @@ public class BasicdataTeamGroupExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("仓库") - private String belongTo; + private String warehouseId; /** * 班组类型 */ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTeamGroupMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTeamGroupMapper.xml index 10fafb367..f83eacb99 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTeamGroupMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTeamGroupMapper.xml @@ -19,7 +19,7 @@ - + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTeamGroupServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTeamGroupServiceImpl.java index f325c8b8c..80221cb39 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTeamGroupServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTeamGroupServiceImpl.java @@ -31,12 +31,14 @@ import com.logpm.basicdata.mapper.BasicdataTeamGroupMapper; import com.logpm.basicdata.service.IBasicdataTeamGroupService; import lombok.AllArgsConstructor; import org.springblade.core.log.exception.ServiceException; +import org.springblade.core.tool.api.R; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; import java.util.List; import java.util.Map; +import java.util.Objects; /** * 基础班组表 服务实现类 @@ -82,13 +84,13 @@ public class BasicdataTeamGroupServiceImpl extends BaseServiceImplquery().lambda().eq(BasicdataWarehouseEntity::getId, basicdataTeamGroup.getBelongTo())); - if(ObjectUtils.isNull(one)){ - throw new ServiceException("仓库数据异常！！"); + //获取当前登录人仓库 + BasicdataWarehouseEntity one = basicdataWarehouseService.getMyCurrentWarehouse(); + if (Objects.isNull(one)){ + throw new ServiceException("无选择仓库,无法新增修改！！"); } + basicdataTeamGroup.setWarehouseId(one.getId()); + basicdataTeamGroup.setWarehouseName(one.getName()); //查询部门信息 if(ObjectUtils.isNotNull(basicdataTeamGroup.getId())){ //修改 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 736fc3edc..13eed7128 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 @@ -31,6 +31,7 @@ import com.logpm.basicdata.service.IBasicdataWarehouseService; import com.logpm.basicdata.vo.BasicdataWarehouseVO; import com.logpm.basicdata.wrapper.BasicdataWarehouseWrapper; import lombok.AllArgsConstructor; +import lombok.extern.log4j.Log4j2; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.redis.cache.BladeRedis; import org.springblade.core.secure.BladeUser; @@ -54,6 +55,7 @@ import java.util.Objects; */ @Service @AllArgsConstructor +@Log4j2 public class BasicdataWarehouseServiceImpl extends BaseServiceImpl implements IBasicdataWarehouseService { private final BasicdataWarehouseMapper warehouseMapper; @@ -239,6 +241,7 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl>>>>>>str>>>>>>{}",str); return del>0?R.success("成功"):R.fail("失败"); } } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseVisualizationDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseVisualizationDTO.java index f023a1ae1..da380aa53 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseVisualizationDTO.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseVisualizationDTO.java @@ -21,6 +21,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + /** * 在库订单包件清单 可视化 @@ -48,6 +50,12 @@ public class WarehouseVisualizationDTO extends WarehouseParcelListcopyEntity { @ApiModelProperty(value = "打托方式") private String updownType; + /** + * 仓库列表 + */ + @ApiModelProperty(value = "仓库列表") + private List warehouseIdList; + }