diff --git a/ZHIRONG.Report/ZHIRONG.Report.pyproj b/ZHIRONG.Report/ZHIRONG.Report.pyproj
index fa7cdc0..4171ff3 100644
--- a/ZHIRONG.Report/ZHIRONG.Report.pyproj
+++ b/ZHIRONG.Report/ZHIRONG.Report.pyproj
@@ -26,6 +26,10 @@
     <Compile Include="ZHIRONG.Report.DevelopmentCostDetails.py" />
     <Compile Include="调试.py" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="合计表.sql" />
+    <Content Include="明细表.sql" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets" />
   <!-- Uncomment the CoreCompile target to enable the Build command in
        Visual Studio and specify your pre- and post-build commands in
diff --git a/ZHIRONG.Report/ZHIRONG.Report.pyproj.user b/ZHIRONG.Report/ZHIRONG.Report.pyproj.user
new file mode 100644
index 0000000..07dbd5b
--- /dev/null
+++ b/ZHIRONG.Report/ZHIRONG.Report.pyproj.user
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectView>ProjectFiles</ProjectView>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/ZHIRONG.Report/合计表.sql b/ZHIRONG.Report/合计表.sql
new file mode 100644
index 0000000..e811ee0
--- /dev/null
+++ b/ZHIRONG.Report/合计表.sql
@@ -0,0 +1,124 @@
+
+
+ALTER PROCEDURE P_ReportDataSourceDetail
+(
+	@FSTARTDATE NVARCHAR(50),		--��ʼ����
+	@FENDDATE  NVARCHAR(50),	--��������
+	@FACCTORGID INT,	--��֯
+	@FGROUP NVARCHAR(100)		--��Ŀ����
+)
+AS
+--ɾ�������ݱ�
+IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'T_ReportDataSourceDetail') AND type in (N'U'))
+BEGIN
+	DROP TABLE T_ReportDataSourceDetail
+END
+--д�������ݱ�
+BEGIN
+	SELECT * 
+	INTO #ColumnsNameTable
+	FROM(
+	SELECT 
+	T1.FENTRYID [������],
+	CONCAT(ISNULL(T4.FNUMBER,''),'qazxsw/',ISNULL(T5.FDATAVALUE,'')) [�з���Ŀ],
+	CAST(SUM(ROUND(T1.FAMOUNT,2)) AS FLOAT)  [��λ�ҽ��]
+	--CONVERT(FLOAT,T1.FAMOUNT) [��λ�ҽ��]
+	FROM T_GL_VOUCHERENTRY T1
+	JOIN T_GL_VOUCHER T2 ON T1.FVOUCHERID = T2.FVOUCHERID
+	LEFT JOIN T_BD_FLEXITEMDETAILV T3 ON T3.FID = T1.FDETAILID		--������
+	LEFT JOIN T_BAS_ASSISTANTDATAENTRY T4 ON T4.FMASTERID = T3.FF100004	and T4.FID = '605ae705c8ab2c'	--���������з���Ŀ
+	LEFT JOIN T_BAS_ASSISTANTDATAENTRY_L T5 ON T4.FENTRYID = T5.FENTRYID AND T5.FLOCALEID = 2052
+	LEFT JOIN T_BD_ACCOUNT T6 ON T6.FACCTID = T1.FACCOUNTID			--��Ŀ
+	LEFT JOIN T_BAS_ASSISTANTDATAENTRY T7 ON T7.FMASTERID = T6.F_GAT_GROUPID	and T7.FID = '6859274cacb40b'	--�������Ͽ�Ŀ����
+	LEFT JOIN T_BAS_ASSISTANTDATAENTRY_L T8 ON T7.FENTRYID = T8.FENTRYID AND T8.FLOCALEID = 2052
+	WHERE T8.FDATAVALUE IS NOT NULL 
+	AND T2.FDATE >= @FSTARTDATE 
+	AND T2.FDATE <= @FENDDATE 
+	AND T2.FACCTORGID = @FACCTORGID
+	AND (T7.FMASTERID = @FGROUP OR 1 = CASE WHEN @FGROUP IS NULL OR @FGROUP = '' THEN 1 ELSE 0 END)
+	AND T1.FVOUCHERID NOT IN (SELECT FVOUCHERID FROM T_GL_VOUCHERENTRY WHERE FEXPLANATION = '��ת��������')		--�޳���ת����
+	GROUP BY T1.FENTRYID,CONCAT(ISNULL(T4.FNUMBER,''),'qazxsw/',ISNULL(T5.FDATAVALUE,''))
+	UNION ALL
+	SELECT 
+	T1.FENTRYID [������],
+	'ƾ֤���'[�з���Ŀ],
+	CAST(SUM(ROUND(T1.FAMOUNT,2)) AS FLOAT)  [��λ�ҽ��]
+	FROM T_GL_VOUCHERENTRY T1
+	JOIN T_GL_VOUCHER T2 ON T1.FVOUCHERID = T2.FVOUCHERID
+	LEFT JOIN T_BD_FLEXITEMDETAILV T3 ON T3.FID = T1.FDETAILID		--������
+	LEFT JOIN T_BAS_ASSISTANTDATAENTRY T4 ON T4.FMASTERID = T3.FF100004	and T4.FID = '605ae705c8ab2c'	--���������з���Ŀ
+	LEFT JOIN T_BAS_ASSISTANTDATAENTRY_L T5 ON T4.FENTRYID = T5.FENTRYID AND T5.FLOCALEID = 2052
+	LEFT JOIN T_BD_ACCOUNT T6 ON T6.FACCTID = T1.FACCOUNTID			--��Ŀ
+	LEFT JOIN T_BAS_ASSISTANTDATAENTRY T7 ON T7.FMASTERID = T6.F_GAT_GROUPID	and T7.FID = '6859274cacb40b'	--�������Ͽ�Ŀ����
+	LEFT JOIN T_BAS_ASSISTANTDATAENTRY_L T8 ON T7.FENTRYID = T8.FENTRYID AND T8.FLOCALEID = 2052
+	WHERE T8.FDATAVALUE IS NOT NULL 
+	AND T2.FDATE >= @FSTARTDATE 
+	AND T2.FDATE <= @FENDDATE 
+	AND T2.FACCTORGID = @FACCTORGID
+	AND (T7.FMASTERID = @FGROUP OR 1 = CASE WHEN @FGROUP IS NULL OR @FGROUP = '' THEN 1 ELSE 0 END)
+	AND T1.FVOUCHERID NOT IN (SELECT FVOUCHERID FROM T_GL_VOUCHERENTRY WHERE FEXPLANATION = '��ת��������')		--�޳���ת����
+	GROUP BY T1.FENTRYID
+	)a
+
+	---ִ����ת��
+	DECLARE @Columns AS NVARCHAR(MAX), @SQL AS NVARCHAR(MAX),@Columns1 NVARCHAR(MAX);
+	SELECT @Columns = STUFF(
+	(
+	SELECT  ',' + QUOTENAME([�з���Ŀ])
+	FROM  (
+		SELECT [�з���Ŀ] as [�з���Ŀ] 
+		FROM (
+			SELECT DISTINCT [�з���Ŀ] 
+			FROM  #ColumnsNameTable
+		)b 
+	)a ORDER BY [�з���Ŀ] DESC FOR XML PATH ('') 
+	), 1, 1, '' 
+	)
+
+	
+	--print @Columns
+	SET @Columns1 = REPLACE(REPLACE(@Columns,']]',']'),'amp;','')
+	SELECT @Columns = STUFF(
+	(
+	SELECT  ',' + QUOTENAME([�з���Ŀ])
+	FROM  (
+		SELECT 'ISNULL('+FID+',0) AS'+FID AS [�з���Ŀ] 
+		FROM (
+			SELECT * from fn_StrSplit(@Columns,',')
+		)b
+	)a FOR XML PATH ('')
+	), 1, 1, '' 
+	)
+	SET @Columns = REPLACE(REPLACE(REPLACE(REPLACE(@Columns,']]',']'),']]',']'),'[ISNULL','ISNULL'),'amp;','')
+
+	SET @SQL = N'
+	SELECT T8.FDATAVALUE [��Ŀ����],T5.FNAME [��֯],FORMAT(T3.FDATE,''yyyy-MM-dd'') [����],T3.FVOUCHERGROUPNO [ƾ֤��],T2.FEXPLANATION [ժҪ],T4.FNAME [��Ŀ],T1.* 
+	INTO T_ReportDataSourceDetail
+	FROM (
+		SELECT [������],' + @Columns + N' 
+		FROM (SELECT * FROM #ColumnsNameTable) AS SourceTable 
+		PIVOT (SUM([��λ�ҽ��]) 
+		FOR [�з���Ŀ] IN (' + @Columns1 + N')) AS PivotTable
+	)T1
+	LEFT JOIN T_GL_VOUCHERENTRY T2 ON T1.[������] = T2.FENTRYID
+	LEFT JOIN T_GL_VOUCHER T3 ON T2.FVOUCHERID = T3.FVOUCHERID
+	LEFT JOIN T_BD_ACCOUNT_L T4 ON T4.FACCTID = T2.FACCOUNTID
+	LEFT JOIN T_ORG_Organizations_L T5 ON T5.FORGID = T3.FACCTORGID AND T5.FLOCALEID = 2052
+	LEFT JOIN T_BD_ACCOUNT T6 ON T6.FACCTID = T4.FACCTID
+	LEFT JOIN T_BAS_ASSISTANTDATAENTRY T7 ON T7.FMASTERID = T6.F_GAT_GROUPID	and T7.FID = ''6859274cacb40b''
+	LEFT JOIN T_BAS_ASSISTANTDATAENTRY_L T8 ON T7.FENTRYID = T8.FENTRYID AND T8.FLOCALEID = 2052'
+
+	--print @SQL
+	EXEC sp_executesql @SQL;
+	
+	IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'T_ReportDataSourceDetail') AND type in (N'U'))
+	BEGIN
+		SELECT '������' [��Ŀ����],'������' [��֯], '������' [����],'������' [ƾ֤��],'������' [ժҪ],'������' [��Ŀ] INTO T_ReportDataSourceDetail
+	END
+	
+	DROP TABLE #ColumnsNameTable
+END
+
+--SELECT * FROM T_ReportDataSourceDetail
+
+--EXEC P_ReportDataSourceDetail 2025, 1, 333602, '685927c4acb40d'
diff --git a/ZHIRONG.Report/明细表.sql b/ZHIRONG.Report/明细表.sql
new file mode 100644
index 0000000..54b58c3
--- /dev/null
+++ b/ZHIRONG.Report/明细表.sql
@@ -0,0 +1,115 @@
+
+
+ALTER PROCEDURE P_ReportDataSource
+(
+	@FSTARTDATE NVARCHAR(50),		--��ʼ����
+	@FENDDATE  NVARCHAR(50),	--��������
+	@FACCTORGID INT,--��֯
+	@FUNIT INT		--��λ��Ԫ/��Ԫ��
+)
+AS
+--ɾ�������ݱ�
+IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'T_ReportDataSource') AND type in (N'U'))
+BEGIN
+	DROP TABLE T_ReportDataSource
+END
+--д�������ݱ�
+BEGIN
+	SELECT * 
+	INTO #ColumnsNameTable
+	FROM(
+	SELECT 
+	T8.FDATAVALUE [��Ŀ],
+	CONCAT(ISNULL(T4.FNUMBER,''),'qazxsw/',ISNULL(T5.FDATAVALUE,'')) [�з���Ŀ],
+	CAST(SUM(ROUND(T1.FAMOUNT/@FUNIT,2)) AS FLOAT)  [��λ�ҽ��]
+	--CONVERT(FLOAT,T1.FAMOUNT) [��λ�ҽ��]
+	FROM T_GL_VOUCHERENTRY T1
+	JOIN T_GL_VOUCHER T2 ON T1.FVOUCHERID = T2.FVOUCHERID
+	LEFT JOIN T_BD_FLEXITEMDETAILV T3 ON T3.FID = T1.FDETAILID		--������
+	LEFT JOIN T_BAS_ASSISTANTDATAENTRY T4 ON T4.FMASTERID = T3.FF100004	and T4.FID = '605ae705c8ab2c'	--���������з���Ŀ
+	LEFT JOIN T_BAS_ASSISTANTDATAENTRY_L T5 ON T4.FENTRYID = T5.FENTRYID AND T5.FLOCALEID = 2052
+	LEFT JOIN T_BD_ACCOUNT T6 ON T6.FACCTID = T1.FACCOUNTID			--��Ŀ
+	LEFT JOIN T_BAS_ASSISTANTDATAENTRY T7 ON T7.FMASTERID = T6.F_GAT_GROUPID	and T7.FID = '6859274cacb40b'	--�������Ͽ�Ŀ����
+	LEFT JOIN T_BAS_ASSISTANTDATAENTRY_L T8 ON T7.FENTRYID = T8.FENTRYID AND T8.FLOCALEID = 2052
+	WHERE T8.FDATAVALUE IS NOT NULL 
+	AND T2.FDATE >= @FSTARTDATE 
+	AND T2.FDATE <= @FENDDATE 
+	AND T2.FACCTORGID = @FACCTORGID
+	AND T1.FVOUCHERID NOT IN (SELECT FVOUCHERID FROM T_GL_VOUCHERENTRY WHERE FEXPLANATION = '��ת��������')		--�޳���ת����
+	GROUP BY T8.FDATAVALUE,CONCAT(ISNULL(T4.FNUMBER,''),'qazxsw/',ISNULL(T5.FDATAVALUE,''))
+	UNION ALL
+	SELECT 
+	T8.FDATAVALUE [��Ŀ],
+	'�ϼ�'[�з���Ŀ],
+	CAST(SUM(ROUND(T1.FAMOUNT/@FUNIT,2)) AS FLOAT)  [��λ�ҽ��]
+	FROM T_GL_VOUCHERENTRY T1
+	JOIN T_GL_VOUCHER T2 ON T1.FVOUCHERID = T2.FVOUCHERID
+	LEFT JOIN T_BD_FLEXITEMDETAILV T3 ON T3.FID = T1.FDETAILID		--������
+	LEFT JOIN T_BAS_ASSISTANTDATAENTRY T4 ON T4.FMASTERID = T3.FF100004	and T4.FID = '605ae705c8ab2c'	--���������з���Ŀ
+	LEFT JOIN T_BAS_ASSISTANTDATAENTRY_L T5 ON T4.FENTRYID = T5.FENTRYID AND T5.FLOCALEID = 2052
+	LEFT JOIN T_BD_ACCOUNT T6 ON T6.FACCTID = T1.FACCOUNTID			--��Ŀ
+	LEFT JOIN T_BAS_ASSISTANTDATAENTRY T7 ON T7.FMASTERID = T6.F_GAT_GROUPID	and T7.FID = '6859274cacb40b'	--�������Ͽ�Ŀ����
+	LEFT JOIN T_BAS_ASSISTANTDATAENTRY_L T8 ON T7.FENTRYID = T8.FENTRYID AND T8.FLOCALEID = 2052
+	WHERE T8.FDATAVALUE IS NOT NULL 
+	AND T2.FDATE >= @FSTARTDATE 
+	AND T2.FDATE <= @FENDDATE 
+	AND T2.FACCTORGID = @FACCTORGID
+	AND T1.FVOUCHERID NOT IN (SELECT FVOUCHERID FROM T_GL_VOUCHERENTRY WHERE FEXPLANATION = '��ת��������')		--�޳���ת����
+	GROUP BY T8.FDATAVALUE
+	)a
+
+	---ִ����ת��
+	DECLARE @Columns AS NVARCHAR(MAX), @SQL AS NVARCHAR(MAX),@Columns1 NVARCHAR(MAX);
+	SELECT @Columns = STUFF(
+	(
+	SELECT  ',' + QUOTENAME([�з���Ŀ])
+	FROM  (
+		SELECT [�з���Ŀ] as [�з���Ŀ] 
+		FROM (
+			SELECT DISTINCT [�з���Ŀ] 
+			FROM  #ColumnsNameTable
+		)b 
+	)a ORDER BY [�з���Ŀ] FOR XML PATH ('') 
+	), 1, 1, '' 
+	)
+
+	
+	--print @Columns
+	SET @Columns1 = REPLACE(REPLACE(@Columns,']]',']'),'amp;','')
+	SELECT @Columns = STUFF(
+	(
+	SELECT  ',' + QUOTENAME([�з���Ŀ])
+	FROM  (
+		SELECT 'ISNULL('+FID+',0) AS'+FID AS [�з���Ŀ] 
+		FROM (
+			SELECT * from fn_StrSplit(@Columns,',')
+		)b
+	)a FOR XML PATH ('')
+	), 1, 1, '' 
+	)
+	SET @Columns = REPLACE(REPLACE(REPLACE(REPLACE(@Columns,']]',']'),']]',']'),'[ISNULL','ISNULL'),'amp;','')
+
+	SET @SQL = N'
+	SELECT T1.* 
+	INTO T_ReportDataSource
+	FROM (
+		SELECT [��Ŀ],' + @Columns + N' 
+		FROM (SELECT * FROM #ColumnsNameTable) AS SourceTable 
+		PIVOT (SUM([��λ�ҽ��]) 
+		FOR [�з���Ŀ] IN (' + @Columns1 + N')) AS PivotTable
+	)T1'
+
+	--print @SQL
+	EXEC sp_executesql @SQL;
+	
+	IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'T_ReportDataSource') AND type in (N'U'))
+	BEGIN
+		SELECT '������' [��Ŀ] INTO T_ReportDataSource
+	END
+	
+	DROP TABLE #ColumnsNameTable
+END
+
+--SELECT * FROM T_ReportDataSource
+
+--EXEC P_ReportDataSource 2025,7,1,10000