From 891547a7e5a5f4f56dbaca6a241f1137bf950e5c Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 13 一月 2026 11:58:35 +0800
Subject: [PATCH] 台账点击下拉展开接口优化
---
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 12 ++++++++++++
src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java | 10 ++++++----
2 files changed, 18 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 058360b..d0d7625 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
@@ -52,10 +52,12 @@
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);
+ if(result.getRecords().size()>0) {
+ ProcurementPageDtoCopy procurementDtoCopy = result.getRecords().get(0);
+ if (item.getQuantity().compareTo(procurementDtoCopy.getInboundNum0()) >= 0) {
+ item.setApproveStatus(1);
+ salesLedgerProductService.addOrUpdateSalesLedgerProduct(item);
+ }
}
});
return AjaxResult.success(list);
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index f739bec..3642db2 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -340,5 +340,17 @@
select *
from procurement_record_storage t1
left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
+ <where>
+ 1=1
+ <if test="req.productCategory != null and req.productCategory != ''">
+ and t2.product_category like concat('%',#{req.productCategory},'%')
+ </if>
+ <if test="req.timeStr != null and req.timeStr != ''">
+ and t1.create_time like concat('%',#{req.timeStr},'%')
+ </if>
+ <if test="req.salesLedgerProductId != null and req.salesLedgerProductId != ''">
+ and t1.sales_ledger_product_id = #{req.salesLedgerProductId}
+ </if>
+ </where>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3