From d4f410c5fd3cd0e4b45859b5aadf280d4186a453 Mon Sep 17 00:00:00 2001 From: liqionghai <1> Date: Tue, 26 Aug 2025 19:18:50 +0800 Subject: [PATCH] 1 --- YSZKDZBaoBiao/AccountsReceivableReport2.cs | 2 +- YSZKDZGongNeng_MX/LiteVersionPlugIn2.cs | 2 +- 派诺报表SQL文件/业绩排行榜插入数据SQL.sql | 54 +++++++++---------- .../应收对账单明细更新发票金额存储过程.sql | 15 +++--- .../应收对账表(明细版存储过程).sql | 4 +- .../应收款对账单取发票金额(取数).sql | 15 +++++- 6 files changed, 53 insertions(+), 39 deletions(-) diff --git a/YSZKDZBaoBiao/AccountsReceivableReport2.cs b/YSZKDZBaoBiao/AccountsReceivableReport2.cs index 1afea00..26c8ccf 100644 --- a/YSZKDZBaoBiao/AccountsReceivableReport2.cs +++ b/YSZKDZBaoBiao/AccountsReceivableReport2.cs @@ -94,7 +94,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements header.AddChild("PPBillingAmount", new LocaleValue("星空普票开票金额"), SqlStorageType.SqlDecimal); header.AddChild("ZPBillingDate", new LocaleValue("专票开票日期"), SqlStorageType.Sqlvarchar); header.AddChild("ZPBillingAmount", new LocaleValue("星空专票开票金额"), SqlStorageType.SqlDecimal); - header.AddChild("BillingAmount", new LocaleValue("总专票金额"), SqlStorageType.SqlDecimal); + header.AddChild("BillingAmount", new LocaleValue("总发票金额"), SqlStorageType.SqlDecimal); header.AddChild("PaymentDate", new LocaleValue("回款日期"), SqlStorageType.Sqlvarchar); header.AddChild("PaymentAmount", new LocaleValue("回款金额"), SqlStorageType.SqlDecimal); header.AddChild("ShippedDebt", new LocaleValue("已出货欠款"), SqlStorageType.SqlDecimal); diff --git a/YSZKDZGongNeng_MX/LiteVersionPlugIn2.cs b/YSZKDZGongNeng_MX/LiteVersionPlugIn2.cs index a4a1f8b..67d2d38 100644 --- a/YSZKDZGongNeng_MX/LiteVersionPlugIn2.cs +++ b/YSZKDZGongNeng_MX/LiteVersionPlugIn2.cs @@ -284,7 +284,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivable c1.CellStyle = cellStyle; ICell c2 = rowi.CreateCell(1); c2.SetCellValue(""+date+""); c2.CellStyle = cellStyle2; ICell c3 = rowi.CreateCell(2); c3.SetCellValue(list[i]["CONTRACTNUMBER"].ToString()); c3.CellStyle = cellStyle2; - ICell c4 = rowi.CreateCell(3); c4.SetCellValue(list[i]["FBILLNO"].ToString()); c4.CellStyle = cellStyle2; + ICell c4 = rowi.CreateCell(3); c4.SetCellValue(list[i]["ProjectName"].ToString()); c4.CellStyle = cellStyle2; ICell c5 = rowi.CreateCell(4); c5.SetCellValue(list[i]["SizeModel"].ToString()); c5.CellStyle = cellStyle2; ICell c6 = rowi.CreateCell(5); c6.SetCellValue(""); c6.CellStyle = cellStyle; //数量 diff --git a/派诺报表SQL文件/业绩排行榜插入数据SQL.sql b/派诺报表SQL文件/业绩排行榜插入数据SQL.sql index 7d053cf..a544d35 100644 --- a/派诺报表SQL文件/业绩排行榜插入数据SQL.sql +++ b/派诺报表SQL文件/业绩排行榜插入数据SQL.sql @@ -489,7 +489,7 @@ TRUNCATE TABLE YJPHB_GZTH INNER join ZZV_XiaoShouHuiLv HL on a.fid = HL.۶ID INNER JOIN #ThisYearChange t1 on t1.FPKIDX = A.FID -- ۶± LEFT JOIN T_SAL_XORDERFIN t1fen on t1.ChangeOrderId = t1fen.FID -- Ľ - LEFT JOIN #LastYearChange t2 on t1.FPKIDX = A.FID -- ȥ۶± + LEFT JOIN #LastYearChange t2 on t2.FPKIDX = A.FID -- ȥ۶± LEFT JOIN T_SAL_XORDERFIN t2fen on t2.ChangeOrderId = t2fen.FID -- Ľ LEFT JOIN V_BD_SALESMAN_L L ON L.fid = A.FSALERID left JOIN T_PerformanceSharing M ON M.FSOURCEBILLNO = A.FBILLNO AND M.FDOCUMENTSTATUS = 'C' @@ -695,26 +695,26 @@ SELECT [ FROM ( SELECT [_SBU],[ϸ],[], - SUM([ŵҵ_궩])/10000 AS 'ŵҵ_궩', - SUM([ŵҵ_궩])/10000 AS 'ŵҵ_궩', - SUM([人ŵҵ_궩])/10000 AS '人ŵҵ_궩', - SUM([㶫̼ҵ_궩])/10000 AS '㶫̼ҵ_궩', - SUM([ŵҵ_궩])/10000 AS 'ŵҵ_궩', - SUM([ҵ_궩])/10000 AS 'ҵ_궩', - SUM([ŵҵ_궩])/10000 AS 'ŵҵ_궩', - SUM([ŵۼƻؿ])/10000 AS 'ŵۼƻؿ', - SUM([ŵۼƻؿ])/10000 AS 'ŵۼƻؿ', - SUM([人ŵۼƻؿ])/10000 AS '人ŵۼƻؿ', - SUM([㶫̼ۼƻؿ])/10000 AS '㶫̼ۼƻؿ', - SUM([ŵۼƻؿ])/10000 AS 'ŵۼƻؿ', - SUM([ۼƻؿ])/10000 AS 'ۼƻؿ', - SUM([ŵۼƻؿ])/10000 AS 'ŵۼƻؿ', - SUM([۶1])/10000 AS '۶1', - SUM([۶2])/10000 AS '۶2', - SUM([۶3])/10000 AS '۶3', - SUM([۶4])/10000 AS '۶4', - SUM([۶5])/10000 AS '۶5', - SUM([۶6])/10000 AS '۶6' + SUM(ISNULL([ŵҵ_궩],0))/10000 AS 'ŵҵ_궩', + SUM(ISNULL([ŵҵ_궩],0))/10000 AS 'ŵҵ_궩', + SUM(ISNULL([人ŵҵ_궩],0))/10000 AS '人ŵҵ_궩', + SUM(ISNULL([㶫̼ҵ_궩],0))/10000 AS '㶫̼ҵ_궩', + SUM(ISNULL([ŵҵ_궩],0))/10000 AS 'ŵҵ_궩', + SUM(ISNULL([ҵ_궩],0))/10000 AS 'ҵ_궩', + SUM(ISNULL([ŵҵ_궩],0))/10000 AS 'ŵҵ_궩', + SUM(ISNULL([ŵۼƻؿ],0))/10000 AS 'ŵۼƻؿ', + SUM(ISNULL([ŵۼƻؿ],0))/10000 AS 'ŵۼƻؿ', + SUM(ISNULL([人ŵۼƻؿ],0))/10000 AS '人ŵۼƻؿ', + SUM(ISNULL([㶫̼ۼƻؿ],0))/10000 AS '㶫̼ۼƻؿ', + SUM(ISNULL([ŵۼƻؿ],0))/10000 AS 'ŵۼƻؿ', + SUM(ISNULL([ۼƻؿ],0))/10000 AS 'ۼƻؿ', + SUM(ISNULL([ŵۼƻؿ],0))/10000 AS 'ŵۼƻؿ', + SUM(ISNULL([۶1],0))/10000 AS '۶1', + SUM(ISNULL([۶2],0))/10000 AS '۶2', + SUM(ISNULL([۶3],0))/10000 AS '۶3', + SUM(ISNULL([۶4],0))/10000 AS '۶4', + SUM(ISNULL([۶5],0))/10000 AS '۶5', + SUM(ISNULL([۶6],0))/10000 AS '۶6' FROM YJPHB_GZTH GROUP BY [_SBU],[ϸ],[] ) AS IDa @@ -733,15 +733,15 @@ SELECT [ --µۼҵ update A - SET [ۼҵ] = B.[ҵ]/10000 + SET [ۼҵ] = ISNULL(B.[ҵ],0)/10000 FROM YJPHB_GZTH A - INNER JOIN (SELECT [Ա],SUM([ҵ]) AS 'ҵ' FROM #TEMP1 GROUP BY [Ա]) B ON A.[] = B.[Ա] + LEFT JOIN (SELECT [Ա],SUM([ҵ]) AS 'ҵ' FROM #TEMP1 GROUP BY [Ա]) B ON A.[] = B.[Ա] --ͬ update A - SET [ͬ] = B.[]/10000 + SET [ͬ] = ISNULL(B.[],0)/10000 FROM YJPHB_GZTH A - INNER JOIN (SELECT [Ա],SUM([]) AS '' FROM #BGTEMP1 GROUP BY [Ա]) B ON A.[] = B.[Ա] + LEFT JOIN (SELECT [Ա],SUM([]) AS '' FROM #BGTEMP1 GROUP BY [Ա]) B ON A.[] = B.[Ա] --ŵ-ѽмҵ(궩)ֶνиֵ UPDATE YJPHB_GZTH @@ -810,7 +810,7 @@ FROM YJPHB_GZTH A --[Ŀ_]ֶ UPDATE A -SET A.[Ŀ_] = B.FPERFORMANCETARGETS +SET A.[Ŀ_] = ISNULL(B.FPERFORMANCETARGETS,0) FROM YJPHB_GZTH A LEFT JOIN(SELECT ROW_NUMBER() OVER (PARTITION BY t3.FNAME ORDER BY F_MBBA_CREATEDATE_6OQ DESC) rn,t3.FNAME [], YEAR(F_VRYF_DATE_83G) [],t2.F_MBBA_CREATEDATE_6OQ [],FPERFORMANCETARGETS @@ -822,7 +822,7 @@ WHERE YEAR(F_VRYF_DATE_83G)= YEAR(@FSDate) AND t2.FDOCUMENTSTATUS = 'C' --[Ŀ_ԭ]ֶ UPDATE A -SET A.[Ŀ_ԭ] = B.FPERFORMANCETARGETS +SET A.[Ŀ_ԭ] = ISNULL(B.FPERFORMANCETARGETS,0) FROM YJPHB_GZTH A LEFT JOIN(SELECT ROW_NUMBER() OVER (PARTITION BY t3.FNAME ORDER BY F_MBBA_CREATEDATE_6OQ ASC) rn,t3.FNAME [], YEAR(F_VRYF_DATE_83G) [],t2.F_MBBA_CREATEDATE_6OQ [],FPERFORMANCETARGETS diff --git a/派诺报表SQL文件/应收对账单明细更新发票金额存储过程.sql b/派诺报表SQL文件/应收对账单明细更新发票金额存储过程.sql index 6de8fe3..c802b3d 100644 --- a/派诺报表SQL文件/应收对账单明细更新发票金额存储过程.sql +++ b/派诺报表SQL文件/应收对账单明细更新发票金额存储过程.sql @@ -87,13 +87,16 @@ SET PPBillingDate = CASE ISNULL(A.PPBillingDate,'') WHEN '' THEN '' ELSE A.PPBil FROM YingShouZhanKuanMX_GZTH A INNER JOIN ( SELECT ( - stuff((select ','+format(convert(date,Ʊ),'yyyy-MM-dd') from (select distinct Ʊ,ͬ,Ʊ from oldk3ICSale0802)b WHERE ͬ = A.ͬ AND Ʊ = '' FOR xml path('')),1,1,'')) FPRQ, - ͬ,Ʊ + stuff((select ','+format(convert(date,Ʊ),'yyyy-MM-dd') from (select distinct Ʊ,ͬ,Ʊ,ǷƱ from oldk3ICSale0802)b WHERE ͬ = A.ͬ AND Ʊ = '' AND ISNULL(ǷƱ,'') <> 1 FOR xml path('')),1,1,'')) FPRQ, + ͬ,Ʊ,ǷƱ FROM oldk3ICSale0802 A WHERE Ʊ = '' - GROUP BY ͬ,Ʊ) B + AND ISNULL(ǷƱ,'') <> 1 + GROUP BY ͬ,Ʊ,ǷƱ) B ON A.CONTRACTNUMBER = B.ͬ -WHERE B.Ʊ = '' AND A.[ǷK3] = 0 +WHERE B.Ʊ = '' +AND A.[ǷK3] = 0 +AND ISNULL(B.ǷƱ,'') <> 1 -- UPDATE A --SET ZPBillingDate = FORMAT(CONVERT(DATE, B.FPRQ), 'yyyy-MM-dd') @@ -193,8 +196,8 @@ WHERE B. SELECT A.FID, A.FENTRYID, - --SUM(ISNULL(A.ZPBillingAmount,0)) + SUM(ISNULL(A.PPBillingAmount,0)) + SUM(ISNULL(A.K3רƱ,0)) + SUM(ISNULL(A.K3Ʊ,0)) AS 'רƱ' - SUM(ISNULL(A.ZPBillingAmount,0)) + SUM(ISNULL(A.K3רƱ,0)) AS 'רƱ' + SUM(ISNULL(A.ZPBillingAmount,0)) + SUM(ISNULL(A.PPBillingAmount,0)) + SUM(ISNULL(A.K3רƱ,0)) + SUM(ISNULL(A.K3Ʊ,0)) AS 'רƱ' + --SUM(ISNULL(A.ZPBillingAmount,0)) + SUM(ISNULL(A.K3רƱ,0)) AS 'רƱ' INTO #TEMP3 FROM YingShouZhanKuanMX_GZTH A WHERE A.[ǷK3] = 0 diff --git a/派诺报表SQL文件/应收对账表(明细版存储过程).sql b/派诺报表SQL文件/应收对账表(明细版存储过程).sql index 6dfba3c..2ad6a8b 100644 --- a/派诺报表SQL文件/应收对账表(明细版存储过程).sql +++ b/派诺报表SQL文件/应收对账表(明细版存储过程).sql @@ -155,11 +155,11 @@ UPDATE a SET a.[K3Ʊ] = b.Ʊ FROM YingShouZhanKuanMX_GZTH A INNER JOIN T_SAL_ORDERENTRY C ON A.FENTRYID = C.FENTRYID -INNER JOIN (SELECT ͬ,Ʊ,SUM(Ʊ) AS 'Ʊ' FROM [oldk3ICSale0802] GROUP BY ͬ,Ʊ) 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.Ʊ = '' - +AND ISNULL(b.ǷƱ,'') <> 1 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 7f0bb0b..1e526dd 100644 --- a/派诺报表SQL文件/应收款对账单取发票金额(取数).sql +++ b/派诺报表SQL文件/应收款对账单取发票金额(取数).sql @@ -38,7 +38,8 @@ BEGIN AND A.FDOCUMENTSTATUS = 'C' AND A.FApproveDate >= @StartDate AND A.FApproveDate < @EndDate - AND A.F_SFQC = 0 + AND A.F_SFQC = 0 + AND A.F_GENERALINVOICE <> 'Y' --ֵ˰ר÷Ʊ-Ӧյ-۶ INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) @@ -62,7 +63,8 @@ BEGIN AND A.FDOCUMENTSTATUS = 'C' AND A.FApproveDate >= @StartDate AND A.FApproveDate < @EndDate - AND A.F_SFQC = 0 + AND A.F_SFQC = 0 + AND A.F_GENERALINVOICE <> 'Y' --ֵ˰ר÷Ʊ-Ӧյ-۳ⵥ-֪ͨ-۶ INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) @@ -91,6 +93,7 @@ BEGIN AND A.FApproveDate >= @StartDate AND A.FApproveDate < @EndDate AND A.F_SFQC = 0 + AND A.F_GENERALINVOICE <> 'Y' --ֵ˰ר÷Ʊ-Ӧյ-۳ⵥ-۶ INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) @@ -117,6 +120,7 @@ BEGIN AND A.FApproveDate >= @StartDate AND A.FApproveDate < @EndDate AND A.F_SFQC = 0 + AND A.F_GENERALINVOICE <> 'Y' --ֵ˰ר÷Ʊ-Ӧյ-ڳ۳ⵥ-۶ INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) @@ -142,6 +146,7 @@ BEGIN AND A.FApproveDate >= @StartDate AND A.FApproveDate < @EndDate AND A.F_SFQC = 0 + AND A.F_GENERALINVOICE <> 'Y' --Ʊֵ˰ר÷Ʊ-Ӧյ-˻-˻֪ͨ-۶ INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) @@ -170,6 +175,7 @@ BEGIN AND A.FApproveDate >= @StartDate AND A.FApproveDate < @EndDate AND A.F_SFQC = 0 + AND A.F_GENERALINVOICE <> 'Y' --Ʊֵ˰ר÷Ʊ-Ӧյ-˻-۶ INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) @@ -196,6 +202,7 @@ BEGIN AND A.FApproveDate >= @StartDate AND A.FApproveDate < @EndDate AND A.F_SFQC = 0 + AND A.F_GENERALINVOICE <> 'Y' --Ʊֵ˰ר÷Ʊ-Ӧյ-˻-˻֪ͨ-۳ⵥ-֪ͨ-۶ INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) @@ -226,6 +233,7 @@ BEGIN AND A.FApproveDate >= @StartDate AND A.FApproveDate < @EndDate AND A.F_SFQC = 0 + AND A.F_GENERALINVOICE <> 'Y' --Ʊֵ˰ר÷Ʊ-Ӧյ-˻-۳ⵥ-֪ͨ-۶ INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) @@ -254,6 +262,7 @@ BEGIN AND A.FApproveDate >= @StartDate AND A.FApproveDate < @EndDate AND A.F_SFQC = 0 + AND A.F_GENERALINVOICE <> 'Y' --Ʊֵ˰ר÷Ʊ-Ӧյ-˻-۳ⵥ-۶ INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) @@ -281,6 +290,7 @@ BEGIN AND A.FApproveDate >= @StartDate AND A.FApproveDate < @EndDate AND A.F_SFQC = 0 + AND A.F_GENERALINVOICE <> 'Y' --޹ϵƱ INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) @@ -304,6 +314,7 @@ BEGIN AND A.FApproveDate >= @StartDate AND A.FApproveDate < @EndDate AND A.F_SFQC = 0 + AND A.F_GENERALINVOICE <> 'Y'