From a64774b3898c4ce8e7d3aa0ccc3c4ee92861d2a6 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 21 五月 2026 15:03:51 +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 | 30 +++++++++---------------------
1 files changed, 9 insertions(+), 21 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 fda5910..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,24 +6,20 @@
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;
-import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.mapper.TicketRegistrationMapper;
import com.ruoyi.purchase.pojo.ProductRecord;
-import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.purchase.pojo.TicketRegistration;
import com.ruoyi.purchase.service.IProductRecordService;
import com.ruoyi.sales.mapper.CommonFileMapper;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -37,20 +33,12 @@
* @date 2025-05-23
*/
@Service
-@AllArgsConstructor
+@RequiredArgsConstructor
public class ProductRecordServiceImpl extends ServiceImpl<ProductRecordMapper, ProductRecord> implements IProductRecordService {
- @Autowired
- private ProductRecordMapper productRecordMapper;
-
- @Autowired
- private CommonFileMapper commonFileMapper;
- @Autowired
- private SalesLedgerProductMapper salesLedgerProductMapper;
- @Autowired
- private PurchaseLedgerMapper purchaseLedgerMapper;
-
-
+ private final SalesLedgerProductMapper salesLedgerProductMapper;
+ private final ProductRecordMapper productRecordMapper;
+ private final CommonFileMapper commonFileMapper;
/**
* 鏌ヨ閲囪喘鍙拌处浜у搧寮�绁ㄨ褰�
*
@@ -79,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());
@@ -122,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