From 8a63f3e06adf94d3afd3e81f15fe8a1976bbe384 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 30 三月 2026 10:14:50 +0800
Subject: [PATCH] 发货库存校验
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 8 +++-----
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 3 ++-
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java | 2 ++
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
index 9b7c280..1ba8851 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
@@ -34,6 +34,8 @@
private String salesLedgerProductId;
+ private Long productModelId;
+
/**
* 鍑哄叆搴撴暟閲�
*/
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index bc61060..5644f45 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -288,18 +288,16 @@
List<ProcurementPageDto> procurementPageDtoList = new ArrayList<>();
list.forEach(item -> {
ProcurementPageDto procurementDto = new ProcurementPageDto();
- procurementDto.setSalesLedgerProductId(String.valueOf(item.getId()));
- Page<ProcurementPageDto> page = new Page<>(1, 50);
- IPage<ProcurementPageDto> procurementPageDtoIPage = procurementRecordService.listPage(page, procurementDto);
+ IPage<ProcurementPageDto> procurementPageDtoIPage = procurementRecordService.listPage(new Page<>(1, -1), procurementDto);
procurementPageDtoList.addAll(procurementPageDtoIPage.getRecords());
});
- if(!CollectionUtils.isEmpty(procurementPageDtoList)){
+ if(CollectionUtils.isEmpty(procurementPageDtoList)){
throw new RuntimeException("璇ヤ骇鍝佸簱瀛樹笉瀛樺湪");
}
AtomicInteger num = new AtomicInteger();
list.forEach(item -> {
procurementPageDtoList.forEach(procurementPageDto -> {
- if(String.valueOf(item.getId().intValue()).equals(procurementPageDto.getSalesLedgerProductId())){
+ if(item.getProductModelId().equals(procurementPageDto.getProductModelId())){
if (item.getQuantity().compareTo(procurementPageDto.getInboundNum0()) <= 0) {
num.getAndIncrement();
}
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index 3636152..697bae1 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -36,6 +36,7 @@
t2.product_category,
t1.id,
t1.sales_ledger_product_id,
+ t1.product_model_id,
t1.create_user,
t2.specification_model,
t2.unit,
@@ -171,4 +172,4 @@
from procurement_record_storage
where product_model_id = #{productModelId}
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3