From da78c6cd6cfa63c09fc8b41c18af6f06393847aa Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 26 一月 2026 15:53:53 +0800
Subject: [PATCH] yys 修改采购审核模块
---
src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java | 60 +++++++++++++++++++-----------------------------------------
1 files changed, 19 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
index 378a9c3..4dc2f7a 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
@@ -11,7 +11,11 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
+import com.ruoyi.purchase.mapper.PurchaseLedgerTemplateMapper;
+import com.ruoyi.purchase.mapper.SalesLedgerProductTemplateMapper;
import com.ruoyi.purchase.pojo.PurchaseLedger;
+import com.ruoyi.purchase.pojo.PurchaseLedgerTemplate;
+import com.ruoyi.purchase.pojo.SalesLedgerProductTemplate;
import com.ruoyi.purchase.service.IPurchaseLedgerService;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerProductService;
@@ -37,12 +41,16 @@
@RestController
@RequestMapping("/purchase/ledger")
@AllArgsConstructor
-@Api(tags = "111")
+@Api(tags = "閲囪喘鍙拌处")
public class PurchaseLedgerController extends BaseController {
private IPurchaseLedgerService purchaseLedgerService;
private ISalesLedgerService salesLedgerService;
private ISalesLedgerProductService salesLedgerProductService;
+
+ private PurchaseLedgerTemplateMapper purchaseLedgerTemplateMapper;
+
+ private SalesLedgerProductTemplateMapper salesLedgerProductTemplateMapper;
/**
* 鏌ヨ閲囪喘鍙拌处鍒楄〃
@@ -84,34 +92,24 @@
*/
@Log(title = "閲囪喘鍙拌处", businessType = BusinessType.INSERT)
@PostMapping("/addOrEditPurchase")
- public AjaxResult addOrEditPurchase(@RequestBody PurchaseLedgerDto purchaseLedgerDto) throws IOException {
+ public AjaxResult addOrEditPurchase(@RequestBody PurchaseLedgerDto purchaseLedgerDto) throws Exception {
return toAjax(purchaseLedgerService.addOrEditPurchase(purchaseLedgerDto));
}
- /**
- * 鏂板閲囪喘妯℃澘
- */
- @PostMapping("/addPurchaseTemplate")
- public AjaxResult addPurchaseTemplate(@RequestBody PurchaseLedgerDto purchaseLedgerDto) throws IOException {
- return toAjax(purchaseLedgerService.addPurchaseTemplate(purchaseLedgerDto));
- }
+
/**
* 鏌ヨ閲囪喘妯℃澘
*/
- @ApiOperation("/2222")
+ @ApiOperation("/鏌ヨ閲囪喘妯℃澘")
@GetMapping("/getPurchaseTemplateList")
public AjaxResult getPurchaseTemplateList() {
- PurchaseLedgerDto purchaseLedgerDto = new PurchaseLedgerDto();
- purchaseLedgerDto.setApprovalStatus(3);
- IPage<PurchaseLedgerDto> purchaseLedgerDtoIPage = purchaseLedgerService.selectPurchaseLedgerListPage(new Page(1, -1), purchaseLedgerDto);
- List<PurchaseLedgerDto> purchaseLedgers = purchaseLedgerDtoIPage.getRecords();
-
+ List<PurchaseLedgerTemplate> purchaseLedgers = purchaseLedgerTemplateMapper.selectList(null);
purchaseLedgers.forEach(purchaseLedgerDto1 -> {
- LambdaQueryWrapper<SalesLedgerProduct> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(SalesLedgerProduct::getSalesLedgerId, purchaseLedgerDto1.getId())
- .eq(SalesLedgerProduct::getType, 2);
- List<SalesLedgerProduct> list = salesLedgerProductService.list(queryWrapper);
+ LambdaQueryWrapper<SalesLedgerProductTemplate> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(SalesLedgerProductTemplate::getSalesLedgerId, purchaseLedgerDto1.getId())
+ .eq(SalesLedgerProductTemplate::getType, 2);
+ List<SalesLedgerProductTemplate> list = salesLedgerProductTemplateMapper.selectList(queryWrapper);
if (!list.isEmpty()) {
- purchaseLedgerDto1.setProductData(list);
+ purchaseLedgerDto1.setProductList(list);
}
});
return AjaxResult.success(purchaseLedgers);
@@ -194,27 +192,7 @@
*/
@GetMapping("/listPage")
public AjaxResult listPage(Page page, PurchaseLedgerDto purchaseLedger) {
- IPage<PurchaseLedgerDto> purchaseLedgerDtoIPage = Optional.ofNullable(
- purchaseLedgerService.selectPurchaseLedgerListPage(page, purchaseLedger)
- ).orElse(new Page<>());
-
- // 澶勭悊null
- Optional.ofNullable(purchaseLedgerDtoIPage.getRecords())
- .filter(CollectionUtils::isNotEmpty)
- .ifPresent(records -> {
- // 杩囨护approvalStatus=3鐨勮褰�
- records.removeIf(dto -> dto != null && dto.getApprovalStatus() == 3);
- // 淇鏈敹浠樻閲戦
- records.forEach(dto -> {
- if (dto == null) return;
- BigDecimal unReceiptAmt = Optional.ofNullable(dto.getUnReceiptPaymentAmount()).orElse(BigDecimal.ZERO);
- if (unReceiptAmt.compareTo(BigDecimal.ZERO) == 0) {
- dto.setUnReceiptPaymentAmount(Optional.ofNullable(dto.getContractAmount()).orElse(BigDecimal.ZERO));
- }
- });
- });
-
- return AjaxResult.success(purchaseLedgerDtoIPage);
+ return AjaxResult.success(purchaseLedgerService.selectPurchaseLedgerListPage(page, purchaseLedger));
}
@ApiOperation("鐢熸垚閲囪喘搴忓垪鍙�")
--
Gitblit v1.9.3