From d17d4d1ac98865d2a71b4f24771b7b76e0839ed3 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 10 四月 2026 14:08:41 +0800
Subject: [PATCH] yys 1.设备区域 2.设备巡检，维保，保养多选 3.数采
---
src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java | 137 ++++++++++++++++++++++++++++++++-------------
1 files changed, 96 insertions(+), 41 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 feab01b..f0606eb 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
@@ -3,6 +3,7 @@
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.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.device.dto.DeviceDefectRecordDto;
@@ -15,18 +16,23 @@
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceRepairService;
import com.ruoyi.framework.web.domain.AjaxResult;
-import lombok.AllArgsConstructor;
+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 lombok.extern.slf4j.Slf4j;
+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.ArrayList;
import java.util.Arrays;
import java.util.List;
@Service
-@AllArgsConstructor
@Slf4j
public class DeviceRepairServiceImpl extends ServiceImpl<DeviceRepairMapper, DeviceRepair> implements IDeviceRepairService {
@@ -36,34 +42,66 @@
private DeviceRepairMapper deviceRepairMapper;
@Autowired
private IDeviceLedgerService deviceLedgerService;
+ @Autowired
+ private SparePartsMapper sparePartsMapper;
+ @Autowired
+ private SparePartsRequisitionRecordService sparePartsRequisitionRecordService;
+
@Override
public IPage<DeviceRepairDto> queryPage(Page page, DeviceRepairDto deviceRepairDto) {
-
return deviceRepairMapper.queryPage(page, deviceRepairDto);
}
@Override
public AjaxResult saveDeviceRepair(DeviceRepair deviceRepair) {
- DeviceLedger byId = deviceLedgerService.getById(deviceRepair.getDeviceLedgerId());
- deviceRepair.setDeviceName(byId.getDeviceName());
- deviceRepair.setDeviceModel(byId.getDeviceModel());
- boolean save = this.save(deviceRepair);
- if (save){
- return AjaxResult.success();
+ List<DeviceRepair> records = buildRepairRecords(deviceRepair);
+ if (records.isEmpty()) {
+ return AjaxResult.error("璇烽�夋嫨璁惧");
}
- return AjaxResult.error();
+ return this.saveBatch(records) ? AjaxResult.success() : AjaxResult.error();
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public AjaxResult updateDeviceRepair(DeviceRepair deviceRepair) {
+ DeviceRepair oldDeviceRepair = this.getById(deviceRepair.getId());
+ if (oldDeviceRepair == null) {
+ return AjaxResult.error("鎶ヤ慨璁板綍涓嶅瓨鍦�");
+ }
+ 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);
+ 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() + " 鏁伴噺涓嶈冻");
+ }
+ }
+ }
+ if (!sparePartIds.isEmpty()) {
+ deviceRepair.setSparePartsIds(StringUtils.join(sparePartIds, ","));
+ }
+ }
+
if (this.updateById(deviceRepair)) {
Long id = deviceRepair.getId();
- //
DeviceDefectRecordDto deviceDefectRecordDto = new DeviceDefectRecordDto();
deviceDefectRecordDto.setDeviceLedgerId(id);
deviceDefectRecordDto.setStatus("涓ラ噸缂洪櫡");
List<DeviceDefectRecordDto> records = deviceDefectRecordService.listPage(new Page<>(1, -1), deviceDefectRecordDto).getRecords();
- if (!records.isEmpty()){
+ if (!records.isEmpty()) {
records.forEach(deviceDefectRecord -> {
deviceDefectRecord.setStatus("姝ｅ父");
deviceDefectRecordService.updateByDDR(deviceDefectRecord);
@@ -76,42 +114,59 @@
@Override
public void export(HttpServletResponse response, Long[] ids) {
+ List<DeviceRepair> supplierManageList;
if (ids == null || ids.length == 0) {
- List<DeviceRepair> supplierManageList = this.list();
- ArrayList<DeviceRepairExeclDto> deviceLedgerExeclDtos = new ArrayList<>();
- supplierManageList.stream().forEach(deviceRepair -> {
- DeviceRepairExeclDto deviceRepairExeclDto = new DeviceRepairExeclDto();
- BeanUtils.copyProperties(deviceRepair,deviceRepairExeclDto);
- deviceRepairExeclDto.setStatusStr(deviceRepair.getStatus() == 0 ? "寰呯淮淇�" : deviceRepair.getStatus() == 1 ? "瀹岀粨" : "澶辫触");
-
- deviceLedgerExeclDtos.add(deviceRepairExeclDto);
- });
- ExcelUtil<DeviceRepairExeclDto> util = new ExcelUtil<DeviceRepairExeclDto>(DeviceRepairExeclDto.class);
- util.exportExcel(response, deviceLedgerExeclDtos, "璁惧鎶ヤ慨瀵煎嚭");
- }else {
- ArrayList<Long> arrayList = new ArrayList<>();
- Arrays.stream(ids).map(id -> {
- return arrayList.add( id);
- });
- List<DeviceRepair> supplierManageList = deviceRepairMapper.selectBatchIds(arrayList);
- ArrayList<DeviceRepairExeclDto> deviceLedgerExeclDtos = new ArrayList<>();
- supplierManageList.stream().forEach(deviceRepair -> {
- DeviceRepairExeclDto deviceRepairExeclDto = new DeviceRepairExeclDto();
- BeanUtils.copyProperties(deviceRepair,deviceRepairExeclDto);
- deviceRepairExeclDto.setStatusStr(deviceRepair.getStatus() == 0 ? "寰呯淮淇�" : deviceRepair.getStatus() == 1 ? "瀹岀粨" : "澶辫触");
-
- deviceLedgerExeclDtos.add(deviceRepairExeclDto);
- });
- ExcelUtil<DeviceRepairExeclDto> util = new ExcelUtil<DeviceRepairExeclDto>(DeviceRepairExeclDto.class);
- util.exportExcel(response, deviceLedgerExeclDtos, "璁惧鎶ヤ慨瀵煎嚭");
+ supplierManageList = this.list();
+ } else {
+ supplierManageList = deviceRepairMapper.selectBatchIds(Arrays.asList(ids));
}
-
+ ArrayList<DeviceRepairExeclDto> result = new ArrayList<>();
+ supplierManageList.forEach(deviceRepair -> {
+ DeviceRepairExeclDto dto = new DeviceRepairExeclDto();
+ BeanUtils.copyProperties(deviceRepair, dto);
+ dto.setStatusStr(deviceRepair.getStatus() == 0 ? "寰呯淮淇�" : deviceRepair.getStatus() == 1 ? "瀹岀粨" : "澶辫触");
+ result.add(dto);
+ });
+ ExcelUtil<DeviceRepairExeclDto> util = new ExcelUtil<>(DeviceRepairExeclDto.class);
+ util.exportExcel(response, result, "璁惧鎶ヤ慨瀵煎嚭");
}
@Override
public DeviceRepairDto detailById(Long id) {
-
return deviceRepairMapper.detailById(id);
}
+ private List<DeviceRepair> buildRepairRecords(DeviceRepair source) {
+ Long[] deviceIds = source.getDeviceLedgerIds();
+ if (deviceIds == null || deviceIds.length == 0) {
+ deviceIds = source.getDeviceLedgerId() == null ? new Long[0] : new Long[]{source.getDeviceLedgerId()};
+ }
+ List<DeviceRepair> records = new ArrayList<>();
+ Arrays.stream(deviceIds).distinct().forEach(deviceId -> {
+ DeviceLedger deviceLedger = deviceLedgerService.getById(deviceId);
+ if (deviceLedger == null) {
+ return;
+ }
+ int quantity = resolveQuantity(deviceLedger);
+ for (int i = 0; i < quantity; i++) {
+ DeviceRepair record = new DeviceRepair();
+ BeanUtils.copyProperties(source, record);
+ record.setId(null);
+ record.setDeviceLedgerIds(null);
+ record.setDeviceLedgerId(deviceLedger.getId());
+ record.setAreaId(deviceLedger.getAreaId());
+ record.setDeviceName(deviceLedger.getDeviceName());
+ record.setDeviceModel(deviceLedger.getDeviceModel());
+ records.add(record);
+ }
+ });
+ return records;
+ }
+
+ private int resolveQuantity(DeviceLedger deviceLedger) {
+ if (deviceLedger == null || deviceLedger.getNumber() == null || deviceLedger.getNumber().compareTo(BigDecimal.ONE) < 0) {
+ return 1;
+ }
+ return Math.max(1, deviceLedger.getNumber().intValue());
+ }
}
--
Gitblit v1.9.3