1
This commit is contained in:
parent
827cbdd1f7
commit
892d5d36c6
@ -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,
|
||||
@ -168,6 +169,18 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
|
||||
SUM(ShippedDebt) as ShippedDebt,
|
||||
SUM(InvoicedDebt) as InvoicedDebt,
|
||||
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
|
||||
");
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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.发票类型 = '普'
|
||||
@ -210,6 +208,11 @@ INNER JOIN (
|
||||
,A.FApproveDate AS 发货日期
|
||||
,B.FQTY 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
|
||||
|
||||
|
||||
@ -203,6 +203,11 @@ INNER JOIN (
|
||||
,A.FApproveDate AS 发货日期
|
||||
,B.FQTY 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
|
||||
|
||||
|
||||
@ -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([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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user