From 7c0a8a91ae6d1c684e7a358929f4bd04f3f4bfe8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 18 九月 2025 21:01:21 +0800
Subject: [PATCH] 资产管理-资产入库列表接口 资产管理-资产领用申请接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationStorageController.java | 68 +++++++++++++++++++++++++++++++++
1 files changed, 67 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationStorageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationStorageController.java
index 483dcdb..1c64940 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationStorageController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationStorageController.java
@@ -1,12 +1,22 @@
package com.ruoyi.web.controller.api;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.core.domain.entity.TDept;
+import com.ruoyi.system.dto.asset.OaApprovalApplicationStorageDTO;
import com.ruoyi.system.dto.asset.OaApprovalApplicationStorageGeneralDTO;
import com.ruoyi.system.dto.asset.OaApprovalApplicationStoragePropertyDTO;
import com.ruoyi.system.dto.asset.OaApprovalApplicationStorageVehicleDTO;
+import com.ruoyi.system.model.AssetWarehouse;
+import com.ruoyi.system.query.OaApprovalApplicationStoragePageQuery;
+import com.ruoyi.system.service.AssetWarehouseService;
import com.ruoyi.system.service.OaApprovalApplicationStorageService;
+import com.ruoyi.system.service.TDeptService;
+import com.ruoyi.system.vo.asset.OaApprovalApplicationStoragePageVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -34,11 +44,14 @@
public class OaApprovalApplicationStorageController {
private final OaApprovalApplicationStorageService oaApprovalApplicationStorageService;
+ private final TDeptService deptService;
+ private final AssetWarehouseService assetWarehouseService;
@ApiOperation("提交通用资产入库申请")
@PostMapping("/submit-general")
@Log(title = "通用资产入库申请-提交", businessType = BusinessType.INSERT)
public R<Void> submitGeneralAssetStorage(@Valid @RequestBody OaApprovalApplicationStorageGeneralDTO dto) {
+ validateAddress(dto);
oaApprovalApplicationStorageService.submitGeneralAssetStorage(dto);
return R.ok();
}
@@ -47,6 +60,7 @@
@PostMapping("/submit-property")
@Log(title = "房产资产入库申请-提交", businessType = BusinessType.INSERT)
public R<Void> submitPropertyAssetStorage(@Valid @RequestBody OaApprovalApplicationStoragePropertyDTO dto) {
+ validateAddress(dto);
oaApprovalApplicationStorageService.submitPropertyAssetStorage(dto);
return R.ok();
}
@@ -55,7 +69,59 @@
@PostMapping("/submit-vehicle")
@Log(title = "车辆资产入库申请-提交", businessType = BusinessType.INSERT)
public R<Void> submitVehicleAssetStorage(@Valid @RequestBody OaApprovalApplicationStorageVehicleDTO dto) {
+ validateAddress(dto);
oaApprovalApplicationStorageService.submitVehicleAssetStorage(dto);
return R.ok();
}
-}
\ No newline at end of file
+
+ @ApiOperation("获取资产入库申请分页列表")
+ @PostMapping("/page-list")
+ public R<IPage<OaApprovalApplicationStoragePageVO>> getPageList(@RequestBody OaApprovalApplicationStoragePageQuery pageQuery) {
+ IPage<OaApprovalApplicationStoragePageVO> page = oaApprovalApplicationStorageService.getPageList(pageQuery);
+ return R.ok(page);
+ }
+
+ /**
+ * 校验位置类型与相关名称/地址
+ */
+ private void validateAddress(OaApprovalApplicationStorageDTO dto) {
+ Integer addressType = dto.getAddressType();
+ if (addressType == null) {
+ throw new ServiceException("位置类型不能为空");
+ }
+ switch (addressType) {
+ case 0:
+ // 部门
+ if (StringUtils.isEmpty(dto.getUseDeptName())) {
+ throw new ServiceException("使用部门名称不能为空");
+ }
+ TDept dept = deptService.lambdaQuery()
+ .eq(TDept::getDeptName, dto.getUseDeptName())
+ .one();
+ if (dept == null) {
+ throw new ServiceException("使用部门不存在: " + dto.getUseDeptName());
+ }
+ break;
+ case 1:
+ // 仓库
+ if (StringUtils.isEmpty(dto.getWarehouseName())) {
+ throw new ServiceException("仓库名称不能为空");
+ }
+ AssetWarehouse wh = assetWarehouseService.lambdaQuery()
+ .eq(AssetWarehouse::getWarehouseName, dto.getWarehouseName())
+ .one();
+ if (wh == null) {
+ throw new ServiceException("仓库不存在: " + dto.getWarehouseName());
+ }
+ break;
+ case 2:
+ // 地址
+ if (StringUtils.isEmpty(dto.getAddress())) {
+ throw new ServiceException("所在位置不能为空");
+ }
+ break;
+ default:
+ throw new ServiceException("位置类型不支持: " + addressType);
+ }
+ }
+}
--
Gitblit v1.7.1