From e5a925b91b8c251acb8d999237bc88b8c15952c6 Mon Sep 17 00:00:00 2001 From: liqionghai <1> Date: Mon, 4 Aug 2025 15:53:30 +0800 Subject: [PATCH 1/2] 1 --- DDWFHMX.cs | 2 +- 派诺报表SQL文件/应收对账表(明细创建).sql | 31 +++++++++++++-- .../应收对账表(明细版存储过程).sql | 38 +++++++++++++------ .../应收款对账单取发票金额(取数).sql | 19 ++++++++-- 4 files changed, 70 insertions(+), 20 deletions(-) diff --git a/DDWFHMX.cs b/DDWFHMX.cs index ee83938..2d11728 100644 --- a/DDWFHMX.cs +++ b/DDWFHMX.cs @@ -71,7 +71,7 @@ namespace GZ_LTHReportForms.ReporyDDWFH header.AddChild("规格型号", new LocaleValue("规格型号"), SqlStorageType.Sqlnvarchar); header.AddChild("数量", new LocaleValue("数量"), SqlStorageType.SqlDecimal); header.AddChild("含税单价", new LocaleValue("含税单价"), SqlStorageType.SqlDecimal); - header.AddChild("折扣率", new LocaleValue("折扣率%"), SqlStorageType.SqlDecimal); + header.AddChild("折扣率", new LocaleValue("折扣率"), SqlStorageType.SqlDecimal); header.AddChild("价税合计", new LocaleValue("价税合计"), SqlStorageType.SqlDecimal); header.AddChild("已发货数量", new LocaleValue("已发货数量"), SqlStorageType.SqlDecimal); header.AddChild("已发货金额", new LocaleValue("已发货金额"), SqlStorageType.SqlDecimal); diff --git a/派诺报表SQL文件/应收对账表(明细创建).sql b/派诺报表SQL文件/应收对账表(明细创建).sql index 105355c..55d093a 100644 --- a/派诺报表SQL文件/应收对账表(明细创建).sql +++ b/派诺报表SQL文件/应收对账表(明细创建).sql @@ -122,14 +122,37 @@ BEGIN UPDATE a SET a.[K3]=b.,a.[K3]=b.,a.[K3˻]=b.˻ -,a.[K3˻]=b.˻,a.[K3רƱ] = b.רƱ ,a.[K3Ʊ]= b.Ʊ -FROM YingShouZhanKuanMX_GZTH A -INNER JOIN [oldk3seorder0701] b -ON a.FBILLNO=b.[ݱ] AND a.ϱ=[ϱ] AND a.FQty=[] AND (ABS(a.FTaxPrice-b.[˰])<=0.02 OR ABS(a.FTaxPrice-b.[])<=0.02) +,a.[K3˻]=b.˻--,a.[K3רƱ] = b.רƱ ,a.[K3Ʊ]= b.Ʊ +FROM YingShouZhanKuanMX_GZTH A +INNER JOIN T_SAL_ORDERENTRY C ON A.FENTRYID = C.FENTRYID +INNER JOIN [oldk3seorder0701] b +ON C.F_K3SEQ = b.к AND a.FBILLNO=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. >= @StartDate AND B. < @EndDate +--k3רƱ +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 +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.Ʊ = 'ר' +--AND B. >= @StartDate +--AND B. < @EndDate + +--k3Ʊ +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 +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.Ʊ = '' + UPDATE a SET a.[K3רƱ] = CASE B.rownumber WHEN 1 THEN b.רƱ ELSE 0 END,a.[K3Ʊ]= CASE B.rownumber WHEN 1 THEN b.Ʊ ELSE 0 END FROM YingShouZhanKuanMX_GZTH A diff --git a/派诺报表SQL文件/应收对账表(明细版存储过程).sql b/派诺报表SQL文件/应收对账表(明细版存储过程).sql index 105355c..cbbd696 100644 --- a/派诺报表SQL文件/应收对账表(明细版存储过程).sql +++ b/派诺报表SQL文件/应收对账表(明细版存储过程).sql @@ -1,10 +1,3 @@ -USE [AIS20250723115352] -GO -/****** Object: StoredProcedure [dbo].[UpdateYSDZBMX_GZTH] Script Date: 2025/8/2 10:16:20 ******/ -SET ANSI_NULLS ON -GO -SET QUOTED_IDENTIFIER ON -GO ALTER PROCEDURE [dbo].[UpdateYSDZBMX_GZTH] @FSDATE varchar(1000), @FEDATE varchar(1000), @@ -122,14 +115,37 @@ BEGIN UPDATE a SET a.[K3]=b.,a.[K3]=b.,a.[K3˻]=b.˻ -,a.[K3˻]=b.˻,a.[K3רƱ] = b.רƱ ,a.[K3Ʊ]= b.Ʊ -FROM YingShouZhanKuanMX_GZTH A -INNER JOIN [oldk3seorder0701] b -ON a.FBILLNO=b.[ݱ] AND a.ϱ=[ϱ] AND a.FQty=[] AND (ABS(a.FTaxPrice-b.[˰])<=0.02 OR ABS(a.FTaxPrice-b.[])<=0.02) +,a.[K3˻]=b.˻--,a.[K3רƱ] = b.רƱ ,a.[K3Ʊ]= b.Ʊ +FROM YingShouZhanKuanMX_GZTH A +INNER JOIN T_SAL_ORDERENTRY C ON A.FENTRYID = C.FENTRYID +INNER JOIN [oldk3seorder0701] b +ON C.F_K3SEQ = b.к AND a.FBILLNO=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. >= @StartDate AND B. < @EndDate +--k3רƱ +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 +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.Ʊ = 'ר' +--AND B. >= @StartDate +--AND B. < @EndDate + +--k3Ʊ +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 +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.Ʊ = '' + UPDATE a SET a.[K3רƱ] = CASE B.rownumber WHEN 1 THEN b.רƱ ELSE 0 END,a.[K3Ʊ]= CASE B.rownumber WHEN 1 THEN b.Ʊ ELSE 0 END FROM YingShouZhanKuanMX_GZTH A diff --git a/派诺报表SQL文件/应收款对账单取发票金额(取数).sql b/派诺报表SQL文件/应收款对账单取发票金额(取数).sql index 4bd7b35..9ae55b1 100644 --- a/派诺报表SQL文件/应收款对账单取发票金额(取数).sql +++ b/派诺报表SQL文件/应收款对账单取发票金额(取数).sql @@ -1,4 +1,4 @@ -USE [AIS20250723115352] +USE [AIS2025] GO /****** Object: StoredProcedure [dbo].[GetIV_SALESICYSMX_GZTH] Script Date: 2025/8/2 10:25:18 ******/ SET ANSI_NULLS ON @@ -37,7 +37,8 @@ BEGIN WHERE D.FID IN (SELECT FID FROM YingShouZhanKuanMX_GZTH) AND A.FDOCUMENTSTATUS = 'C' AND A.FApproveDate >= @StartDate - AND A.FApproveDate < @EndDate + AND A.FApproveDate < @EndDate + AND A.F_SFQC = 0 --ֵ˰ר÷Ʊ-Ӧյ-۶ INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) @@ -60,7 +61,8 @@ BEGIN WHERE F.FID IN (SELECT FID FROM YingShouZhanKuanMX_GZTH) AND A.FDOCUMENTSTATUS = 'C' AND A.FApproveDate >= @StartDate - AND A.FApproveDate < @EndDate + AND A.FApproveDate < @EndDate + AND A.F_SFQC = 0 --ֵ˰ר÷Ʊ-Ӧյ-۳ⵥ-֪ͨ-۶ INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) @@ -88,6 +90,7 @@ BEGIN AND A.FDOCUMENTSTATUS = 'C' AND A.FApproveDate >= @StartDate AND A.FApproveDate < @EndDate + AND A.F_SFQC = 0 --ֵ˰ר÷Ʊ-Ӧյ-۳ⵥ-۶ INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) @@ -113,6 +116,7 @@ BEGIN AND A.FDOCUMENTSTATUS = 'C' AND A.FApproveDate >= @StartDate AND A.FApproveDate < @EndDate + AND A.F_SFQC = 0 --ֵ˰ר÷Ʊ-Ӧյ-ڳ۳ⵥ-۶ INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) @@ -137,6 +141,7 @@ BEGIN AND A.FDOCUMENTSTATUS = 'C' AND A.FApproveDate >= @StartDate AND A.FApproveDate < @EndDate + AND A.F_SFQC = 0 --Ʊֵ˰ר÷Ʊ-Ӧյ-˻-˻֪ͨ-۶ INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) @@ -164,6 +169,7 @@ BEGIN AND A.FDOCUMENTSTATUS = 'C' AND A.FApproveDate >= @StartDate AND A.FApproveDate < @EndDate + AND A.F_SFQC = 0 --Ʊֵ˰ר÷Ʊ-Ӧյ-˻-۶ INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) @@ -189,6 +195,7 @@ BEGIN AND A.FDOCUMENTSTATUS = 'C' AND A.FApproveDate >= @StartDate AND A.FApproveDate < @EndDate + AND A.F_SFQC = 0 --Ʊֵ˰ר÷Ʊ-Ӧյ-˻-˻֪ͨ-۳ⵥ-֪ͨ-۶ INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) @@ -218,6 +225,7 @@ BEGIN AND A.FDOCUMENTSTATUS = 'C' AND A.FApproveDate >= @StartDate AND A.FApproveDate < @EndDate + AND A.F_SFQC = 0 --Ʊֵ˰ר÷Ʊ-Ӧյ-˻-۳ⵥ-֪ͨ-۶ INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) @@ -245,6 +253,7 @@ BEGIN AND A.FDOCUMENTSTATUS = 'C' AND A.FApproveDate >= @StartDate AND A.FApproveDate < @EndDate + AND A.F_SFQC = 0 --Ʊֵ˰ר÷Ʊ-Ӧյ-˻-۳ⵥ-۶ INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) @@ -271,6 +280,7 @@ BEGIN AND A.FDOCUMENTSTATUS = 'C' AND A.FApproveDate >= @StartDate AND A.FApproveDate < @EndDate + AND A.F_SFQC = 0 --Աݽзϼ SELECT DISTINCT @@ -325,7 +335,8 @@ BEGIN WHERE 1=1 AND A.FDOCUMENTSTATUS = 'C' AND A.FApproveDate >= @StartDate - AND A.FApproveDate < @EndDate + AND A.FApproveDate < @EndDate + AND A.F_SFQC = 0 --Աзϼ SELECT DISTINCT From d3e71859258071ff23f8b10fbf5726318ab5e828 Mon Sep 17 00:00:00 2001 From: liqionghai <1> Date: Mon, 4 Aug 2025 20:33:35 +0800 Subject: [PATCH 2/2] 1 --- YSZKDZBaoBiao/AccountsReceivableReport.cs | 6 ++++-- YSZKDZBaoBiao/AccountsReceivableReport2.cs | 7 ++++--- 派诺报表SQL文件/应收对账表(明细创建).sql | 10 ++++++++-- 派诺报表SQL文件/应收对账表(明细版存储过程).sql | 10 ++++++++-- 4 files changed, 24 insertions(+), 9 deletions(-) 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