From 645fe0426017b280aa107b9363d37dc85470601b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 12 一月 2026 17:17:50 +0800
Subject: [PATCH] Merge branch 'jtwy' into dev_New
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
index a42f2b4..058360b 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
@@ -2,7 +2,12 @@
import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.procurementrecord.dto.ProcurementPageDto;
+import com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy;
+import com.ruoyi.procurementrecord.service.ProcurementRecordService;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,16 +38,27 @@
{
@Autowired
private ISalesLedgerProductService salesLedgerProductService;
-
+ @Autowired
+ private ProcurementRecordService procurementRecordService;
/**
* 鏌ヨ浜у搧淇℃伅鍒楄〃
*/
@GetMapping("/list")
- public TableDataInfo list(SalesLedgerProduct salesLedgerProduct)
+ public AjaxResult list(SalesLedgerProduct salesLedgerProduct)
{
- startPage();
List<SalesLedgerProduct> list = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct);
- return getDataTable(list);
+ list.forEach(item -> {
+ ProcurementPageDto procurementDto = new ProcurementPageDto();
+ procurementDto.setSalesLedgerProductId(item.getId());
+ procurementDto.setProductCategory(item.getProductCategory());
+ IPage<ProcurementPageDtoCopy> result = procurementRecordService.listPageCopyByProduction(new Page<>(1,-1), procurementDto);
+ ProcurementPageDtoCopy procurementDtoCopy = result.getRecords().get(0);
+ if(item.getQuantity().compareTo(procurementDtoCopy.getInboundNum0())>=0){
+ item.setApproveStatus(1);
+ salesLedgerProductService.addOrUpdateSalesLedgerProduct(item);
+ }
+ });
+ return AjaxResult.success(list);
}
/**
--
Gitblit v1.9.3