From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java | 40 +++++++++++++++++++---------------------
1 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java
index 3f5aca6..996970d 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java
@@ -4,21 +4,20 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
import com.ruoyi.purchase.mapper.PurchaseLedgerTemplateMapper;
import com.ruoyi.purchase.mapper.SalesLedgerProductTemplateMapper;
import com.ruoyi.purchase.pojo.PurchaseLedgerTemplate;
import com.ruoyi.purchase.pojo.SalesLedgerProductTemplate;
-import com.ruoyi.purchase.service.PurchaseLedgerTemplateService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.AllArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.HashMap;
import java.util.List;
/**
@@ -31,19 +30,17 @@
*/
@RestController
@RequestMapping("/purchaseLedgerTemplate")
-@Api(tags = "閲囪喘鍙拌处妯℃澘")
-public class PurchaseLedgerTemplateController {
+@Tag(name = "閲囪喘鍙拌处妯℃澘")
+@AllArgsConstructor
+public class PurchaseLedgerTemplateController extends BaseController {
- @Autowired
private PurchaseLedgerTemplateMapper purchaseLedgerTemplateMapper;
-
- @Autowired
private SalesLedgerProductTemplateMapper salesLedgerProductTemplateMapper;
@PostMapping("/add")
@Log(title = "娣诲姞閲囪喘鍙拌处妯℃澘", businessType = BusinessType.INSERT)
- @ApiOperation(value = "娣诲姞閲囪喘鍙拌处妯℃澘")
- public AjaxResult add(@RequestBody PurchaseLedgerDto purchaseLedgerDto) {
+ @Operation(summary = "娣诲姞閲囪喘鍙拌处妯℃澘")
+ public R<?> add(@RequestBody PurchaseLedgerDto purchaseLedgerDto) {
// 閲囪喘妯℃澘
if(StringUtils.isNotEmpty(purchaseLedgerDto.getTemplateName())){
// 妯℃澘鍚嶇О涓嶈兘閲嶅锛屾湁閲嶅灏变笉闇�瑕佹柊澧炰簡
@@ -67,24 +64,24 @@
});
}
}
- return AjaxResult.success();
+ return R.ok();
}
@DeleteMapping("/delete")
@Log(title = "閲囪喘鍙拌处妯℃澘", businessType = BusinessType.DELETE)
- @ApiOperation(value = "鍒犻櫎閲囪喘鍙拌处妯℃澘")
- public AjaxResult delete(@RequestBody List<Long> id) {
- if(CollectionUtils.isEmpty(id)) return AjaxResult.error("璇烽�夋嫨瑕佸垹闄ょ殑閲囪喘鍙拌处妯℃澘");
+ @Operation(summary = "鍒犻櫎閲囪喘鍙拌处妯℃澘")
+ public R<?> delete(@RequestBody List<Long> id) {
+ if(CollectionUtils.isEmpty(id)) return R.fail("璇烽�夋嫨瑕佸垹闄ょ殑閲囪喘鍙拌处妯℃澘");
int result = purchaseLedgerTemplateMapper.deleteBatchIds(id);
salesLedgerProductTemplateMapper.delete(new LambdaQueryWrapper<SalesLedgerProductTemplate>()
.in(SalesLedgerProductTemplate::getSalesLedgerId, id));
- return AjaxResult.success(result);
+ return R.ok(result);
}
@PostMapping("/update")
@Log(title = "淇敼閲囪喘鍙拌处妯℃澘", businessType = BusinessType.UPDATE)
- @ApiOperation(value = "淇敼閲囪喘鍙拌处妯℃澘")
- public AjaxResult update(@RequestBody PurchaseLedgerDto purchaseLedgerDto) {
+ @Operation(summary = "淇敼閲囪喘鍙拌处妯℃澘")
+ public R<?> update(@RequestBody PurchaseLedgerDto purchaseLedgerDto) {
// 妯℃澘鍚嶇О涓嶈兘閲嶅锛屾湁閲嶅灏变笉闇�瑕佹柊澧炰簡
PurchaseLedgerTemplate purchaseLedgerTemplate = purchaseLedgerTemplateMapper
.selectOne(new LambdaQueryWrapper<PurchaseLedgerTemplate>()
@@ -102,10 +99,11 @@
SalesLedgerProductTemplate salesLedgerProductTemplate = new SalesLedgerProductTemplate();
BeanUtils.copyProperties(product, salesLedgerProductTemplate);
salesLedgerProductTemplate.setSalesLedgerId(purchaseLedgerTemplate.getId());
+ salesLedgerProductTemplate.setType(2);
salesLedgerProductTemplateMapper.insert(salesLedgerProductTemplate);
});
}
- return AjaxResult.success();
+ return R.ok();
}
}
--
Gitblit v1.9.3