From 6b39b27a2807f4fb60e3b8ac12a1bb5deaad7775 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 14 一月 2026 14:04:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java | 10 ++++++----
1 files changed, 6 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..78d78d8 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.getApproveStatus() == 0) {
+ item.setApproveStatus(1);
+ salesLedgerProductService.addOrUpdateSalesLedgerProduct(item);
+ }
}
});
return AjaxResult.success(list);
--
Gitblit v1.9.3