From d175bf1e66c1be70a6fa819c005163e30f692d23 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 19 Apr 2023 14:28:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/InvWarehouseController.java | 24 +++++++++++++++++++ .../basic/IBasicBusTypePreService.java | 3 +++ .../impl/BasicBusTypePreServiceImpl.java | 4 ++++ 3 files changed, 31 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 9808c3522..14b58a248 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -264,9 +264,27 @@ public class InvWarehouseController extends BaseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } + Integer userCount = warehouseUserService.countUserBySubInvCode(invWarehouseEntity.getCode()); + if (userCount > 0) { + return ResultVOUtils.error(500, "修改失败,请先移除该仓库关联用户!"); + } + //更新仓库信息 + invWarehouseEntity.setUpdateTime(new Date()); boolean b = invWarehouseService.updateInvSubWarehouse(invWarehouseEntity); + //如果要是一级仓库就吧全部子集都刷成一样的寄售仓库 + if(StrUtil.isBlank(invWarehouseEntity.getParentCode())){ + List invWarehouseEntityList=invWarehouseService.selectLowWarehouseAll(invWarehouseEntity.getCode()); + for (InvWarehouseEntity obj : invWarehouseEntityList) { + obj.setAdvanceType(invWarehouseEntity.getAdvanceType()); + obj.setUpdateTime(new Date()); + invWarehouseService.updateInvSubWarehouse(obj); + } + } + + + //更新部门信息 DeptEntity pEntity = deptService.selectByCode(invWarehouseEntity.getParentId()); pEntity.setUpdateTime(new Date()); @@ -610,4 +628,10 @@ public class InvWarehouseController extends BaseController { return ResultVOUtils.success(); } + @PostMapping("/warehouse/inout/getDeptById") + public BaseResponse getDeptById(@RequestBody List deptIds) { + List list = deptService.getDeptById(deptIds); + return ResultVOUtils.success(list); + } + } diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java index 8c3aa4c01..3822a371d 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java @@ -5,6 +5,7 @@ import com.glxp.api.req.basic.FilterBusTypeChangeRequest; import com.glxp.api.req.basic.FilterBusTypePreRequest; import com.glxp.api.res.basic.BasicBusTypePreResponse; +import java.util.Date; import java.util.List; /** @@ -79,4 +80,6 @@ public interface IBasicBusTypePreService { * @return */ boolean verifyExists(BasicBusTypePreEntity basicBusTypePreEntity); + + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java index 2b898f0d9..856aad5a2 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java @@ -105,6 +105,10 @@ public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService { return false; } + @Override + public List findByLastTime(Date lastUpdateTime) { + return basicBusTypePreDao.selectList(new QueryWrapper().gt("updateTime", lastUpdateTime)); + } /** * 设置创建/更新信息 *