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("PPBillingAmount", new LocaleValue("普票开票金额"), SqlStorageType.SqlDecimal);
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("PaymentDate", new LocaleValue("回款日期"), SqlStorageType.Sqlvarchar);
header.AddChild("PaymentAmount", new LocaleValue("回款金额"), SqlStorageType.SqlDecimal);
@ -164,7 +164,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
", FSDate,fDate,ZZFID,fClient,XSYFID,ZZHTH);
sql += string.Format(@"/*dialect*/
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
'',
SUM(FQTY),
@ -179,7 +179,10 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
SUM(PaymentAmount),
SUM(ShippedDebt),
SUM(InvoicedDebt),
SUM(OwedTickets)
SUM(OwedTickets),sum(K3退货金额) ,
SUM(PPBillingAmount),
SUM(ZPBillingAmount),
sum(退),SUM()
FROM
YingShouZhanKuanMX_GZTH
where 1=1
@ -190,7 +193,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
}
sql += string.Format(@"
SELECT
ROW_NUMBER() OVER (ORDER BY [FID]) AS FIDENTITYID,
ROW_NUMBER() OVER (ORDER BY [FID],OrderAmount desc) AS FIDENTITYID,
*
INTO {0}
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
WHERE B.FPLX = '专票' AND A.[K3数据] = 0
--
update A
SET A.QCZPBillingAmount = ISNULL(A.QCZPBillingAmount,0) + B.FAFTERTOTALTAXFOR
FROM YingShouZhanKuanMX_GZTH A
CROSS APPLY
(SELECT SUM(FAFTERTOTALTAXFOR) AS FAFTERTOTALTAXFOR
FROM T_IV_SALESIC
WHERE F_PAPERNUMBER = A.CONTRACTNUMBER
AND FBILLTYPEID = '50ea4e69b6144f69961d2e9b44820929'
AND FID NOT IN (SELECT FPFID FROM FPYSDZDMX)
AND A.[K3数据] = 0
) B
----
--UPDATE A
--SET A.QCZPBillingAmount =0 -- ISNULL(A.QCZPBillingAmount,0) + B.FAFTERTOTALTAXFOR
--FROM YingShouZhanKuanMX_GZTH A
--CROSS APPLY
--(SELECT SUM(FAFTERTOTALTAXFOR) AS FAFTERTOTALTAXFOR
--FROM T_IV_SALESIC
--WHERE F_PAPERNUMBER = A.CONTRACTNUMBER
--AND FBILLTYPEID = '50ea4e69b6144f69961d2e9b44820929'
--AND FID NOT IN (SELECT FPFID FROM FPYSDZDMX)
--AND A.[K3数据] = 0
--) B
--
update A
SET A.QCPPBillingAmount = ISNULL(A.QCPPBillingAmount,0)+ B.FAFTERTOTALTAXFOR
FROM YingShouZhanKuanMX_GZTH A
CROSS APPLY
(SELECT SUM(FAFTERTOTALTAXFOR) AS FAFTERTOTALTAXFOR
FROM T_IV_SALESIC
WHERE F_PAPERNUMBER = A.CONTRACTNUMBER
AND FBILLTYPEID = '1cab58bc33d24e27826be02249f4edac'
AND FID NOT IN (SELECT FPFID FROM FPYSDZDMX)
AND A.[K3数据] = 0
) B
----
--UPDATE A
--SET A.QCPPBillingAmount =0-- ISNULL(A.QCPPBillingAmount,0)+ B.FAFTERTOTALTAXFOR
--FROM YingShouZhanKuanMX_GZTH A
--CROSS APPLY
--(SELECT SUM(FAFTERTOTALTAXFOR) AS FAFTERTOTALTAXFOR
--FROM T_IV_SALESIC
--WHERE F_PAPERNUMBER = A.CONTRACTNUMBER
--AND FBILLTYPEID = '1cab58bc33d24e27826be02249f4edac'
--AND FID NOT IN (SELECT FPFID FROM FPYSDZDMX)
--AND A.[K3数据] = 0
--) B
--
UPDATE A
@ -56,23 +56,53 @@ BEGIN
FROM FPYSDZDMX A
INNER JOIN FPYSDZDHPMXHP B ON A.FPFID = B.LZFPFID AND A.FPFENTRYID = B.LZFPFENTRYID
UPDATE A
SET PPBillingAmount = PPBillingAmount + B.KPJE
FROM YingShouZhanKuanMX_GZTH A
INNER JOIN FPYSDZDMX B ON A.FID = B.XSDDFID AND A.FENTRYID = B.XSDDFENTRYID AND A.FSaleOrgId = B.FPJSZZ
WHERE B.FPLX = '普票' AND B.ISTrue = 1 AND A.[K3数据] = 0
--UPDATE A
--SET PPBillingAmount = 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.[K3数据] = 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.[K3数据] = 0
UPDATE A
SET ZPBillingAmount = ZPBillingAmount+ B.KPJE
SET PPBillingAmount = B.KPJE
FROM YingShouZhanKuanMX_GZTH A
INNER JOIN FPYSDZDMX B ON A.FID = B.XSDDFID AND A.FENTRYID = B.XSDDFENTRYID AND A.FSaleOrgId = B.FPJSZZ
WHERE B.FPLX = '专票' AND B.ISTrue = 1 AND A.[K3数据] = 0
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.[K3数据] = 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.[K3数据] = 0
--
SELECT
A.FID,
A.FENTRYID,
SUM(ISNULL(A.ZPBillingAmount,0)) + SUM(ISNULL(A.PPBillingAmount,0)) + SUM(ISNULL(A.QCZPBillingAmount,0)) + SUM(ISNULL(A.QCPPBillingAmount,0)) AS '专票金额'
SUM(ISNULL(A.ZPBillingAmount,0)) + SUM(ISNULL(A.PPBillingAmount,0)) + SUM(ISNULL(A.K3专票金额,0)) + SUM(ISNULL(A.K3普票金额,0)) AS '专票金额'
INTO #TEMP3
FROM YingShouZhanKuanMX_GZTH A
WHERE A.[K3数据] = 0
@ -88,10 +118,10 @@ BEGIN
--
-- OrderAmount=0,PaymentAmount=0,ShippedDebt=0,InvoicedDebt=0,IsEnded = NULL ,OwedTickets= 0,BillingAmount=0
SELECT
FID, SUM(ShipmentsAmount) - avg(PaymentAmount) AS '已出货欠款',avg(BillingAmount) - avg(PaymentAmount) AS '已开票欠款',SUM(OrderAmount) - SUM(BillingAmount) AS '欠票',
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(PaymentAmount,0))
FID, SUM(ShipmentsAmount) - AVG(PaymentAmount) AS '已出货欠款',AVG(BillingAmount) - AVG(PaymentAmount) AS '已开票欠款',SUM(OrderAmount) - SUM(BillingAmount) AS '欠票',
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(PaymentAmount,0))
THEN '已完结'
ELSE '未完结'
END AS '是否已完结'
@ -110,7 +140,7 @@ BEGIN
--
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
FROM YingShouZhanKuanMX_GZTH

View File

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