From 892d5d36c6e270e5e3903e6c73fe225433d14f7b Mon Sep 17 00:00:00 2001 From: liqionghai <1> Date: Wed, 6 Aug 2025 21:49:47 +0800 Subject: [PATCH] 1 --- YSZKDZBaoBiao/AccountsReceivableReport.cs | 17 +++++++++++++++-- .../应收对账单明细更新发票金额存储过程.sql | 5 ++--- 派诺报表SQL文件/应收对账表(明细创建).sql | 17 ++++++++++------- 派诺报表SQL文件/应收对账表(明细版存储过程).sql | 9 +++++++-- 派诺报表SQL文件/应收对账表(简易)更新数据.sql | 7 +++++-- 5 files changed, 39 insertions(+), 16 deletions(-) diff --git a/YSZKDZBaoBiao/AccountsReceivableReport.cs b/YSZKDZBaoBiao/AccountsReceivableReport.cs index c59417e..5980848 100644 --- a/YSZKDZBaoBiao/AccountsReceivableReport.cs +++ b/YSZKDZBaoBiao/AccountsReceivableReport.cs @@ -157,7 +157,8 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements sql += string.Format(@" INSERT INTO YingShouZhanKuanJY_GZTH(Number,OrderAmount,ShipmentsAmount,FBillAllAmount, - FALLAmountFor,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets) + FALLAmountFor,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets + ,[K3发货数量],[K3发货金额],[K3退货数量],[K3退货金额],[星空发货数量],[星空发货金额],[星空退货数量],[星空退货金额],PPFALLAmountFor,ZPFALLAmountFor,[K3专票金额],[K3普票金额]) Select '合计', SUM(OrderAmount) as OrderAmount, @@ -167,7 +168,19 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements SUM(PaymentAmount) as PaymentAmount, SUM(ShippedDebt) as ShippedDebt, SUM(InvoicedDebt) as InvoicedDebt, - SUM(OwedTickets) as OwedTickets + SUM(OwedTickets) as OwedTickets + ,SUM([K3发货数量]) as K3发货数量 + ,SUM([K3发货金额]) as K3发货金额 + ,SUM([K3退货数量]) as K3退货数量 + ,SUM([K3退货金额]) as K3退货金额 + ,SUM([星空发货数量]) as 星空发货数量 + ,SUM([星空发货金额]) as 星空发货金额 + ,SUM([星空退货数量]) as 星空退货数量 + ,SUM([星空退货金额]) as 星空退货金额 + ,SUM(PPFALLAmountFor) as PPFALLAmountFor + ,SUM(ZPFALLAmountFor) as ZPFALLAmountFor + ,SUM([K3专票金额]) as K3专票金额 + ,SUM([K3普票金额]) as K3普票金额 From YingShouZhanKuanJY_GZTH where 1=1 "); diff --git a/派诺报表SQL文件/应收对账单明细更新发票金额存储过程.sql b/派诺报表SQL文件/应收对账单明细更新发票金额存储过程.sql index 87efd59..2df7b40 100644 --- a/派诺报表SQL文件/应收对账单明细更新发票金额存储过程.sql +++ b/派诺报表SQL文件/应收对账单明细更新发票金额存储过程.sql @@ -1,5 +1,4 @@ -USE [AIS20250723115352] -GO + /****** Object: StoredProcedure [dbo].[GXFPJEYSDZDMX_GZTH] Script Date: 2025/8/2 10:22:54 ******/ SET ANSI_NULLS ON GO @@ -231,7 +230,7 @@ WHERE B.FPLX = 'רƱ' AND A.[ WHERE PPBillingAmount = 0 UPDATE YingShouZhanKuanMX_GZTH - SET OrderAmount=0,PaymentAmount=0,ShippedDebt=0,InvoicedDebt=0,IsEnded = NULL ,OwedTickets= 0,BillingAmount=0,PPBillingAmount=0,ZPBillingAmount=0,ZPBillingDate='',PPBillingDate='',PaymentDate = '' + SET OrderAmount=0,PaymentAmount=0,ShippedDebt=0,InvoicedDebt=0,IsEnded = NULL ,OwedTickets= 0,BillingAmount=0,PPBillingAmount=0,ZPBillingAmount=0,ZPBillingDate='',PPBillingDate='',PaymentDate = '',ShipmentsDate = '' from ( SELECT CASE WHEN ROW_NUMBER() OVER(PARTITION BY FBILLNO ORDER BY fid) = 1 THEN FBILLNO END AS ,* FROM YingShouZhanKuanMX_GZTH diff --git a/派诺报表SQL文件/应收对账表(明细创建).sql b/派诺报表SQL文件/应收对账表(明细创建).sql index fda18ea..171a2b0 100644 --- a/派诺报表SQL文件/应收对账表(明细创建).sql +++ b/派诺报表SQL文件/应收对账表(明细创建).sql @@ -1,6 +1,4 @@ -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 @@ -142,7 +140,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.Ʊ = 'ר' @@ -154,7 +152,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.Ʊ = '' @@ -209,7 +207,12 @@ INNER JOIN ( ,C.FSID AS ۶FENTRYID ,A.FApproveDate AS ,B.FQTY AS - ,B_F.FAllAmount_LC AS + ,B_F.FAllAmount_LC AS + ,STUFF((SELECT DISTINCT ','+FORMAT(FApproveDate,'yyyy-MM-dd') FROM T_SAL_DELIVERYNOTICE T1 + LEFT JOIN T_SAL_DELIVERYNOTICEENTRY T2 ON T1.FID = T2.FID + LEFT JOIN T_SAL_DELIVERYNOTICEENTRY_F T3 ON T2.FENTRYID = T3.FENTRYID + LEFT JOIN T_SAL_DELIVERYNOTICEENTRY_LK T4 ON T3.FENTRYID = T4.FENTRYID AND T4.FSTABLENAME = 'T_SAL_ORDERENTRY' + WHERE T4.FSBILLID IN (SELECT FID FROM YingShouZhanKuanMX_GZTH) AND C.FSBILLID = T4.FSBILLID FOR XML PATH('')),1,1,'') AS ϲ INTO #TEMP1 FROM T_SAL_DELIVERYNOTICE A LEFT JOIN T_SAL_DELIVERYNOTICEENTRY B ON A.FID = B.FID @@ -238,7 +241,7 @@ INNER JOIN ( GROUP BY ۶FID,۶FENTRYID UPDATE A - SET ShipmentsDate = FORMAT( B.,'yyyy-MM-dd') + SET ShipmentsDate = B.ϲ --FORMAT( B.,'yyyy-MM-dd') FROM YingShouZhanKuanMX_GZTH A INNER JOIN #TEMP1 B ON A.FID = B.۶FID AND A.FENTRYID = B.۶FENTRYID diff --git a/派诺报表SQL文件/应收对账表(明细版存储过程).sql b/派诺报表SQL文件/应收对账表(明细版存储过程).sql index ead5fd6..07cf418 100644 --- a/派诺报表SQL文件/应收对账表(明细版存储过程).sql +++ b/派诺报表SQL文件/应收对账表(明细版存储过程).sql @@ -202,7 +202,12 @@ INNER JOIN ( ,C.FSID AS ۶FENTRYID ,A.FApproveDate AS ,B.FQTY AS - ,B_F.FAllAmount_LC AS + ,B_F.FAllAmount_LC AS + ,STUFF((SELECT DISTINCT ','+FORMAT(FApproveDate,'yyyy-MM-dd') FROM T_SAL_DELIVERYNOTICE T1 + LEFT JOIN T_SAL_DELIVERYNOTICEENTRY T2 ON T1.FID = T2.FID + LEFT JOIN T_SAL_DELIVERYNOTICEENTRY_F T3 ON T2.FENTRYID = T3.FENTRYID + LEFT JOIN T_SAL_DELIVERYNOTICEENTRY_LK T4 ON T3.FENTRYID = T4.FENTRYID AND T4.FSTABLENAME = 'T_SAL_ORDERENTRY' + WHERE T4.FSBILLID IN (SELECT FID FROM YingShouZhanKuanMX_GZTH) AND C.FSBILLID = T4.FSBILLID FOR XML PATH('')),1,1,'') AS ϲ INTO #TEMP1 FROM T_SAL_DELIVERYNOTICE A LEFT JOIN T_SAL_DELIVERYNOTICEENTRY B ON A.FID = B.FID @@ -231,7 +236,7 @@ INNER JOIN ( GROUP BY ۶FID,۶FENTRYID UPDATE A - SET ShipmentsDate = FORMAT( B.,'yyyy-MM-dd') + SET ShipmentsDate = B.ϲ --FORMAT( B.,'yyyy-MM-dd') FROM YingShouZhanKuanMX_GZTH A INNER JOIN #TEMP1 B ON A.FID = B.۶FID AND A.FENTRYID = B.۶FENTRYID diff --git a/派诺报表SQL文件/应收对账表(简易)更新数据.sql b/派诺报表SQL文件/应收对账表(简易)更新数据.sql index b3103f3..7dafee6 100644 --- a/派诺报表SQL文件/应收对账表(简易)更新数据.sql +++ b/派诺报表SQL文件/应收对账表(简易)更新数据.sql @@ -4,9 +4,12 @@ BEGIN TRUNCATE TABLE YingShouZhanKuanJY_GZTH -INSERT INTO YingShouZhanKuanJY_GZTH(FID,FSaleOrgId,FSalerId,[DATE],ContractNumber,ProjectName,OrderAmount,FALLAmountFor,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets,IsEnded,Remark,[K3רƱ],[K3Ʊ],ZPFALLAmountFor,PPFALLAmountFor) +INSERT INTO YingShouZhanKuanJY_GZTH(FID,FSaleOrgId,FSalerId,[DATE],ContractNumber,ProjectName,OrderAmount,FALLAmountFor,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets,IsEnded,Remark,[K3רƱ],[K3Ʊ],ZPFALLAmountFor,PPFALLAmountFor +,[K3],[K3],[K3˻],[K3˻],[ǿշ],[ǿշ],[ǿ˻],[ǿ˻],ShipmentsAmount,FBillAllAmount) SELECT FID,FSaleOrgId,FSalerId,[Date],CONTRACTNUMBER,ProjectName,SUM(OrderAmount) OrderAmount,SUM(BillingAmount) BillingAmount,SUM(PaymentAmount) PaymentAmount,SUM(ShippedDebt) ShippedDebt -,SUM(InvoicedDebt) InvoicedDebt,SUM(OwedTickets) OwedTickets,null,Remark,SUM([K3רƱ]) [K3רƱ],SUM([K3Ʊ]) [K3Ʊ],SUM(ZPBillingAmount) [רƱƱ],SUM(PPBillingAmount) [ƱƱ] +,SUM(InvoicedDebt) InvoicedDebt,SUM(OwedTickets) OwedTickets,null,Remark,SUM([K3רƱ]) [K3רƱ],SUM([K3Ʊ]) [K3Ʊ],SUM(ZPBillingAmount) [רƱƱ],SUM(PPBillingAmount) [ƱƱ] +,SUM([K3]) [K3],SUM([K3]) [K3],SUM([K3˻]) [K3˻],SUM([K3˻]) [K3˻],SUM([ǿշ]) [ǿշ],SUM([ǿշ]) [ǿշ],SUM([ǿ˻]) [ǿ˻],SUM([ǿ˻]) [ǿ˻] +,SUM(ShipmentsAmount) ,SUM(ReturnAmount) ˻ FROM YingShouZhanKuanMX_GZTH WHERE Number <> 'ϼ' OR Number IS NULL GROUP BY FID,FSaleOrgId,FSalerId,[Date],CONTRACTNUMBER,ProjectName,Remark