From a08dce3de307ce138396db5fe7274ead2ef5c573 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 17:12:08 +0800
Subject: [PATCH] Merge branch 'jtwy' of http://114.132.189.42:9002/r/product-inventory-management-after into sqd-hb
---
src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml | 1 +
src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java | 2 +-
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java | 4 ++++
3 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
index 6b57f2a..683a462 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
@@ -30,6 +30,10 @@
* 瀹㈡埛鍚堝悓鍙�
*/
private String customerContractNo;
+ /**
+ * 閲囪喘鍚堝悓鍙�
+ */
+ private String purchaseContractNumber;
/**
* 瀹㈡埛鍚嶇О
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
index 28ece31..549896a 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
@@ -67,7 +67,7 @@
// ProcurementPageDtoCopy procurementDtoCopy = result.getRecords().get(0);
if (item.getQuantity().compareTo(stockQuantity) <= 0 && item.getApproveStatus() == 0) {
item.setApproveStatus(1);
- salesLedgerProductService.addOrUpdateSalesLedgerProduct(item);
+ salesLedgerProductService.updateById(item);
}
}
});
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
index d220c21..d3d3f91 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
@@ -6,6 +6,7 @@
select
t3.supplier_name,
t2.product_category,
+ t3.purchase_contract_number,
t1.id,
t1.code,
t2.specification_model,
--
Gitblit v1.9.3