Merge branch 'main' of http://8.130.121.29:3000/Develop/PiolotTH_ReportFrom

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);

GZ_LTHReportForms.sln

@@ -1,10 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
+# Visual Studio Version 17
-VisualStudioVersion = 16.0.34301.259
+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

派诺报表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.发票类型 = '普'