From 4af8ef7a2bbb92890a123ddd6c07bb09fb296846 Mon Sep 17 00:00:00 2001
From: liqionghai <1>
Date: Wed, 6 Aug 2025 09:42:35 +0800
Subject: [PATCH] 1

---
 DDWFHMX.cs                                     | 2 +-
 GZ_LTHReportForms.sln                          | 8 ++++++--
 派诺报表SQL文件/应收对账表(明细版存储过程).sql | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/DDWFHMX.cs b/DDWFHMX.cs
index 2d11728..d14cc41 100644
--- a/DDWFHMX.cs
+++ b/DDWFHMX.cs
@@ -120,7 +120,7 @@ namespace GZ_LTHReportForms.ReporyDDWFH
             * 
             INTO {3} 
             FROM GZ_DDWFHMX_TH
-            WHERE [未发货数量] <> 0 AND [未发货数量] <> 0
+            WHERE [未发货数量] > 0
             ORDER BY [审核日期]
             ", FstartDate, FEndDate, FSaleOrgId, tableName, Fcontractnumber);
             DBUtils.Execute(this.Context, sql);
diff --git a/GZ_LTHReportForms.sln b/GZ_LTHReportForms.sln
index 9144d4e..aed8934 100644
--- a/GZ_LTHReportForms.sln
+++ b/GZ_LTHReportForms.sln
@@ -1,10 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.34301.259
+# Visual Studio Version 17
+VisualStudioVersion = 17.12.35506.116 d17.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GZ_LTHReportForms", "GZ_LTHReportForms.csproj", "{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}"
 EndProject
+Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "GZ_PilotPythonReport", "..\GZ_PilotPythonReport\GZ_PilotPythonReport.pyproj", "{88C65DD5-F80F-4497-932B-BE6B2AB9F8B1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,8 @@ Global
 		{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}.Release|Any CPU.Build.0 = Release|Any CPU
+		{88C65DD5-F80F-4497-932B-BE6B2AB9F8B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{88C65DD5-F80F-4497-932B-BE6B2AB9F8B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/派诺报表SQL文件/应收对账表(明细版存储过程).sql b/派诺报表SQL文件/应收对账表(明细版存储过程).sql
index ed3c1cf..ead5fd6 100644
--- a/派诺报表SQL文件/应收对账表(明细版存储过程).sql
+++ b/派诺报表SQL文件/应收对账表(明细版存储过程).sql
@@ -135,7 +135,7 @@ UPDATE  a
 SET a.[K3רƱ���] = b.��Ʊ���	 
 FROM YingShouZhanKuanMX_GZTH A
 INNER JOIN T_SAL_ORDERENTRY C ON A.FENTRYID = C.FENTRYID 
-INNER JOIN [oldk3ICSale0802] b 
+INNER JOIN (SELECT ��ͬ��,��Ʊ����,SUM(��Ʊ���) AS '��Ʊ���' FROM [oldk3ICSale0802] GROUP BY ��ͬ��,��Ʊ����) b 
 ON C.FSEQ = 1 AND a.CONTRACTNUMBER=b.��ͬ�� --AND a.�����ϱ���=[���ϱ���] AND a.FQty=[����] AND (ABS(a.FTaxPrice-b.[��˰����])<=0.02 OR ABS(a.FTaxPrice-b.[���])<=0.02)
 WHERE  �Ƿ�K3����=0 
 AND b.��Ʊ���� = 'ר'
@@ -147,7 +147,7 @@ UPDATE  a
 SET a.[K3��Ʊ���] = b.��Ʊ���
 FROM YingShouZhanKuanMX_GZTH A
 INNER JOIN T_SAL_ORDERENTRY C ON A.FENTRYID = C.FENTRYID 
-INNER JOIN [oldk3ICSale0802] b 
+INNER JOIN (SELECT ��ͬ��,��Ʊ����,SUM(��Ʊ���) AS '��Ʊ���' FROM [oldk3ICSale0802] GROUP BY ��ͬ��,��Ʊ����) b 
 ON C.FSEQ = 1 AND a.CONTRACTNUMBER=b.��ͬ�� --AND a.�����ϱ���=[���ϱ���] AND a.FQty=[����] AND (ABS(a.FTaxPrice-b.[��˰����])<=0.02 OR ABS(a.FTaxPrice-b.[���])<=0.02)
 WHERE  �Ƿ�K3����=0 
 AND b.��Ʊ���� = '��'