From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java
index 961e759..1cee7de 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java
@@ -6,7 +6,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.enums.FileNameType;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.purchase.dto.ProductRecordDto;
import com.ruoyi.purchase.dto.TicketRegistrationDto;
import com.ruoyi.purchase.mapper.ProductRecordMapper;
@@ -67,9 +67,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public AjaxResult updateRecord(ProductRecordDto productRecordDto) {
+ public R<?> updateRecord(ProductRecordDto productRecordDto) {
ProductRecord productRecord = productRecordMapper.selectById(productRecordDto.getId());
- if (productRecord == null) return AjaxResult.error("璁板綍涓嶅瓨鍦�");
+ if (productRecord == null) return R.fail("璁板綍涓嶅瓨鍦�");
// 鏇存柊浜у搧鍙拌处
SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(productRecord.getSaleLedgerProjectId());
@@ -110,7 +110,7 @@
productRecord.setFutureTicketsAmount(productRecord.getFutureTickets().multiply(productRecord.getTaxInclusiveUnitPrice()));
productRecordMapper.updateById(productRecord);
- return AjaxResult.success("淇敼鎴愬姛");
+ return R.ok(null, "淇敼鎴愬姛");
}
@Override
--
Gitblit v1.9.3