This commit is contained in:
2025-07-18 14:11:14 +08:00
parent a8909d9268
commit 4e4c9f04ff
3 changed files with 102 additions and 69 deletions

View File

@@ -93,7 +93,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
header.AddChild("PPBillingDate", new LocaleValue("普票开票日期"), SqlStorageType.Sqlvarchar); header.AddChild("PPBillingDate", new LocaleValue("普票开票日期"), SqlStorageType.Sqlvarchar);
header.AddChild("PPBillingAmount", new LocaleValue("普票开票金额"), SqlStorageType.SqlDecimal); header.AddChild("PPBillingAmount", new LocaleValue("普票开票金额"), SqlStorageType.SqlDecimal);
header.AddChild("ZPBillingDate", new LocaleValue("专票开票日期"), SqlStorageType.Sqlvarchar); header.AddChild("ZPBillingDate", new LocaleValue("专票开票日期"), SqlStorageType.Sqlvarchar);
header.AddChild("ZPBillingAmount", 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("PaymentDate", new LocaleValue("回款日期"), SqlStorageType.Sqlvarchar);
header.AddChild("PaymentAmount", new LocaleValue("回款金额"), SqlStorageType.SqlDecimal); header.AddChild("PaymentAmount", new LocaleValue("回款金额"), SqlStorageType.SqlDecimal);
@@ -164,7 +164,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
", FSDate,fDate,ZZFID,fClient,XSYFID,ZZHTH); ", FSDate,fDate,ZZFID,fClient,XSYFID,ZZHTH);
sql += string.Format(@"/*dialect*/ sql += string.Format(@"/*dialect*/
INSERT INTO YingShouZhanKuanMX_GZTH(NUMBER,FQTY,FTAXPRICE,FALLAMOUNT,OrderAmount,ShipmentsNum,ShipmentsAmount, INSERT INTO YingShouZhanKuanMX_GZTH(NUMBER,FQTY,FTAXPRICE,FALLAMOUNT,OrderAmount,ShipmentsNum,ShipmentsAmount,
ReturnNum,ReturnAmount,BillingAmount,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets) ReturnNum,ReturnAmount,BillingAmount,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets,[K3退货金额],PPBillingAmount,ZPBillingAmount,[星空退货金额],[星空发货金额])
SELECT SELECT
'合计', '合计',
SUM(FQTY), SUM(FQTY),
@@ -179,7 +179,10 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
SUM(PaymentAmount), SUM(PaymentAmount),
SUM(ShippedDebt), SUM(ShippedDebt),
SUM(InvoicedDebt), SUM(InvoicedDebt),
SUM(OwedTickets) SUM(OwedTickets),sum(K3退货金额) ,
SUM(PPBillingAmount),
SUM(ZPBillingAmount),
sum(星空退货金额),SUM(星空发货金额)
FROM FROM
YingShouZhanKuanMX_GZTH YingShouZhanKuanMX_GZTH
where 1=1 where 1=1
@@ -190,7 +193,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
} }
sql += string.Format(@" sql += string.Format(@"
SELECT SELECT
ROW_NUMBER() OVER (ORDER BY [FID]) AS FIDENTITYID, ROW_NUMBER() OVER (ORDER BY [FID],OrderAmount desc) AS FIDENTITYID,
* *
INTO {0} INTO {0}
FROM YingShouZhanKuanMX_GZTH FROM YingShouZhanKuanMX_GZTH

View File

@@ -24,31 +24,31 @@ BEGIN
INNER JOIN FPYSDZDMX B ON A.FID = B.XSDDFID AND A.FENTRYID = B.XSDDFENTRYID AND A.FSaleOrgId = B.FPJSZZ INNER JOIN FPYSDZDMX B ON A.FID = B.XSDDFID AND A.FENTRYID = B.XSDDFENTRYID AND A.FSaleOrgId = B.FPJSZZ
WHERE B.FPLX = 'רƱ' AND A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0 WHERE B.FPLX = 'רƱ' AND A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0
--<EFBFBD>ڳ<EFBFBD>רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> ----<EFBFBD>ڳ<EFBFBD>רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
update A --UPDATE A
SET A.QCZPBillingAmount = ISNULL(A.QCZPBillingAmount,0) + B.FAFTERTOTALTAXFOR --SET A.QCZPBillingAmount =0 -- ISNULL(A.QCZPBillingAmount,0) + B.FAFTERTOTALTAXFOR
FROM YingShouZhanKuanMX_GZTH A --FROM YingShouZhanKuanMX_GZTH A
CROSS APPLY --CROSS APPLY
(SELECT SUM(FAFTERTOTALTAXFOR) AS FAFTERTOTALTAXFOR --(SELECT SUM(FAFTERTOTALTAXFOR) AS FAFTERTOTALTAXFOR
FROM T_IV_SALESIC --FROM T_IV_SALESIC
WHERE F_PAPERNUMBER = A.CONTRACTNUMBER --WHERE F_PAPERNUMBER = A.CONTRACTNUMBER
AND FBILLTYPEID = '50ea4e69b6144f69961d2e9b44820929' --AND FBILLTYPEID = '50ea4e69b6144f69961d2e9b44820929'
AND FID NOT IN (SELECT FPFID FROM FPYSDZDMX) --AND FID NOT IN (SELECT FPFID FROM FPYSDZDMX)
AND A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0 --AND A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0
) B --) B
--<EFBFBD>ڳ<EFBFBD><EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> ----<EFBFBD>ڳ<EFBFBD><EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
update A --UPDATE A
SET A.QCPPBillingAmount = ISNULL(A.QCPPBillingAmount,0)+ B.FAFTERTOTALTAXFOR --SET A.QCPPBillingAmount =0-- ISNULL(A.QCPPBillingAmount,0)+ B.FAFTERTOTALTAXFOR
FROM YingShouZhanKuanMX_GZTH A --FROM YingShouZhanKuanMX_GZTH A
CROSS APPLY --CROSS APPLY
(SELECT SUM(FAFTERTOTALTAXFOR) AS FAFTERTOTALTAXFOR --(SELECT SUM(FAFTERTOTALTAXFOR) AS FAFTERTOTALTAXFOR
FROM T_IV_SALESIC --FROM T_IV_SALESIC
WHERE F_PAPERNUMBER = A.CONTRACTNUMBER --WHERE F_PAPERNUMBER = A.CONTRACTNUMBER
AND FBILLTYPEID = '1cab58bc33d24e27826be02249f4edac' --AND FBILLTYPEID = '1cab58bc33d24e27826be02249f4edac'
AND FID NOT IN (SELECT FPFID FROM FPYSDZDMX) --AND FID NOT IN (SELECT FPFID FROM FPYSDZDMX)
AND A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0 --AND A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0
) B --) B
--<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD>ƺ<EFBFBD>Ʊ<EFBFBD>Ŀ<EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> --<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD>ƺ<EFBFBD>Ʊ<EFBFBD>Ŀ<EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
UPDATE A UPDATE A
@@ -56,23 +56,53 @@ BEGIN
FROM FPYSDZDMX A FROM FPYSDZDMX A
INNER JOIN FPYSDZDHPMXHP B ON A.FPFID = B.LZFPFID AND A.FPFENTRYID = B.LZFPFENTRYID INNER JOIN FPYSDZDHPMXHP B ON A.FPFID = B.LZFPFID AND A.FPFENTRYID = B.LZFPFENTRYID
UPDATE A --UPDATE A
SET PPBillingAmount = PPBillingAmount + B.KPJE --SET PPBillingAmount = B.KPJE
FROM YingShouZhanKuanMX_GZTH A --FROM YingShouZhanKuanMX_GZTH A
INNER JOIN FPYSDZDMX B ON A.FID = B.XSDDFID AND A.FENTRYID = B.XSDDFENTRYID AND A.FSaleOrgId = B.FPJSZZ --INNER JOIN (SELECT bb.XSDDFID,bb.XSDDFENTRYID,bb.FPJSZZ,SUM(KPJE) KPJE FROM FPYSDZDMX bb
WHERE B.FPLX = '<EFBFBD><EFBFBD>Ʊ' AND B.ISTrue = 1 AND A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0 --WHERE bB.FPLX = '<EFBFBD><EFBFBD>Ʊ'
--GROUP BY bb.XSDDFID,bb.XSDDFENTRYID,bb.FPJSZZ ) B
--ON A.FID = B.XSDDFID AND A.FENTRYID = B.XSDDFENTRYID AND A.FSaleOrgId = B.FPJSZZ
--WHERE A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0
--UPDATE A
--SET ZPBillingAmount = B.KPJE
--FROM YingShouZhanKuanMX_GZTH A
--INNER JOIN (SELECT bb.XSDDFID,bb.XSDDFENTRYID,bb.FPJSZZ,SUM(KPJE) KPJE FROM FPYSDZDMX bb
--WHERE bB.FPLX = 'רƱ'
--GROUP BY bb.XSDDFID,bb.XSDDFENTRYID,bb.FPJSZZ ) B
--ON A.FID = B.XSDDFID AND A.FENTRYID = B.XSDDFENTRYID AND A.FSaleOrgId = B.FPJSZZ
--WHERE A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0
UPDATE A UPDATE A
SET ZPBillingAmount = ZPBillingAmount+ B.KPJE SET PPBillingAmount = B.KPJE
FROM YingShouZhanKuanMX_GZTH A FROM YingShouZhanKuanMX_GZTH A
INNER JOIN FPYSDZDMX B ON A.FID = B.XSDDFID AND A.FENTRYID = B.XSDDFENTRYID AND A.FSaleOrgId = B.FPJSZZ INNER JOIN ( SELECT SUM(cc.KPJE) KPJE,XSDDFID,cc.FPJSZZ FROM (
WHERE B.FPLX = 'רƱ' AND B.ISTrue = 1 AND A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0 SELECT DISTINCT bb.XSDDFID,bb.FPFENTRYID,bb.KPJE ,bb.FPJSZZ FROM FPYSDZDMX bb
WHERE bb.FPLX = '<EFBFBD><EFBFBD>Ʊ' ) cc
GROUP BY cc.XSDDFID,cc.FPJSZZ ) B
ON A.FID = B.XSDDFID AND A.FSaleOrgId = B.FPJSZZ
WHERE A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0
UPDATE A
SET ZPBillingAmount = B.KPJE
FROM YingShouZhanKuanMX_GZTH A
INNER JOIN ( SELECT SUM(cc.KPJE) KPJE,XSDDFID,cc.FPJSZZ FROM (
SELECT DISTINCT bb.XSDDFID,bb.FPFENTRYID,bb.KPJE ,bb.FPJSZZ FROM FPYSDZDMX bb
WHERE bb.FPLX = 'רƱ' ) cc
GROUP BY cc.XSDDFID,cc.FPJSZZ ) B
ON A.FID = B.XSDDFID AND A.FSaleOrgId = B.FPJSZZ
WHERE A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0
--<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڳ<EFBFBD><EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֵ<EFBFBD><EFBFBD>ֵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>еĿ<EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> --<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڳ<EFBFBD><EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֵ<EFBFBD><EFBFBD>ֵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>еĿ<EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
SELECT SELECT
A.FID, A.FID,
A.FENTRYID, A.FENTRYID,
SUM(ISNULL(A.ZPBillingAmount,0)) + SUM(ISNULL(A.PPBillingAmount,0)) + SUM(ISNULL(A.QCZPBillingAmount,0)) + SUM(ISNULL(A.QCPPBillingAmount,0)) AS 'רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>' SUM(ISNULL(A.ZPBillingAmount,0)) + SUM(ISNULL(A.PPBillingAmount,0)) + SUM(ISNULL(A.K3רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>,0)) + SUM(ISNULL(A.K3<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>,0)) AS 'רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
INTO #TEMP3 INTO #TEMP3
FROM YingShouZhanKuanMX_GZTH A FROM YingShouZhanKuanMX_GZTH A
WHERE A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0 WHERE A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0
@@ -88,10 +118,10 @@ BEGIN
--<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѳ<EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><EFBFBD>ѿ<EFBFBD>ƱǷ<EFBFBD>ǷƱ<EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֶ<EFBFBD> --<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѳ<EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><EFBFBD>ѿ<EFBFBD>ƱǷ<EFBFBD>ǷƱ<EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֶ<EFBFBD>
-- OrderAmount=0,PaymentAmount=0,ShippedDebt=0,InvoicedDebt=0,IsEnded = NULL ,OwedTickets= 0,BillingAmount=0 -- OrderAmount=0,PaymentAmount=0,ShippedDebt=0,InvoicedDebt=0,IsEnded = NULL ,OwedTickets= 0,BillingAmount=0
SELECT SELECT
FID, SUM(ShipmentsAmount) - avg(PaymentAmount) AS '<EFBFBD>ѳ<EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><EFBFBD>',avg(BillingAmount) - avg(PaymentAmount) AS '<EFBFBD>ѿ<EFBFBD>ƱǷ<EFBFBD><EFBFBD>',SUM(OrderAmount) - SUM(BillingAmount) AS 'ǷƱ', FID, SUM(ShipmentsAmount) - AVG(PaymentAmount) AS '<EFBFBD>ѳ<EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><EFBFBD>',AVG(BillingAmount) - AVG(PaymentAmount) AS '<EFBFBD>ѿ<EFBFBD>ƱǷ<EFBFBD><EFBFBD>',SUM(OrderAmount) - SUM(BillingAmount) AS 'ǷƱ',
CASE WHEN (avg(ISNULL(OrderAmount,0)) - SUM(ISNULL(ReturnAmount,0))) = SUM(ISNULL(ShipmentsAmount,0)) CASE WHEN (AVG(ISNULL(OrderAmount,0)) - SUM(ISNULL(ReturnAmount,0))) = SUM(ISNULL(ShipmentsAmount,0))
AND (avg(ISNULL(OrderAmount,0)) - SUM(ISNULL(ReturnAmount,0))) = avg(ISNULL(BillingAmount,0)) AND (AVG(ISNULL(OrderAmount,0)) - SUM(ISNULL(ReturnAmount,0))) = AVG(ISNULL(BillingAmount,0))
AND (avg(ISNULL(OrderAmount,0)) - SUM(ISNULL(ReturnAmount,0))) = avg(ISNULL(PaymentAmount,0)) AND (AVG(ISNULL(OrderAmount,0)) - SUM(ISNULL(ReturnAmount,0))) = AVG(ISNULL(PaymentAmount,0))
THEN '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' THEN '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
ELSE 'δ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>' ELSE 'δ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
END AS '<EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' END AS '<EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
@@ -110,7 +140,7 @@ BEGIN
--<EFBFBD>Ա<EFBFBD><EFBFBD>е<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݽ<EFBFBD><EFBFBD>е<EFBFBD><EFBFBD><EFBFBD> --<EFBFBD>Ա<EFBFBD><EFBFBD>е<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݽ<EFBFBD><EFBFBD>е<EFBFBD><EFBFBD><EFBFBD>
SELECT SELECT
*, *,
ROW_NUMBER() OVER (PARTITION BY FID ORDER BY FID) as row_num1 ROW_NUMBER() OVER (PARTITION BY FID ORDER BY FID) AS row_num1
INTO #TEMP5 INTO #TEMP5
FROM YingShouZhanKuanMX_GZTH FROM YingShouZhanKuanMX_GZTH

View File

@@ -5,12 +5,12 @@ GO
SET QUOTED_IDENTIFIER ON SET QUOTED_IDENTIFIER ON
GO GO
ALTER PROCEDURE [dbo].[UpdateYSDZBMX_GZTH] ALTER PROCEDURE [dbo].[UpdateYSDZBMX_GZTH]
@FSDATE varchar(1000), @FSDATE VARCHAR(1000),
@FEDATE varchar(1000), @FEDATE VARCHAR(1000),
@FSaleOrgId varchar(1000), @FSaleOrgId VARCHAR(1000),
@FCUSTID varchar(1000), @FCUSTID VARCHAR(1000),
@XSYFID varchar(1000), @XSYFID VARCHAR(1000),
@ZZHTH varchar(1000) @ZZHTH VARCHAR(1000)
AS AS
BEGIN BEGIN
DECLARE @StartDate DATE = CONVERT(DATE, @FSDATE); DECLARE @StartDate DATE = CONVERT(DATE, @FSDATE);