From 0d83a54d5f3ae08fe0ee4b3cd3fd72e94e2767e1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 14 十月 2025 09:32:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml
index 1dcb6f4..f7dc8c2 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml
@@ -178,7 +178,8 @@
t1.warehousing_number,
t2.create_time,
t1.warehousing_number - coalesce(sum(t5.outbound_count),0) as num,
- t1.unit_amount as sales_amount,
+ t1.unit_amount as unitAmount,
+ t1.sales_amount as salesAmount,
t1.expiry_date
from t_erp_clinic_warehousing_batch t1
LEFT JOIN t_erp_clinic_warehousing t2 on t1.warehousing_id = t2.id
--
Gitblit v1.7.1