From 236fb6ff1f6a955db5f78560204e042e977e2167 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 22 九月 2025 20:47:52 +0800
Subject: [PATCH] 资产入库审批通过保存资产数据
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationStorageServiceImpl.java | 250 ++++++++++++++++++++-----------------------------
1 files changed, 101 insertions(+), 149 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationStorageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationStorageServiceImpl.java
index 5bfb9d1..5c9f687 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationStorageServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationStorageServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.service.impl;
+import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -13,7 +14,6 @@
import com.ruoyi.system.emums.ApprovalTypeEnum;
import com.ruoyi.system.emums.AssetTypeEnum;
import com.ruoyi.system.mapper.OaApprovalApplicationStorageMapper;
-import com.ruoyi.system.model.AssetMain;
import com.ruoyi.system.model.AssetWarehouse;
import com.ruoyi.system.model.OaApprovalApplicationStorage;
import com.ruoyi.system.model.OaApprovalApplicationStorageAsset;
@@ -23,10 +23,6 @@
import com.ruoyi.system.model.OaApprovalFlowNode;
import com.ruoyi.system.query.ApprovalDetailQuery;
import com.ruoyi.system.query.OaApprovalApplicationStoragePageQuery;
-import com.ruoyi.system.service.AssetMainService;
-import com.ruoyi.system.service.AssetPropertyExtService;
-import com.ruoyi.system.service.AssetTypeService;
-import com.ruoyi.system.service.AssetVehicleExtService;
import com.ruoyi.system.service.AssetWarehouseService;
import com.ruoyi.system.service.OaApprovalApplicationStorageAssetPropertyExtService;
import com.ruoyi.system.service.OaApprovalApplicationStorageAssetService;
@@ -36,7 +32,6 @@
import com.ruoyi.system.service.OaApprovalFlowNodeService;
import com.ruoyi.system.service.OaApprovalTodoService;
import com.ruoyi.system.service.TDeptService;
-import com.ruoyi.system.vo.PurchaseListVO;
import com.ruoyi.system.vo.StorageListVO;
import com.ruoyi.system.vo.asset.OaApprovalApplicationStorageGeneralDetailVO;
import com.ruoyi.system.vo.asset.OaApprovalApplicationStoragePageVO;
@@ -50,8 +45,10 @@
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -70,10 +67,6 @@
private final OaApprovalApplicationStorageAssetService oaApprovalApplicationStorageAssetService;
private final OaApprovalApplicationStorageAssetPropertyExtService oaApprovalApplicationStorageAssetPropertyExtService;
private final OaApprovalApplicationStorageAssetVehicleExtService oaApprovalApplicationStorageAssetVehicleExtService;
- private final AssetMainService assetMainService;
- private final AssetPropertyExtService assetPropertyExtService;
- private final AssetVehicleExtService assetVehicleExtService;
- private final AssetTypeService assetTypeService;
private final OaApprovalFlowNodeService oaApprovalFlowNodeService;
private final OaApprovalTodoService oaApprovalTodoService;
private final TDeptService tDeptService;
@@ -239,7 +232,8 @@
}
assetMain.setUserName(item.getUserName());
// 根据整单 addressType 写入使用部门ID或仓库ID
- applyUseDeptInfoToAssetMain(assetMain, baseDto.getUseDeptName());
+ applyAddressToAssetMain(assetMain, item.getAddressType(), item.getUseDeptName(), item.getWarehouseName(), item.getAddress());
+ assetMain.setAddressType(item.getAddressType());
assetMain.setAssetMainType(AssetTypeEnum.GENERAL.getCode());
assetMain.setAssetStatus(item.getAssetStatus());
assetMain.setRemarks(item.getRemarks());
@@ -275,7 +269,8 @@
}
}
assetMain.setUserName(item.getUserName());
- applyUseDeptInfoToAssetMain(assetMain, baseDto.getUseDeptName());
+ applyAddressToAssetMain(assetMain, item.getAddressType(), item.getUseDeptName(), item.getWarehouseName(), item.getAddress());
+ assetMain.setAddressType(item.getAddressType());
assetMain.setAssetMainType(AssetTypeEnum.HOUSE.getCode());
assetMain.setAssetStatus(item.getAssetStatus());
assetMain.setRemarks(item.getRemarks());
@@ -311,7 +306,8 @@
}
}
assetMain.setUserName(item.getUserName());
- applyUseDeptInfoToAssetMain(assetMain, baseDto.getUseDeptName());
+ applyAddressToAssetMain(assetMain, item.getAddressType(), item.getUseDeptName(), item.getWarehouseName(), item.getAddress());
+ assetMain.setAddressType(item.getAddressType());
assetMain.setAssetMainType(AssetTypeEnum.VEHICLE.getCode());
assetMain.setAssetStatus(item.getAssetStatus());
assetMain.setRemarks(item.getRemarks());
@@ -327,17 +323,43 @@
/**
* 按整单地址类型设置资产主表位置信息（使用部门ID或仓库ID或地址）
*/
- private void applyUseDeptInfoToAssetMain(OaApprovalApplicationStorageAsset assetMain, String useDeptName) {
- // 使用部门
- if (useDeptName != null && !useDeptName.isEmpty()) {
- TDept dept = tDeptService.lambdaQuery()
- .eq(TDept::getDeptName, useDeptName)
- .one();
- if (dept != null) {
- assetMain.setUseDeptId(dept.getId());
- }
+ private void applyAddressToAssetMain(OaApprovalApplicationStorageAsset assetMain, Integer addressType, String useDeptName, String warehouseName, String address) {
+ if (addressType == null) {
+ return;
+ }
+ switch (addressType) {
+ case 0:
+ // 使用部门
+ if (useDeptName != null && !useDeptName.isEmpty()) {
+ TDept dept = tDeptService.lambdaQuery()
+ .eq(TDept::getDeptName, useDeptName)
+ .one();
+ if (dept != null) {
+ assetMain.setUseDeptId(dept.getId());
+ }
+ }
+ break;
+ case 1:
+ if (warehouseName != null && !warehouseName.isEmpty()) {
+ AssetWarehouse warehouse = assetWarehouseService.lambdaQuery()
+ .eq(AssetWarehouse::getWarehouseName, warehouseName)
+ .one();
+ if (warehouse != null) {
+ assetMain.setWarehouseId(warehouse.getId());
+ assetMain.setWarehouseName(warehouse.getWarehouseName());
+ }
+ }
+ break;
+ case 2:
+ if (address != null && !address.isEmpty()) {
+ assetMain.setAddress(address);
+ }
+ break;
+ default:
+ // ignore
}
}
+
/**
@@ -494,31 +516,6 @@
return prefix + sequenceStr;
}
- /**
- * 生成资产编码
- * 格式：资产类型一级分类简写+资产类型子类简写+入库日期+【-】+数量顺序编号（4位）
- * 例如：GDFC20250917-0001
- */
- private String generateAssetCode(Integer assetTypeId, LocalDate storageDate) {
- // 根据资产类型ID获取资产编码前缀
- String typeCodePrefix = assetTypeService.getAssetCodePrefix(assetTypeId);
-
- String dateStr = storageDate.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
- String prefix = typeCodePrefix + dateStr + "-";
-
- // 查询当天该类型资产的数量
- Long count = assetMainService.lambdaQuery()
- .like(AssetMain::getAssetCode, prefix)
- .ge(AssetMain::getCreateTime, storageDate.atStartOfDay())
- .lt(AssetMain::getCreateTime, storageDate.plusDays(1).atStartOfDay())
- .count();
-
- int sequence = (count != null ? count.intValue() : 0) + 1;
- String sequenceStr = String.format("%04d", sequence);
-
- return prefix + sequenceStr;
- }
-
@Override
public IPage<OaApprovalApplicationStoragePageVO> getPageList(OaApprovalApplicationStoragePageQuery pageQuery) {
Page<OaApprovalApplicationStoragePageVO> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
@@ -543,36 +540,35 @@
.eq(OaApprovalApplicationStorageAsset::getApprovalApplicationId, app.getId())
.eq(OaApprovalApplicationStorageAsset::getAssetTypeId, storage.getAssetTypeId())
.list();
- setAddressInfo(vo, mains);
-
if (!CollectionUtils.isEmpty(mains)) {
- // 批量查询权属部门，避免循环内查询
+ // 批量查询权属部门
List<Integer> ownerIds = mains.stream().map(OaApprovalApplicationStorageAsset::getOwnershipDeptId)
- .filter(id -> id != null).distinct().collect(Collectors.toList());
- Map<Integer, TDept> ownerDeptMap = ownerIds.isEmpty() ? java.util.Collections.emptyMap()
+ .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ Map<Integer, TDept> ownerDeptMap = ownerIds.isEmpty() ? Collections.emptyMap()
: tDeptService.listByIds(ownerIds).stream().collect(Collectors.toMap(TDept::getId, d -> d));
-
+ // 批量查询使用部门
+ List<Integer> useDeptIds = mains.stream().map(OaApprovalApplicationStorageAsset::getUseDeptId)
+ .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ Map<Integer, TDept> useDeptMap = ownerIds.isEmpty() ? Collections.emptyMap()
+ : tDeptService.listByIds(useDeptIds).stream().collect(Collectors.toMap(TDept::getId, d -> d));
+ // 批量查询仓库
+ List<Integer> warehouseIds = mains.stream().map(OaApprovalApplicationStorageAsset::getWarehouseId)
+ .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ Map<Integer, AssetWarehouse> warehouseMap = warehouseIds.isEmpty() ? Collections.emptyMap()
+ : assetWarehouseService.listByIds(useDeptIds).stream().collect(Collectors.toMap(AssetWarehouse::getId, d -> d));
List<OaApprovalApplicationStorageGeneralDetailVO.GeneralAssetItemVO> items = mains.stream().map(m -> {
- OaApprovalApplicationStorageGeneralDetailVO.GeneralAssetItemVO item = new OaApprovalApplicationStorageGeneralDetailVO.GeneralAssetItemVO();
- item.setAssetOriginalCode(m.getAssetOriginalCode());
- item.setAssetName(m.getAssetName());
- item.setSpecificationModel(m.getSpecificationModel());
- item.setMeasurementUnit(m.getMeasurementUnit());
- item.setQuantity(m.getQuantity());
- item.setUnitPrice(m.getUnitPrice());
- item.setUsefulLife(m.getUsefulLife());
+ OaApprovalApplicationStorageGeneralDetailVO.GeneralAssetItemVO item = BeanUtil.copyProperties(m, OaApprovalApplicationStorageGeneralDetailVO.GeneralAssetItemVO.class);
if (m.getOwnershipDeptId() != null) {
TDept dept = ownerDeptMap.get(m.getOwnershipDeptId());
item.setOwnerShipDeptName(dept != null ? dept.getDeptName() : null);
}
- item.setUserName(m.getUserName());
- item.setAssetStatus(m.getAssetStatus());
- item.setRemarks(m.getRemarks());
- item.setAccountingStatus(m.getAccountingStatus());
- item.setAccountingDate(m.getAccountingDate());
- item.setAccountingVoucherNo(m.getAccountingVoucherNo());
- item.setAccountingSubject(m.getAccountingSubject());
- item.setAccountingAmount(m.getAccountingAmount());
+ if (m.getAddressType().equals(0) && m.getUseDeptId() != null) {
+ TDept dept = useDeptMap.get(m.getUseDeptId());
+ item.setUseDeptName(dept != null ? dept.getDeptName() : null);
+ } else if (m.getAddressType().equals(1) && m.getWarehouseId() != null){
+ AssetWarehouse assetWarehouse = warehouseMap.get(m.getWarehouseId());
+ item.setWarehouseName(assetWarehouse != null ? assetWarehouse.getWarehouseName() : null);
+ }
return item;
}).collect(Collectors.toList());
vo.setAssetItems(items);
@@ -598,7 +594,6 @@
.eq(OaApprovalApplicationStorageAsset::getApprovalApplicationId, app.getId())
.eq(OaApprovalApplicationStorageAsset::getAssetTypeId, storage.getAssetTypeId())
.list();
- setAddressInfo(vo, mains);
if (!CollectionUtils.isEmpty(mains)) {
List<Integer> mainIds = mains.stream().map(OaApprovalApplicationStorageAsset::getId).collect(Collectors.toList());
@@ -609,28 +604,30 @@
.filter(id -> id != null).distinct().collect(Collectors.toList());
Map<Integer, TDept> ownerDeptMap = ownerIds.isEmpty() ? java.util.Collections.emptyMap()
: tDeptService.listByIds(ownerIds).stream().collect(Collectors.toMap(TDept::getId, d -> d));
+ // 批量查询使用部门
+ List<Integer> useDeptIds = mains.stream().map(OaApprovalApplicationStorageAsset::getUseDeptId)
+ .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ Map<Integer, TDept> useDeptMap = ownerIds.isEmpty() ? Collections.emptyMap()
+ : tDeptService.listByIds(useDeptIds).stream().collect(Collectors.toMap(TDept::getId, d -> d));
+ // 批量查询仓库
+ List<Integer> warehouseIds = mains.stream().map(OaApprovalApplicationStorageAsset::getWarehouseId)
+ .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ Map<Integer, AssetWarehouse> warehouseMap = warehouseIds.isEmpty() ? Collections.emptyMap()
+ : assetWarehouseService.listByIds(useDeptIds).stream().collect(Collectors.toMap(AssetWarehouse::getId, d -> d));
List<OaApprovalApplicationStoragePropertyDetailVO.PropertyAssetItemVO> items = mains.stream().map(m -> {
- OaApprovalApplicationStoragePropertyDetailVO.PropertyAssetItemVO item = new OaApprovalApplicationStoragePropertyDetailVO.PropertyAssetItemVO();
- item.setAssetOriginalCode(m.getAssetOriginalCode());
- item.setAssetName(m.getAssetName());
- item.setSpecificationModel(m.getSpecificationModel());
- item.setMeasurementUnit(m.getMeasurementUnit());
- item.setQuantity(m.getQuantity());
- item.setUnitPrice(m.getUnitPrice());
- item.setUsefulLife(m.getUsefulLife());
+ OaApprovalApplicationStoragePropertyDetailVO.PropertyAssetItemVO item = BeanUtil.copyProperties(m, OaApprovalApplicationStoragePropertyDetailVO.PropertyAssetItemVO.class);
if (m.getOwnershipDeptId() != null) {
TDept dept = ownerDeptMap.get(m.getOwnershipDeptId());
item.setOwnerShipDeptName(dept != null ? dept.getDeptName() : null);
}
- item.setUserName(m.getUserName());
- item.setAssetStatus(m.getAssetStatus());
- item.setRemarks(m.getRemarks());
- item.setAccountingStatus(m.getAccountingStatus());
- item.setAccountingDate(m.getAccountingDate());
- item.setAccountingVoucherNo(m.getAccountingVoucherNo());
- item.setAccountingSubject(m.getAccountingSubject());
- item.setAccountingAmount(m.getAccountingAmount());
+ if (m.getAddressType().equals(0) && m.getUseDeptId() != null) {
+ TDept dept = useDeptMap.get(m.getUseDeptId());
+ item.setUseDeptName(dept != null ? dept.getDeptName() : null);
+ } else if (m.getAddressType().equals(1) && m.getWarehouseId() != null){
+ AssetWarehouse assetWarehouse = warehouseMap.get(m.getWarehouseId());
+ item.setWarehouseName(assetWarehouse != null ? assetWarehouse.getWarehouseName() : null);
+ }
OaApprovalApplicationStorageAssetPropertyExt ext = extMap.get(m.getId());
if (ext != null) {
item.setRegion(ext.getRegion());
@@ -675,7 +672,6 @@
.eq(OaApprovalApplicationStorageAsset::getApprovalApplicationId, app.getId())
.eq(OaApprovalApplicationStorageAsset::getAssetTypeId, storage.getAssetTypeId())
.list();
- setAddressInfo(vo, mains);
if (!CollectionUtils.isEmpty(mains)) {
List<Integer> mainIds = mains.stream().map(OaApprovalApplicationStorageAsset::getId).collect(Collectors.toList());
@@ -686,28 +682,29 @@
.filter(id -> id != null).distinct().collect(Collectors.toList());
Map<Integer, TDept> ownerDeptMap = ownerIds.isEmpty() ? java.util.Collections.emptyMap()
: tDeptService.listByIds(ownerIds).stream().collect(Collectors.toMap(TDept::getId, d -> d));
-
+ // 批量查询使用部门
+ List<Integer> useDeptIds = mains.stream().map(OaApprovalApplicationStorageAsset::getUseDeptId)
+ .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ Map<Integer, TDept> useDeptMap = ownerIds.isEmpty() ? Collections.emptyMap()
+ : tDeptService.listByIds(useDeptIds).stream().collect(Collectors.toMap(TDept::getId, d -> d));
+ // 批量查询仓库
+ List<Integer> warehouseIds = mains.stream().map(OaApprovalApplicationStorageAsset::getWarehouseId)
+ .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ Map<Integer, AssetWarehouse> warehouseMap = warehouseIds.isEmpty() ? Collections.emptyMap()
+ : assetWarehouseService.listByIds(useDeptIds).stream().collect(Collectors.toMap(AssetWarehouse::getId, d -> d));
List<OaApprovalApplicationStorageVehicleDetailVO.VehicleAssetItemVO> items = mains.stream().map(m -> {
- OaApprovalApplicationStorageVehicleDetailVO.VehicleAssetItemVO item = new OaApprovalApplicationStorageVehicleDetailVO.VehicleAssetItemVO();
- item.setAssetOriginalCode(m.getAssetOriginalCode());
- item.setAssetName(m.getAssetName());
- item.setSpecificationModel(m.getSpecificationModel());
- item.setMeasurementUnit(m.getMeasurementUnit());
- item.setQuantity(m.getQuantity());
- item.setUnitPrice(m.getUnitPrice());
- item.setUsefulLife(m.getUsefulLife());
+ OaApprovalApplicationStorageVehicleDetailVO.VehicleAssetItemVO item = BeanUtil.copyProperties(m, OaApprovalApplicationStorageVehicleDetailVO.VehicleAssetItemVO.class);
if (m.getOwnershipDeptId() != null) {
TDept dept = ownerDeptMap.get(m.getOwnershipDeptId());
item.setOwnerShipDeptName(dept != null ? dept.getDeptName() : null);
}
- item.setUserName(m.getUserName());
- item.setAssetStatus(m.getAssetStatus());
- item.setRemarks(m.getRemarks());
- item.setAccountingStatus(m.getAccountingStatus());
- item.setAccountingDate(m.getAccountingDate());
- item.setAccountingVoucherNo(m.getAccountingVoucherNo());
- item.setAccountingSubject(m.getAccountingSubject());
- item.setAccountingAmount(m.getAccountingAmount());
+ if (m.getAddressType().equals(0) && m.getUseDeptId() != null) {
+ TDept dept = useDeptMap.get(m.getUseDeptId());
+ item.setUseDeptName(dept != null ? dept.getDeptName() : null);
+ } else if (m.getAddressType().equals(1) && m.getWarehouseId() != null){
+ AssetWarehouse assetWarehouse = warehouseMap.get(m.getWarehouseId());
+ item.setWarehouseName(assetWarehouse != null ? assetWarehouse.getWarehouseName() : null);
+ }
OaApprovalApplicationStorageAssetVehicleExt ext = extMap.get(m.getId());
if (ext != null) {
item.setLicensePlate(ext.getLicensePlate());
@@ -766,51 +763,6 @@
v.setAssetTypeId(storage.getAssetTypeId());
v.setStorageType(storage.getStorageType());
v.setStorageTime(storage.getStorageTime());
- }
- }
-
- private void setAddressInfo(Object vo, List<OaApprovalApplicationStorageAsset> mains) {
- if (CollectionUtils.isEmpty(mains)) {
- return;
- }
- OaApprovalApplicationStorageAsset sample = mains.get(0);
- Integer addressType = null;
- String useDeptName = null;
- String warehouseName = null;
- String address = null;
- switch (sample.getAddressType()) {
- case 0:
- TDept dept = tDeptService.getById(sample.getUseDeptId());
- useDeptName = dept != null ? dept.getDeptName() : null;
- break;
- case 1:
- AssetWarehouse wh = assetWarehouseService.getById(sample.getWarehouseId());
- warehouseName = wh != null ? wh.getWarehouseName() : null;
- break;
- case 2:
- break;
- default:
- return;
- }
-
- if (vo instanceof OaApprovalApplicationStorageGeneralDetailVO) {
- OaApprovalApplicationStorageGeneralDetailVO v = (OaApprovalApplicationStorageGeneralDetailVO) vo;
- v.setAddressType(sample.getAddressType());
- v.setUseDeptName(useDeptName);
- v.setWarehouseName(warehouseName);
- v.setAddress(sample.getAddress());
- } else if (vo instanceof OaApprovalApplicationStoragePropertyDetailVO) {
- OaApprovalApplicationStoragePropertyDetailVO v = (OaApprovalApplicationStoragePropertyDetailVO) vo;
- v.setAddressType(sample.getAddressType());
- v.setUseDeptName(useDeptName);
- v.setWarehouseName(warehouseName);
- v.setAddress(sample.getAddress());
- } else if (vo instanceof OaApprovalApplicationStorageVehicleDetailVO) {
- OaApprovalApplicationStorageVehicleDetailVO v = (OaApprovalApplicationStorageVehicleDetailVO) vo;
- v.setAddressType(sample.getAddressType());
- v.setUseDeptName(useDeptName);
- v.setWarehouseName(warehouseName);
- v.setAddress(sample.getAddress());
}
}
--
Gitblit v1.7.1