From f32de021e7af1627b6d18e681b46dbc0a5b108f8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 21 四月 2026 13:33:04 +0800
Subject: [PATCH] feat: 设备台账与工序进行绑定
---
src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
index 444993c..f9ed796 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
@@ -2,18 +2,18 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.device.dto.DeviceAssetInfoDto;
import com.ruoyi.device.dto.DeviceLedgerDto;
import com.ruoyi.device.execl.DeviceLedgerExeclDto;
import com.ruoyi.device.mapper.DeviceLedgerMapper;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.service.IDeviceLedgerService;
+import com.ruoyi.production.mapper.ProductProcessMapper;
+import com.ruoyi.production.pojo.ProductProcess;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
@@ -25,8 +25,6 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.math.BigDecimal;
-import java.time.ZoneOffset;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -40,15 +38,21 @@
private DeviceLedgerMapper deviceLedgerMapper;
@Autowired
private SysUserMapper sysUserMapper;
+ @Autowired
+ private ProductProcessMapper productProcessMapper;
@Override
- public IPage<DeviceLedgerDto> queryPage(Page page, DeviceLedgerDto deviceLedger) {
+ public IPage<DeviceLedgerDto> queryPage(Page<?> page, DeviceLedgerDto deviceLedger) {
return deviceLedgerMapper.queryPage(page, deviceLedger);
}
@Override
public AjaxResult saveDeviceLedger(DeviceLedger deviceLedger) {
+ AjaxResult processCheckResult = validateProductProcess(deviceLedger.getProductProcessId());
+ if (processCheckResult != null) {
+ return processCheckResult;
+ }
LambdaQueryWrapper<DeviceLedger> deviceLedgerLambdaQueryWrapper = new LambdaQueryWrapper<>();
deviceLedgerLambdaQueryWrapper.eq(DeviceLedger::getDeviceName,deviceLedger.getDeviceName());
if (this.count(deviceLedgerLambdaQueryWrapper) > 0) {
@@ -63,10 +67,30 @@
@Override
public AjaxResult updateDeviceLedger(DeviceLedger deviceLedger) {
+ AjaxResult processCheckResult = validateProductProcess(deviceLedger.getProductProcessId());
+ if (processCheckResult != null) {
+ return processCheckResult;
+ }
if (this.updateById(deviceLedger)) {
return AjaxResult.success();
}
return AjaxResult.error();
+ }
+
+ @Override
+ public DeviceLedger getDetailById(Long id) {
+ return deviceLedgerMapper.selectById1(id);
+ }
+
+ private AjaxResult validateProductProcess(Long productProcessId) {
+ if (productProcessId == null) {
+ return null;
+ }
+ ProductProcess productProcess = productProcessMapper.selectById(productProcessId);
+ if (productProcess == null) {
+ return AjaxResult.error("宸ュ簭涓嶅瓨鍦紝璇烽噸鏂伴�夋嫨");
+ }
+ return null;
}
@Override
@@ -120,15 +144,5 @@
});
return true;
- }
- @Override
- public DeviceAssetInfoDto report() {
- List<DeviceLedger> list = deviceLedgerMapper.selectList(null);
- DeviceAssetInfoDto deviceAssetInfoDto = new DeviceAssetInfoDto();
- deviceAssetInfoDto.setTotalEquipment(list.stream().map(DeviceLedger::getNumber).reduce(BigDecimal.ZERO, BigDecimal::add).intValue());
- deviceAssetInfoDto.setTotalOriginalValue(list.stream().map(DeviceLedger::getTaxIncludingPriceTotal).reduce(BigDecimal.ZERO, BigDecimal::add));
- deviceAssetInfoDto.setTotalNetValue(list.stream().map(DeviceLedger::getUnTaxIncludingPriceTotal).reduce(BigDecimal.ZERO, BigDecimal::add));
- deviceAssetInfoDto.setTotalDepreciation(deviceAssetInfoDto.getTotalOriginalValue().subtract(deviceAssetInfoDto.getTotalNetValue()));
- return deviceAssetInfoDto;
}
}
--
Gitblit v1.9.3