From 47806d9e390ee00e1d29ad1da8c1aa908882a758 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 11 八月 2026 14:43:59 +0800
Subject: [PATCH] 用河南鹤壁代码覆盖山西长治
---
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
index 3fc8d0f..cd81a8a 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -7,11 +7,12 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.mapper.ProductModelMapper;
import com.ruoyi.basic.pojo.ProductModel;
+import com.ruoyi.common.utils.AmountUtils;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.procurementrecord.bean.dto.*;
import com.ruoyi.procurementrecord.mapper.CustomStorageMapper;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordMapper;
@@ -525,10 +526,10 @@
private final CustomStorageMapper customStorageMapper;
@Override
- public R<?> addCustom(List<CustomStorage> customStorage) {
+ public AjaxResult addCustom(List<CustomStorage> customStorage) {
LoginUser loginUser = SecurityUtils.getLoginUser();
if(CollectionUtils.isEmpty(customStorage)){
- return R.fail("鏁版嵁涓嶈兘涓虹┖");
+ return AjaxResult.error("鏁版嵁涓嶈兘涓虹┖");
}
customStorage.forEach(item -> {
// 鏌ヨ閲囪喘鍏ュ簱鏁伴噺
@@ -538,7 +539,7 @@
item.setCode(OrderUtils.countTodayByCreateTime(customStorageMapper, "", "code"));
customStorageMapper.insert(item);
});
- return R.ok(null, "鑷畾涔夊叆搴撴垚鍔�");
+ return AjaxResult.success("鑷畾涔夊叆搴撴垚鍔�");
}
@Override
@@ -708,7 +709,9 @@
dto.setInboundNum0(dto.getInboundNum().subtract(totalInboundNum));
// 搴撳瓨浠峰��
if(dto.getTaxInclusiveUnitPrice() != null){
- dto.setTaxInclusiveTotalPrice(dto.getInboundNum0().multiply(dto.getTaxInclusiveUnitPrice()));
+ dto.setTaxInclusiveTotalPrice(AmountUtils.scaleAmount(
+ dto.getInboundNum0().multiply(dto.getTaxInclusiveUnitPrice())
+ ));
}
}
pageList.setRecords(procurementPageDtoCopyList);
@@ -716,13 +719,13 @@
}
@Override
- public R<?> updateCustom(CustomStorage customStorage) {
- return R.ok(customStorageMapper.updateById(customStorage));
+ public AjaxResult updateCustom(CustomStorage customStorage) {
+ return AjaxResult.success(customStorageMapper.updateById(customStorage));
}
@Override
- public R<?> deleteCustom(List<Long> ids) {
- return R.ok(customStorageMapper.deleteBatchIds(ids));
+ public AjaxResult deleteCustom(List<Long> ids) {
+ return AjaxResult.success(customStorageMapper.deleteBatchIds(ids));
}
@Override
--
Gitblit v1.9.3