This commit is contained in:
liqionghai 2025-08-06 21:49:47 +08:00
parent 827cbdd1f7
commit 892d5d36c6
5 changed files with 39 additions and 16 deletions

View File

@ -157,7 +157,8 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
sql += string.Format(@" sql += string.Format(@"
INSERT INTO YingShouZhanKuanJY_GZTH(Number,OrderAmount,ShipmentsAmount,FBillAllAmount, 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 Select
'', '',
SUM(OrderAmount) as OrderAmount, SUM(OrderAmount) as OrderAmount,
@ -167,7 +168,19 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
SUM(PaymentAmount) as PaymentAmount, SUM(PaymentAmount) as PaymentAmount,
SUM(ShippedDebt) as ShippedDebt, SUM(ShippedDebt) as ShippedDebt,
SUM(InvoicedDebt) as InvoicedDebt, 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 From YingShouZhanKuanJY_GZTH
where 1=1 where 1=1
"); ");

View File

@ -1,5 +1,4 @@
USE [AIS20250723115352]
GO
/****** Object: StoredProcedure [dbo].[GXFPJEYSDZDMX_GZTH] Script Date: 2025/8/2 10:22:54 ******/ /****** Object: StoredProcedure [dbo].[GXFPJEYSDZDMX_GZTH] Script Date: 2025/8/2 10:22:54 ******/
SET ANSI_NULLS ON SET ANSI_NULLS ON
GO GO
@ -231,7 +230,7 @@ WHERE B.FPLX = 'רƱ' AND A.[
WHERE PPBillingAmount = 0 WHERE PPBillingAmount = 0
UPDATE YingShouZhanKuanMX_GZTH 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 ( from (
SELECT CASE WHEN ROW_NUMBER() OVER(PARTITION BY FBILLNO ORDER BY fid) = 1 THEN FBILLNO SELECT CASE WHEN ROW_NUMBER() OVER(PARTITION BY FBILLNO ORDER BY fid) = 1 THEN FBILLNO
END AS µ¥ºÅ,* FROM YingShouZhanKuanMX_GZTH END AS µ¥ºÅ,* FROM YingShouZhanKuanMX_GZTH

View File

@ -1,6 +1,4 @@
USE [AIS20250723115352]
GO
/****** Object: StoredProcedure [dbo].[UpdateYSDZBMX_GZTH] Script Date: 2025/8/2 10:16:20 ******/
SET ANSI_NULLS ON SET ANSI_NULLS ON
GO GO
SET QUOTED_IDENTIFIER ON SET QUOTED_IDENTIFIER ON
@ -142,7 +140,7 @@ UPDATE a
SET a.[K3专票金额] = b. SET a.[K3专票金额] = b.
FROM YingShouZhanKuanMX_GZTH A FROM YingShouZhanKuanMX_GZTH A
INNER JOIN T_SAL_ORDERENTRY C ON A.FENTRYID = C.FENTRYID 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) 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 WHERE K3数据=0
AND b. = '' AND b. = ''
@ -154,7 +152,7 @@ UPDATE a
SET a.[K3普票金额] = b. SET a.[K3普票金额] = b.
FROM YingShouZhanKuanMX_GZTH A FROM YingShouZhanKuanMX_GZTH A
INNER JOIN T_SAL_ORDERENTRY C ON A.FENTRYID = C.FENTRYID 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) 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 WHERE K3数据=0
AND b. = '' AND b. = ''
@ -209,7 +207,12 @@ INNER JOIN (
,C.FSID AS FENTRYID ,C.FSID AS FENTRYID
,A.FApproveDate AS ,A.FApproveDate AS
,B.FQTY 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 INTO #TEMP1
FROM T_SAL_DELIVERYNOTICE A FROM T_SAL_DELIVERYNOTICE A
LEFT JOIN T_SAL_DELIVERYNOTICEENTRY B ON A.FID = B.FID LEFT JOIN T_SAL_DELIVERYNOTICEENTRY B ON A.FID = B.FID
@ -238,7 +241,7 @@ INNER JOIN (
GROUP BY FID,FENTRYID GROUP BY FID,FENTRYID
UPDATE A UPDATE A
SET ShipmentsDate = FORMAT( B.,'yyyy-MM-dd') SET ShipmentsDate = B. --FORMAT( B.,'yyyy-MM-dd')
FROM YingShouZhanKuanMX_GZTH A FROM YingShouZhanKuanMX_GZTH A
INNER JOIN #TEMP1 B ON A.FID = B.销售订单FID AND A.FENTRYID = B.销售订单FENTRYID INNER JOIN #TEMP1 B ON A.FID = B.销售订单FID AND A.FENTRYID = B.销售订单FENTRYID

View File

@ -202,7 +202,12 @@ INNER JOIN (
,C.FSID AS FENTRYID ,C.FSID AS FENTRYID
,A.FApproveDate AS ,A.FApproveDate AS
,B.FQTY 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 INTO #TEMP1
FROM T_SAL_DELIVERYNOTICE A FROM T_SAL_DELIVERYNOTICE A
LEFT JOIN T_SAL_DELIVERYNOTICEENTRY B ON A.FID = B.FID LEFT JOIN T_SAL_DELIVERYNOTICEENTRY B ON A.FID = B.FID
@ -231,7 +236,7 @@ INNER JOIN (
GROUP BY FID,FENTRYID GROUP BY FID,FENTRYID
UPDATE A UPDATE A
SET ShipmentsDate = FORMAT( B.,'yyyy-MM-dd') SET ShipmentsDate = B. --FORMAT( B.,'yyyy-MM-dd')
FROM YingShouZhanKuanMX_GZTH A FROM YingShouZhanKuanMX_GZTH A
INNER JOIN #TEMP1 B ON A.FID = B.饋簡땐데FID AND A.FENTRYID = B.饋簡땐데FENTRYID INNER JOIN #TEMP1 B ON A.FID = B.饋簡땐데FID AND A.FENTRYID = B.饋簡땐데FENTRYID

View File

@ -4,9 +4,12 @@ BEGIN
TRUNCATE TABLE YingShouZhanKuanJY_GZTH 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 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 FROM YingShouZhanKuanMX_GZTH
WHERE Number <> 'ºÏ¼Æ' OR Number IS NULL WHERE Number <> 'ºÏ¼Æ' OR Number IS NULL
GROUP BY FID,FSaleOrgId,FSalerId,[Date],CONTRACTNUMBER,ProjectName,Remark GROUP BY FID,FSaleOrgId,FSalerId,[Date],CONTRACTNUMBER,ProjectName,Remark