From f980b0bde8c319261f4078177b8e6655f2c99664 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 27 一月 2026 15:40:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 2 +-
src/main/java/com/ruoyi/stock/mapper/StockUninventoryMapper.java | 4 ++--
src/main/resources/mapper/stock/StockUninventoryMapper.xml | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/mapper/StockUninventoryMapper.java b/src/main/java/com/ruoyi/stock/mapper/StockUninventoryMapper.java
index 58ab250..9c058ed 100644
--- a/src/main/java/com/ruoyi/stock/mapper/StockUninventoryMapper.java
+++ b/src/main/java/com/ruoyi/stock/mapper/StockUninventoryMapper.java
@@ -24,9 +24,9 @@
IPage<StockUninventoryDto> pageStockUninventory(Page page, @Param("ew") StockUninventoryDto stockUninventoryDto);
- int updateSubtractStockUnInventory(StockUninventoryDto stockUninventoryDto);
+ int updateSubtractStockUnInventory(@Param("ew") StockUninventoryDto stockUninventoryDto);
- int updateAddStockUnInventory(StockUninventoryDto stockUninventoryDto);
+ int updateAddStockUnInventory(@Param("ew") StockUninventoryDto stockUninventoryDto);
List<StockInventoryExportData> listStockInventoryExportData(@Param("ew") StockUninventoryDto stockUninventoryDto);
}
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index bfdb73f..552b83d 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -56,7 +56,7 @@
T1.attachment_materials,
T1.tenant_id,
T1.contract_amount,
- T1.contract_amount as noReceiptAmount,
+ T1.contract_amount as noInvoiceAmountTotal,
T1.execution_date,
T2.nick_name AS entry_person_name,
T1.payment_method
diff --git a/src/main/resources/mapper/stock/StockUninventoryMapper.xml b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
index 2c0737f..39b16b3 100644
--- a/src/main/resources/mapper/stock/StockUninventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
@@ -12,7 +12,7 @@
<result column="version" property="version" />
</resultMap>
<update id="updateSubtractStockUnInventory">
- update stock_inventory
+ update stock_uninventory
<set>
<if test="ew.qualitity != null">
qualitity = qualitity - #{ew.qualitity},
@@ -28,7 +28,7 @@
where product_model_id = #{ew.productModelId} and qualitity >= #{ew.qualitity}
</update>
<update id="updateAddStockUnInventory">
- update stock_inventory
+ update stock_uninventory
<set>
<if test="ew.qualitity != null">
qualitity = qualitity + #{ew.qualitity},
--
Gitblit v1.9.3