增加领用记录列表接口，维修后生成领用记录

huminmin

17 小时以前 522b9cd4cd7f38f88fe77cb9b9f2c5f7197eed29

 src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java

@@ -21,6 +21,8 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.measuringinstrumentledger.mapper.SparePartsMapper;
import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
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;
@@ -30,8 +32,10 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;

@@ -52,6 +56,8 @@
    private TempFileService tempFileService;
    @Autowired
    private CommonFileMapper commonFileMapper;
    @Autowired
    private SparePartsRequisitionRecordService sparePartsRequisitionRecordService;

    @Override
    public IPage<DeviceRepairDto> queryPage(Page page, DeviceRepairDto deviceRepairDto) {
@@ -110,28 +116,65 @@
    @Override
    public AjaxResult saveDeviceRepair(DeviceRepair deviceRepair) {
        DeviceLedger byId = deviceLedgerService.getById(deviceRepair.getDeviceLedgerId());
        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);
            }
        }

        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) {
        DeviceRepair oldDeviceRepair = this.getById(deviceRepair.getId());
        // 处理备件使用情况
        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(oldDeviceRepair.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()
@@ -194,8 +237,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;
    }

}
}