From 4035416559e2002937806364b398df94587daaf2 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 02 四月 2026 17:56:18 +0800
Subject: [PATCH] 增加领用记录列表接口，维修后生成领用记录
---
src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java | 100 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 92 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
index 0293956..a2c3ee4 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
@@ -1,11 +1,12 @@
package com.ruoyi.device.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.xiaoymin.knife4j.core.util.StrUtil;
-import com.google.common.collect.Lists;
+import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.device.dto.DeviceDefectRecordDto;
@@ -20,16 +21,21 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.measuringinstrumentledger.mapper.SparePartsMapper;
import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
-import com.ruoyi.measuringinstrumentledger.service.SparePartsService;
+import com.ruoyi.measuringinstrumentledger.pojo.SparePartsRequisitionRecord;
+import com.ruoyi.measuringinstrumentledger.service.SparePartsRequisitionRecordService;
+import com.ruoyi.other.pojo.TempFile;
+import com.ruoyi.other.service.TempFileService;
+import com.ruoyi.sales.mapper.CommonFileMapper;
+import com.ruoyi.sales.pojo.CommonFile;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Pair;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
+import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -46,12 +52,22 @@
private IDeviceLedgerService deviceLedgerService;
@Autowired
private SparePartsMapper sparePartsMapper;
+ @Autowired
+ private TempFileService tempFileService;
+ @Autowired
+ private CommonFileMapper commonFileMapper;
+ @Autowired
+ private SparePartsRequisitionRecordService sparePartsRequisitionRecordService;
@Override
public IPage<DeviceRepairDto> queryPage(Page page, DeviceRepairDto deviceRepairDto) {
IPage<DeviceRepairDto> deviceRepairDtoIPage = deviceRepairMapper.queryPage(page, deviceRepairDto);
List<DeviceRepairDto> records = deviceRepairDtoIPage.getRecords();
+ List<Long> recordIds = records.stream()
+ .map(DeviceRepairDto::getId)
+ .collect(Collectors.toList());
+
if (!CollectionUtils.isEmpty(records)) {
// 1. 鑾峰彇鎵�鏈夊敮涓�鐨勫浠禝D
Set<String> allIds = records.stream()
@@ -86,6 +102,12 @@
record.setSparePartsNames(names);
});
}
+ // 澶勭悊鏂囦欢
+ List<CommonFile> commonFiles = commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>().in(CommonFile::getCommonId, recordIds)
+ .eq(CommonFile::getType, FileNameType.DeviceRepair.getValue()));
+ Map<Long, List<CommonFile>> collect = commonFiles.stream()
+ .collect(Collectors.groupingBy(CommonFile::getCommonId));
+ records.forEach(record -> record.setFileList(collect.get(record.getId())));
}
return deviceRepairDtoIPage;
@@ -96,16 +118,73 @@
DeviceLedger byId = deviceLedgerService.getById(deviceRepair.getDeviceLedgerId());
deviceRepair.setDeviceName(byId.getDeviceName());
deviceRepair.setDeviceModel(byId.getDeviceModel());
+ if (deviceRepair.getRemark() == null) {
+ deviceRepair.setRemark("");
+ }
boolean save = this.save(deviceRepair);
if (save) {
+ if (CollectionUtils.isNotEmpty(deviceRepair.getFileList())) {
+ List<String> fileIds = deviceRepair.getFileList().stream()
+ .map(TempFile::getTempId)
+ .collect(Collectors.toList());
+ try {
+ tempFileService.migrateTempFilesToFormal(deviceRepair.getId(), fileIds, FileNameType.DeviceRepair.getValue());
+ } catch (Exception e) {
+ log.error("璁惧缁翠慨鏂囦欢杩佺Щ閿欒", e);
+ }
+ }
return AjaxResult.success();
}
return AjaxResult.error();
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public AjaxResult updateDeviceRepair(DeviceRepair deviceRepair) {
+ // 澶勭悊澶囦欢浣跨敤鎯呭喌
+ if (CollectionUtils.isNotEmpty(deviceRepair.getSparePartsUseList())) {
+ List<Long> sparePartIds = new ArrayList<>();
+ for (DeviceRepair.SparePartUse sparePartUse : deviceRepair.getSparePartsUseList()) {
+ // 鑾峰彇澶囦欢淇℃伅
+ SpareParts spareParts = sparePartsMapper.selectById(sparePartUse.getId());
+ if (spareParts != null) {
+ // 妫�鏌ユ暟閲忔槸鍚﹁冻澶�
+ if (spareParts.getQuantity().compareTo(new BigDecimal(sparePartUse.getQuantity())) >= 0) {
+ // 鏇存柊鏁伴噺
+ spareParts.setQuantity(spareParts.getQuantity().subtract(new BigDecimal(sparePartUse.getQuantity())));
+ sparePartsMapper.updateById(spareParts);
+ sparePartIds.add(sparePartUse.getId());
+
+ // 鍒涘缓澶囦欢棰嗙敤璁板綍
+ SparePartsRequisitionRecord record = new SparePartsRequisitionRecord();
+ record.setSourceType(0); // 0 缁翠慨
+ record.setSourceId(deviceRepair.getId());
+ record.setDeviceLedgerId(deviceRepair.getDeviceLedgerId());
+ record.setSparePartsId(sparePartUse.getId());
+ record.setQuantity(sparePartUse.getQuantity());
+ sparePartsRequisitionRecordService.save(record);
+ } else {
+ return AjaxResult.error("澶囦欢 " + spareParts.getName() + " 鏁伴噺涓嶈冻");
+ }
+ }
+ }
+ // 鏇存柊澶囦欢IDs瀛楁
+ if (!sparePartIds.isEmpty()) {
+ deviceRepair.setSparePartsIds(StringUtils.join(sparePartIds, ","));
+ }
+ }
+
if (this.updateById(deviceRepair)) {
+ if (CollectionUtils.isNotEmpty(deviceRepair.getFileList())) {
+ List<String> fileIds = deviceRepair.getFileList().stream()
+ .map(TempFile::getTempId)
+ .collect(Collectors.toList());
+ try {
+ tempFileService.migrateTempFilesToFormal(deviceRepair.getId(), fileIds, FileNameType.DeviceRepair.getValue());
+ } catch (Exception e) {
+ log.error("璁惧缁翠慨鏂囦欢杩佺Щ閿欒", e);
+ }
+ }
Long id = deviceRepair.getId();
//
DeviceDefectRecordDto deviceDefectRecordDto = new DeviceDefectRecordDto();
@@ -157,8 +236,13 @@
@Override
public DeviceRepairDto detailById(Long id) {
-
- return deviceRepairMapper.detailById(id);
+ DeviceRepairDto deviceRepairDto = deviceRepairMapper.detailById(id);
+ LambdaQueryWrapper<CommonFile> queryWrapper = new LambdaQueryWrapper<CommonFile>()
+ .eq(CommonFile::getCommonId, deviceRepairDto.getId()) // 鍏宠仈璁板綍ID
+ .eq(CommonFile::getType, FileNameType.DeviceRepair.getValue()); // 鏂囦欢绫诲瀷
+ List<CommonFile> commonFiles = commonFileMapper.selectList(queryWrapper);
+ deviceRepairDto.setFileList(commonFiles);
+ return deviceRepairDto;
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3