From 46944d762174e5b7e7a627c59928e2a3c9e03dd4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 30 五月 2026 15:23:11 +0800
Subject: [PATCH] feat(quality): 增加检验管理功能并完善库存预警
---
src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
index fbf03ad..803450a 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
@@ -11,12 +11,15 @@
import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.execl.DeviceMaintenanceExeclDto;
import com.ruoyi.device.mapper.DeviceMaintenanceMapper;
+import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.pojo.DeviceMaintenance;
+import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceMaintenanceService;
import com.ruoyi.device.vo.DeviceMaintenanceVo;
import com.ruoyi.device.vo.DeviceRepairVo;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.measuringinstrumentledger.mapper.SparePartsMapper;
+import com.ruoyi.project.system.service.ISysNoticeService;
import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
import com.ruoyi.measuringinstrumentledger.pojo.SparePartsRequisitionRecord;
import com.ruoyi.measuringinstrumentledger.service.SparePartsRequisitionRecordService;
@@ -36,9 +39,11 @@
public class DeviceMaintenanceServiceImpl extends ServiceImpl<DeviceMaintenanceMapper, DeviceMaintenance> implements IDeviceMaintenanceService {
private final DeviceMaintenanceMapper deviceMaintenanceMapper;
+ private final IDeviceLedgerService deviceLedgerService;
private final SparePartsMapper sparePartsMapper;
private final SparePartsRequisitionRecordService sparePartsRequisitionRecordService;
private final FileUtil fileUtil;
+ private final ISysNoticeService sysNoticeService;
@Override
public IPage<DeviceMaintenanceDto> queryPage(Page page, DeviceMaintenanceDto deviceMaintenanceDto) {
@@ -49,6 +54,12 @@
@Override
@Transactional(rollbackFor = Exception.class)
public AjaxResult saveDeviceRepair(DeviceMaintenanceDto deviceMaintenance) {
+ DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
+ if (byId != null) {
+ deviceMaintenance.setDeviceName(byId.getDeviceName());
+ deviceMaintenance.setDeviceModel(byId.getDeviceModel());
+ deviceMaintenance.setAreaId(byId.getAreaId());
+ }
boolean save = this.save(deviceMaintenance);
if (save){
// 澶勭悊鍥剧墖涓婁紶
@@ -62,6 +73,15 @@
@Transactional(rollbackFor = Exception.class)
public AjaxResult updateDeviceDeviceMaintenance(DeviceMaintenanceDto deviceMaintenance) {
DeviceMaintenance oldDeviceMaintenance = this.getById(deviceMaintenance.getId());
+ Long effectiveDeviceLedgerId = deviceMaintenance.getDeviceLedgerId() != null
+ ? deviceMaintenance.getDeviceLedgerId()
+ : oldDeviceMaintenance.getDeviceLedgerId();
+ DeviceLedger byId = deviceLedgerService.getById(effectiveDeviceLedgerId);
+ if (byId != null) {
+ deviceMaintenance.setDeviceName(byId.getDeviceName());
+ deviceMaintenance.setDeviceModel(byId.getDeviceModel());
+ deviceMaintenance.setAreaId(byId.getAreaId());
+ }
// 澶勭悊澶囦欢浣跨敤鎯呭喌
if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(deviceMaintenance.getSparePartsUseList())) {
List<Long> sparePartIds = new ArrayList<>();
@@ -76,6 +96,18 @@
sparePartsMapper.updateById(spareParts);
sparePartIds.add(sparePartUse.getId());
+ // 搴撳瓨棰勮閫氱煡
+ if (spareParts.getWarnNum() != null && spareParts.getNotifyPersonId() != null
+ && spareParts.getQuantity().compareTo(spareParts.getWarnNum()) < 0) {
+ sysNoticeService.simpleNoticeByUser(
+ "澶囦欢搴撳瓨棰勮",
+ "澶囦欢銆�" + spareParts.getName() + "銆戝綋鍓嶅簱瀛�(" + spareParts.getQuantity()
+ + ")宸蹭綆浜庨璀︽暟閲�(" + spareParts.getWarnNum() + ")锛岃鍙婃椂閲囪喘琛ュ厖銆�",
+ List.of(spareParts.getNotifyPersonId()),
+ "/equipmentManagement/spareParts"
+ );
+ }
+
// 鍒涘缓澶囦欢棰嗙敤璁板綍
SparePartsRequisitionRecord record = new SparePartsRequisitionRecord();
record.setSourceType(1); // 1 淇濆吇
--
Gitblit v1.9.3