diff --git a/YSZKDZBaoBiao/AccountsReceivableReport.cs b/YSZKDZBaoBiao/AccountsReceivableReport.cs index d32d169..c59417e 100644 --- a/YSZKDZBaoBiao/AccountsReceivableReport.cs +++ b/YSZKDZBaoBiao/AccountsReceivableReport.cs @@ -140,18 +140,20 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements var fProject = fProjectList == null ? "" : (string.Join(",", fProjectList)); + var SFQJFWDZ = customFilter["F_ALL_GROUP2"]?.ToString(); + base.BuilderReportSqlAndTempTable(filter, tableName); string sql = string.Format(@"/*dialect*/ --更新MX表中的字段 - EXEC UpdateYSDZBMX_GZTH '{0}','{1}','{2}','{3}','{4}','{5}' + EXEC UpdateYSDZBMX_GZTH '{0}','{1}','{2}','{3}','{4}','{5}','{6}' --更新MX表中的发票金额 EXEC GXFPJEYSDZDMX_GZTH '{0}','{1}' --更新JY表 EXEC UpdateYSDZBJY_GZTH - ", FSDate, fDate, ZZFID, fClient,XSYFID,ZZHTH); + ", FSDate, fDate, ZZFID, fClient,XSYFID,ZZHTH,SFQJFWDZ); sql += string.Format(@" INSERT INTO YingShouZhanKuanJY_GZTH(Number,OrderAmount,ShipmentsAmount,FBillAllAmount, diff --git a/YSZKDZBaoBiao/AccountsReceivableReport2.cs b/YSZKDZBaoBiao/AccountsReceivableReport2.cs index bc60431..b7bc1e2 100644 --- a/YSZKDZBaoBiao/AccountsReceivableReport2.cs +++ b/YSZKDZBaoBiao/AccountsReceivableReport2.cs @@ -147,21 +147,22 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements { XSYFID = XSY["Id"]?.ToString(); } - var fProject = fProjectList == null ? "" : (string.Join(",", fProjectList)); + var SFQJFWDZ = customFilter["F_ALL_GROUP2"]?.ToString(); + base.BuilderReportSqlAndTempTable(filter, tableName); string sql = string.Format(@"/*dialect*/ --更新表中的字段 - EXEC UpdateYSDZBMX_GZTH '{0}','{1}','{2}','{3}','{4}','{5}' + EXEC UpdateYSDZBMX_GZTH '{0}','{1}','{2}','{3}','{4}','{5}','{6}' --更新表中的发票金额 EXEC GXFPJEYSDZDMX_GZTH '{0}','{1}' - ", FSDate,fDate,ZZFID,fClient,XSYFID,ZZHTH); + ", FSDate,fDate,ZZFID,fClient,XSYFID,ZZHTH,SFQJFWDZ); sql += string.Format($@"/*dialect*/ INSERT INTO YingShouZhanKuanMX_GZTH(NUMBER,FQTY,FALLAMOUNT,OrderAmount,ShipmentsNum,ShipmentsAmount, ReturnNum,ReturnAmount,BillingAmount,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets,[K3退货金额],PPBillingAmount,ZPBillingAmount,[星空退货金额],[星空发货金额] diff --git a/派诺报表SQL文件/应收对账表(明细创建).sql b/派诺报表SQL文件/应收对账表(明细创建).sql index 55d093a..fda18ea 100644 --- a/派诺报表SQL文件/应收对账表(明细创建).sql +++ b/派诺报表SQL文件/应收对账表(明细创建).sql @@ -11,7 +11,8 @@ ALTER PROCEDURE [dbo].[UpdateYSDZBMX_GZTH] @FSaleOrgId varchar(1000), @FCUSTID varchar(1000), @XSYFID varchar(1000), -@ZZHTH varchar(1000) +@ZZHTH varchar(1000) +,@SFQJFWDZ varchar(1000) ---Ƿ䷶Χ AS BEGIN DECLARE @StartDate DATE = CONVERT(DATE, @FSDATE); @@ -77,9 +78,14 @@ BEGIN AND FApproveDate < @EndDate AND (ISNULL(@ZZHTH,'') = '' OR F_PAPERNUMBER = @ZZHTH) AND FDOCUMENTSTATUS = 'C' + UNION ALL + --۶ + SELECT F_CONTRACTNUMBER ZHHTH,FSALEORGID ZZ + FROM T_SAL_ORDER + WHERE FDOCUMENTSTATUS = 'C' + AND 1= @SFQJFWDZ )a - INSERT INTO YingShouZhanKuanMX_GZTH diff --git a/派诺报表SQL文件/应收对账表(明细版存储过程).sql b/派诺报表SQL文件/应收对账表(明细版存储过程).sql index cbbd696..ed3c1cf 100644 --- a/派诺报表SQL文件/应收对账表(明细版存储过程).sql +++ b/派诺报表SQL文件/应收对账表(明细版存储过程).sql @@ -4,7 +4,8 @@ ALTER PROCEDURE [dbo].[UpdateYSDZBMX_GZTH] @FSaleOrgId varchar(1000), @FCUSTID varchar(1000), @XSYFID varchar(1000), -@ZZHTH varchar(1000) +@ZZHTH varchar(1000) +,@SFQJFWDZ varchar(1000) ---Ƿ䷶Χ AS BEGIN DECLARE @StartDate DATE = CONVERT(DATE, @FSDATE); @@ -70,9 +71,14 @@ BEGIN AND FApproveDate < @EndDate AND (ISNULL(@ZZHTH,'') = '' OR F_PAPERNUMBER = @ZZHTH) AND FDOCUMENTSTATUS = 'C' + UNION ALL + --۶ + SELECT F_CONTRACTNUMBER ZHHTH,FSALEORGID ZZ + FROM T_SAL_ORDER + WHERE FDOCUMENTSTATUS = 'C' + AND 1= @SFQJFWDZ )a - INSERT INTO YingShouZhanKuanMX_GZTH