From 7b7a2cc050d55af2eed2cccb3761a91314c9b9f6 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 30 四月 2026 15:07:32 +0800
Subject: [PATCH] feat:1.产品维护,增加产品编号字段 2.入库批号添加 3.是否质检仅添加入库记录（待审核） 4.是否生产报工更改 5.入库做审核
---
src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java | 64 +++++++++++++++++++------------
1 files changed, 39 insertions(+), 25 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 8a0aa53..897e569 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
@@ -4,6 +4,9 @@
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.basic.enums.ApplicationTypeEnum;
+import com.ruoyi.basic.enums.RecordTypeEnum;
+import com.ruoyi.basic.utils.FileUtil;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.device.dto.DeviceDefectRecordDto;
@@ -15,6 +18,7 @@
import com.ruoyi.device.service.DeviceDefectRecordService;
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceRepairService;
+import com.ruoyi.device.vo.DeviceRepairVo;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.measuringinstrumentledger.mapper.SparePartsMapper;
import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
@@ -42,33 +46,40 @@
private final IDeviceLedgerService deviceLedgerService;
private final SparePartsMapper sparePartsMapper;
private final SparePartsRequisitionRecordService sparePartsRequisitionRecordService;
+ private final FileUtil fileUtil;
@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();
+ public IPage<DeviceRepairVo> queryPage(Page page, DeviceRepairDto deviceRepairDto) {
+ IPage<DeviceRepairVo> pageDto = deviceRepairMapper.queryPage(page, deviceRepairDto);
+ for (DeviceRepairVo vo : pageDto.getRecords()) {
+ vo.setStorageBlobVOs(fileUtil.getStorageBlobVOsByRecordTypeAndRecordId(RecordTypeEnum.DEVICE_REPAIR, vo.getId()));
}
- return AjaxResult.error();
+ return pageDto;
}
@Override
@Transactional(rollbackFor = Exception.class)
- public AjaxResult updateDeviceRepair(DeviceRepair deviceRepair) {
- DeviceRepair oldDeviceRepair = this.getById(deviceRepair.getId());
+ public AjaxResult saveDeviceRepair(DeviceRepairDto deviceRepairDto) {
+ DeviceLedger byId = deviceLedgerService.getById(deviceRepairDto.getDeviceLedgerId());
+ deviceRepairDto.setDeviceName(byId.getDeviceName());
+ deviceRepairDto.setDeviceModel(byId.getDeviceModel());
+ boolean save = this.save(deviceRepairDto);
+ if (save) {
+ // 澶勭悊鍥剧墖涓婁紶
+ fileUtil.saveStorageAttachmentByRecordTypeAndRecordId("file", RecordTypeEnum.DEVICE_REPAIR, deviceRepairDto.getId(), deviceRepairDto.getStorageBlobDTOs());
+ return AjaxResult.success();
+ }
+ return AjaxResult.error("淇濆瓨澶辫触");
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public AjaxResult updateDeviceRepair(DeviceRepairDto deviceRepairDto) {
+ DeviceRepair oldDeviceRepair = this.getById(deviceRepairDto.getId());
// 澶勭悊澶囦欢浣跨敤鎯呭喌
- if (CollectionUtils.isNotEmpty(deviceRepair.getSparePartsUseList())) {
+ if (CollectionUtils.isNotEmpty(deviceRepairDto.getSparePartsUseList())) {
List<Long> sparePartIds = new ArrayList<>();
- for (DeviceRepair.SparePartUse sparePartUse : deviceRepair.getSparePartsUseList()) {
+ for (DeviceRepairDto.SparePartUse sparePartUse : deviceRepairDto.getSparePartsUseList()) {
// 鑾峰彇澶囦欢淇℃伅
SpareParts spareParts = sparePartsMapper.selectById(sparePartUse.getId());
if (spareParts != null) {
@@ -82,7 +93,7 @@
// 鍒涘缓澶囦欢棰嗙敤璁板綍
SparePartsRequisitionRecord record = new SparePartsRequisitionRecord();
record.setSourceType(0); // 0 缁翠慨
- record.setSourceId(deviceRepair.getId());
+ record.setSourceId(deviceRepairDto.getId());
record.setDeviceLedgerId(oldDeviceRepair.getDeviceLedgerId());
record.setSparePartsId(sparePartUse.getId());
record.setQuantity(sparePartUse.getQuantity());
@@ -94,12 +105,12 @@
}
// 鏇存柊澶囦欢IDs瀛楁
if (!sparePartIds.isEmpty()) {
- deviceRepair.setSparePartsIds(StringUtils.join(sparePartIds, ","));
+ deviceRepairDto.setSparePartsIds(StringUtils.join(sparePartIds, ","));
}
}
- if (this.updateById(deviceRepair)) {
- Long id = deviceRepair.getId();
+ if (this.updateById(deviceRepairDto)) {
+ Long id = deviceRepairDto.getId();
//
DeviceDefectRecordDto deviceDefectRecordDto = new DeviceDefectRecordDto();
deviceDefectRecordDto.setDeviceLedgerId(id);
@@ -111,6 +122,8 @@
deviceDefectRecordService.updateByDDR(deviceDefectRecord);
});
}
+ // 澶勭悊鍥剧墖涓婁紶
+ fileUtil.saveStorageAttachmentByRecordTypeAndRecordId("file", RecordTypeEnum.DEVICE_REPAIR, id, deviceRepairDto.getStorageBlobDTOs());
return AjaxResult.success();
}
return AjaxResult.error();
@@ -151,9 +164,10 @@
}
@Override
- public DeviceRepairDto detailById(Long id) {
-
- return deviceRepairMapper.detailById(id);
+ public DeviceRepairVo detailById(Long id) {
+ DeviceRepairVo vo = deviceRepairMapper.detailById(id);
+ vo.setStorageBlobVOs(fileUtil.getStorageBlobVOsByRecordTypeAndRecordId(RecordTypeEnum.DEVICE_REPAIR, id));
+ return vo;
}
}
--
Gitblit v1.9.3