From b9aef449be6d6966bdf9db8bb28ce5797d23966e Mon Sep 17 00:00:00 2001 From: wangqian <1406304305@qq.com> Date: Sun, 21 Dec 2025 12:54:59 +0800 Subject: [PATCH] 材料登录增加归属单位 --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/materialinventory/MaterialInventoryController.java | 16 ++++++++-------- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventory/MaterialInventoryService.java | 39 ++++++++++++++++++++++++++++++++------- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventory/MaterialInventoryServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++++++------------- 3 files changed, 79 insertions(+), 28 deletions(-) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/materialinventory/MaterialInventoryController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/materialinventory/MaterialInventoryController.java index 4f9c8f5..bd9e583 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/materialinventory/MaterialInventoryController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/materialinventory/MaterialInventoryController.java @@ -119,8 +119,8 @@ public class MaterialInventoryController { @Operation(summary ="物料类型基础表-耗材类型List") @GetMapping(value = "/getMaterialBigTypeList") @PreAuthorize("@ss.hasPermission('garden:material-type:query')") - public CommonResult getInfo() { - return success(materialInventoryService.queryMaterialBigType(null)); + public CommonResult getInfo(@RequestParam("companyId") Long companyId) { + return success(materialInventoryService.queryMaterialBigType(null, companyId)); } /** @@ -129,8 +129,8 @@ public class MaterialInventoryController { @Operation(summary ="物料类型基础表-类别List") @GetMapping(value = "/getMaterialMidTypeList") @PreAuthorize("@ss.hasPermission('garden:material-type:query')") - public CommonResult getMaterialMidTypeList(@RequestParam("materialTypeId") Long materialTypeId) { - return success(materialInventoryService.queryMaterialMidType(materialTypeId)); + public CommonResult getMaterialMidTypeList(@RequestParam("materialTypeId") Long materialTypeId, @RequestParam("companyId") Long companyId) { + return success(materialInventoryService.queryMaterialMidType(materialTypeId, companyId)); } /** @@ -139,8 +139,8 @@ public class MaterialInventoryController { @Operation(summary ="物料类型基础表-类别List") @GetMapping(value = "/getMaterialDetailTypeList") @PreAuthorize("@ss.hasPermission('garden:material-type:query')") - public CommonResult getMaterialDetailTypeList(@RequestParam("typeId") Long typeId) { - return success(materialInventoryService.queryMaterialDetailType(typeId)); + public CommonResult getMaterialDetailTypeList(@RequestParam("typeId") Long typeId, @RequestParam("companyId") Long companyId) { + return success(materialInventoryService.queryMaterialDetailType(typeId, companyId)); } /** @@ -149,7 +149,7 @@ public class MaterialInventoryController { @Operation(summary ="物料-类别List") @GetMapping(value = "/getMaterialList") @PreAuthorize("@ss.hasPermission('garden:material-type:query')") - public CommonResult getMaterialList(@RequestParam("typeDetailId") Long typeDetailId) { - return success(materialInventoryService.getMaterialInventorList(typeDetailId)); + public CommonResult getMaterialList(@RequestParam("typeDetailId") Long typeDetailId, @RequestParam("companyId") Long companyId) { + return success(materialInventoryService.getMaterialInventorList(typeDetailId, companyId)); } } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventory/MaterialInventoryService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventory/MaterialInventoryService.java index 50c1b73..06322f9 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventory/MaterialInventoryService.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventory/MaterialInventoryService.java @@ -109,12 +109,37 @@ public interface MaterialInventoryService { */ MaterialInventoryDO selectMaterialInventoryByMaterialId(Long materialId); - List queryMaterialBigType(Long materialTypeId); - - List queryMaterialMidType(Long materialTypeId); - - List queryMaterialDetailType(Long typeId); - - List getMaterialInventorList(Long typeDetailId); + /** + * @Author wangqian + * @Description 查询所有种类 + * @Date 2025/12/20 22:00 + * @Param materialTypeId + * @param companyId + */ + List queryMaterialBigType(Long materialTypeId, Long companyId); + /** + * @Author wangqian + * @Description 根据种类查询类别 + * @Date 2025/12/20 22:01 + * @Param materialTypeId + * @param companyId + */ + List queryMaterialMidType(Long materialTypeId, Long companyId); + /** + * @Author wangqian + * @Description 根据类型查询明细 + * @Date 2025/12/20 22:01 + * @Param typeId + * @param companyId + */ + List queryMaterialDetailType(Long typeId, Long companyId); + /** + * @Author wangqian + * @Description 根据明细查询物料 + * @Date 2025/12/20 22:01 + * @Param typeDetailId + * @param companyId + */ + List getMaterialInventorList(Long typeDetailId, Long companyId); } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventory/MaterialInventoryServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventory/MaterialInventoryServiceImpl.java index 22f8529..f111e66 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventory/MaterialInventoryServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventory/MaterialInventoryServiceImpl.java @@ -180,14 +180,13 @@ public class MaterialInventoryServiceImpl implements MaterialInventoryService { } @Override - public List queryMaterialBigType(Long materialTypeId) { - List list; - // 入参为空时查询所有，非空时按ID查询 - if (materialTypeId == null) { - list = materialInventoryMapper.selectList(); - } else { - list = materialInventoryMapper.selectList(MaterialInventoryDO::getMaterialTypeId, materialTypeId); + public List queryMaterialBigType(Long materialTypeId, Long companyId) { + if (companyId == null) { + throw exception0(BAD_REQUEST.getCode(),"归属单位不能为空！"); } + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + queryWrapper.eq(MaterialInventoryDO::getBelongCompanyId, companyId); + List list = materialInventoryMapper.selectList(queryWrapper); // 空列表判断，避免空指针 if (list == null || list.isEmpty()) { @@ -207,8 +206,17 @@ public class MaterialInventoryServiceImpl implements MaterialInventoryService { } @Override - public List queryMaterialMidType(Long materialTypeId) { - List list = materialInventoryMapper.selectList(MaterialInventoryDO::getMaterialTypeId, materialTypeId); + public List queryMaterialMidType(Long materialTypeId, Long companyId) { + if (materialTypeId == null) { + throw exception0(BAD_REQUEST.getCode(),"种类不能为空！"); + } + if (companyId == null) { + throw exception0(BAD_REQUEST.getCode(),"归属单位不能为空！"); + } + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + queryWrapper.eq(MaterialInventoryDO::getMaterialTypeId, materialTypeId); + queryWrapper.eq(MaterialInventoryDO::getBelongCompanyId, companyId); + List list = materialInventoryMapper.selectList(queryWrapper); // 2. 空列表判断，避免空指针 if (list == null || list.isEmpty()) { return List.of(); // 返回空列表而非null，更符合Java规范 @@ -226,8 +234,17 @@ public class MaterialInventoryServiceImpl implements MaterialInventoryService { } @Override - public List queryMaterialDetailType(Long typeId) { - List list = materialInventoryMapper.selectList(MaterialInventoryDO::getTypeId, typeId); + public List queryMaterialDetailType(Long typeId, Long companyId) { + if (typeId == null) { + throw exception0(BAD_REQUEST.getCode(),"类别不能为空！"); + } + if (companyId == null) { + throw exception0(BAD_REQUEST.getCode(),"归属单位不能为空！"); + } + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + queryWrapper.eq(MaterialInventoryDO::getTypeId, typeId); + queryWrapper.eq(MaterialInventoryDO::getBelongCompanyId, companyId); + List list = materialInventoryMapper.selectList(queryWrapper); // 2. 空列表判断，避免空指针 if (list == null || list.isEmpty()) { return List.of(); // 返回空列表而非null，更符合Java规范 @@ -245,8 +262,17 @@ public class MaterialInventoryServiceImpl implements MaterialInventoryService { } @Override - public List getMaterialInventorList(Long typeDetailId) { - List list = materialInventoryMapper.selectList(MaterialInventoryDO::getTypeDetailId, typeDetailId); + public List getMaterialInventorList(Long typeDetailId, Long companyId) { + if (typeDetailId == null) { + throw exception0(BAD_REQUEST.getCode(),"明细不能为空！"); + } + if (companyId == null) { + throw exception0(BAD_REQUEST.getCode(),"归属单位不能为空！"); + } + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + queryWrapper.eq(MaterialInventoryDO::getTypeDetailId, typeDetailId); + queryWrapper.eq(MaterialInventoryDO::getBelongCompanyId, companyId); + List list = materialInventoryMapper.selectList(queryWrapper); // 2. 空列表判断，避免空指针 if (list == null || list.isEmpty()) { return List.of(); // 返回空列表而非null，更符合Java规范 -- libgit2 0.21.4