This commit is contained in:
liqionghai 2025-08-26 19:18:50 +08:00
parent 6480727e0d
commit d4f410c5fd
6 changed files with 53 additions and 39 deletions

View File

@ -94,7 +94,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
header.AddChild("PPBillingAmount", new LocaleValue("星空普票开票金额"), SqlStorageType.SqlDecimal);
header.AddChild("ZPBillingDate", 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("PaymentAmount", new LocaleValue("回款金额"), SqlStorageType.SqlDecimal);
header.AddChild("ShippedDebt", new LocaleValue("已出货欠款"), SqlStorageType.SqlDecimal);

View File

@ -284,7 +284,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivable
c1.CellStyle = cellStyle;
ICell c2 = rowi.CreateCell(1); c2.SetCellValue(""+date+""); c2.CellStyle = cellStyle2;
ICell c3 = rowi.CreateCell(2); c3.SetCellValue(list[i]["CONTRACTNUMBER"].ToString()); c3.CellStyle = cellStyle2;
ICell c4 = rowi.CreateCell(3); c4.SetCellValue(list[i]["FBILLNO"].ToString()); c4.CellStyle = cellStyle2;
ICell c4 = rowi.CreateCell(3); c4.SetCellValue(list[i]["ProjectName"].ToString()); c4.CellStyle = cellStyle2;
ICell c5 = rowi.CreateCell(4); c5.SetCellValue(list[i]["SizeModel"].ToString()); c5.CellStyle = cellStyle2;
ICell c6 = rowi.CreateCell(5); c6.SetCellValue(""); c6.CellStyle = cellStyle; //数量

View File

@ -489,7 +489,7 @@ TRUNCATE TABLE YJPHB_GZTH
INNER join ZZV_XiaoShouHuiLv HL on a.fid = HL.ID
INNER JOIN #ThisYearChange t1 on t1.FPKIDX = A.FID -- 今年变更的销售订单新变更单
LEFT JOIN T_SAL_XORDERFIN t1fen on t1.ChangeOrderId = t1fen.FID -- 关联变更单的金额
LEFT JOIN #LastYearChange t2 on t1.FPKIDX = A.FID -- 去年变更的销售订单新变更单
LEFT JOIN #LastYearChange t2 on t2.FPKIDX = A.FID -- 去年变更的销售订单新变更单
LEFT JOIN T_SAL_XORDERFIN t2fen on t2.ChangeOrderId = t2fen.FID -- 关联变更单的金额
LEFT JOIN V_BD_SALESMAN_L L ON L.fid = A.FSALERID
left JOIN T_PerformanceSharing M ON M.FSOURCEBILLNO = A.FBILLNO AND M.FDOCUMENTSTATUS = 'C'
@ -695,26 +695,26 @@ SELECT [
FROM
(
SELECT [_SBU],[],[],
SUM([_含往年订单变更])/10000 AS '派诺业绩_含往年订单变更',
SUM([_含往年订单变更])/10000 AS '兴诺业绩_含往年订单变更',
SUM([_含往年订单变更])/10000 AS '武汉派诺业绩_含往年订单变更',
SUM([广_含往年订单变更])/10000 AS '广东碳索业绩_含往年订单变更',
SUM([_含往年订单变更])/10000 AS '香港派诺业绩_含往年订单变更',
SUM([_含往年订单变更])/10000 AS '华夏云联业绩_含往年订单变更',
SUM([_含往年订单变更])/10000 AS '诺瓦数能业绩_含往年订单变更',
SUM([])/10000 AS '派诺累计回款额',
SUM([])/10000 AS '兴诺累计回款额',
SUM([])/10000 AS '武汉派诺累计回款额',
SUM([广])/10000 AS '广东碳索累计回款额',
SUM([])/10000 AS '香港派诺累计回款额',
SUM([])/10000 AS '华夏云联累计回款额',
SUM([])/10000 AS '诺瓦数能累计回款额',
SUM([1])/10000 AS '年度销售额1',
SUM([2])/10000 AS '年度销售额2',
SUM([3])/10000 AS '年度销售额3',
SUM([4])/10000 AS '年度销售额4',
SUM([5])/10000 AS '年度销售额5',
SUM([6])/10000 AS '年度销售额6'
SUM(ISNULL([_含往年订单变更],0))/10000 AS '派诺业绩_含往年订单变更',
SUM(ISNULL([_含往年订单变更],0))/10000 AS '兴诺业绩_含往年订单变更',
SUM(ISNULL([_含往年订单变更],0))/10000 AS '武汉派诺业绩_含往年订单变更',
SUM(ISNULL([广_含往年订单变更],0))/10000 AS '广东碳索业绩_含往年订单变更',
SUM(ISNULL([_含往年订单变更],0))/10000 AS '香港派诺业绩_含往年订单变更',
SUM(ISNULL([_含往年订单变更],0))/10000 AS '华夏云联业绩_含往年订单变更',
SUM(ISNULL([_含往年订单变更],0))/10000 AS '诺瓦数能业绩_含往年订单变更',
SUM(ISNULL([],0))/10000 AS '派诺累计回款额',
SUM(ISNULL([],0))/10000 AS '兴诺累计回款额',
SUM(ISNULL([],0))/10000 AS '武汉派诺累计回款额',
SUM(ISNULL([广],0))/10000 AS '广东碳索累计回款额',
SUM(ISNULL([],0))/10000 AS '香港派诺累计回款额',
SUM(ISNULL([],0))/10000 AS '华夏云联累计回款额',
SUM(ISNULL([],0))/10000 AS '诺瓦数能累计回款额',
SUM(ISNULL([1],0))/10000 AS '年度销售额1',
SUM(ISNULL([2],0))/10000 AS '年度销售额2',
SUM(ISNULL([3],0))/10000 AS '年度销售额3',
SUM(ISNULL([4],0))/10000 AS '年度销售额4',
SUM(ISNULL([5],0))/10000 AS '年度销售额5',
SUM(ISNULL([6],0))/10000 AS '年度销售额6'
FROM YJPHB_GZTH
GROUP BY [_SBU],[],[]
) AS IDa
@ -733,15 +733,15 @@ SELECT [
--
update A
SET [] = B.[]/10000
SET [] = ISNULL(B.[],0)/10000
FROM YJPHB_GZTH A
INNER JOIN (SELECT [],SUM([]) AS '订单业绩' FROM #TEMP1 GROUP BY [销售员]) B ON A.[姓名] = B.[销售员]
LEFT JOIN (SELECT [],SUM([]) AS '订单业绩' FROM #TEMP1 GROUP BY [销售员]) B ON A.[姓名] = B.[销售员]
--
update A
SET [] = B.[]/10000
SET [] = ISNULL(B.[],0)/10000
FROM YJPHB_GZTH A
INNER JOIN (SELECT [],SUM([]) AS '变更金额' FROM #BGTEMP1 GROUP BY [销售员]) B ON A.[姓名] = B.[销售员]
LEFT JOIN (SELECT [],SUM([]) AS '变更金额' FROM #BGTEMP1 GROUP BY [销售员]) B ON A.[姓名] = B.[销售员]
---()
UPDATE YJPHB_GZTH
@ -810,7 +810,7 @@ FROM YJPHB_GZTH A
--[_新]
UPDATE A
SET A.[_新] = B.FPERFORMANCETARGETS
SET A.[_新] = ISNULL(B.FPERFORMANCETARGETS,0)
FROM YJPHB_GZTH A
LEFT JOIN(SELECT ROW_NUMBER() OVER (PARTITION BY t3.FNAME ORDER BY F_MBBA_CREATEDATE_6OQ DESC) rn,t3.FNAME [],
YEAR(F_VRYF_DATE_83G) [],t2.F_MBBA_CREATEDATE_6OQ [],FPERFORMANCETARGETS
@ -822,7 +822,7 @@ WHERE YEAR(F_VRYF_DATE_83G)= YEAR(@FSDate) AND t2.FDOCUMENTSTATUS = 'C'
--[_原]
UPDATE A
SET A.[_原] = B.FPERFORMANCETARGETS
SET A.[_原] = ISNULL(B.FPERFORMANCETARGETS,0)
FROM YJPHB_GZTH A
LEFT JOIN(SELECT ROW_NUMBER() OVER (PARTITION BY t3.FNAME ORDER BY F_MBBA_CREATEDATE_6OQ ASC) rn,t3.FNAME [],
YEAR(F_VRYF_DATE_83G) [],t2.F_MBBA_CREATEDATE_6OQ [],FPERFORMANCETARGETS

View File

@ -87,13 +87,16 @@ SET PPBillingDate = CASE ISNULL(A.PPBillingDate,'') WHEN '' THEN '' ELSE A.PPBil
FROM YingShouZhanKuanMX_GZTH A
INNER JOIN (
SELECT (
stuff((select ','+format(convert(date,),'yyyy-MM-dd') from (select distinct ,, from oldk3ICSale0802)b WHERE = A. AND = '' FOR xml path('')),1,1,'')) FPRQ,
,
stuff((select ','+format(convert(date,),'yyyy-MM-dd') from (select distinct ,,, from oldk3ICSale0802)b WHERE = A. AND = '' AND ISNULL(,'') <> 1 FOR xml path('')),1,1,'')) FPRQ,
,,
FROM oldk3ICSale0802 A
WHERE = ''
GROUP BY ,) B
AND ISNULL(,'') <> 1
GROUP BY ,,) B
ON A.CONTRACTNUMBER = B.
WHERE B. = '' AND A.[K3数据] = 0
WHERE B. = ''
AND A.[K3数据] = 0
AND ISNULL(B.,'') <> 1
-- UPDATE A
--SET ZPBillingDate = FORMAT(CONVERT(DATE, B.FPRQ), 'yyyy-MM-dd')
@ -193,8 +196,8 @@ WHERE B.
SELECT
A.FID,
A.FENTRYID,
--SUM(ISNULL(A.ZPBillingAmount,0)) + SUM(ISNULL(A.PPBillingAmount,0)) + SUM(ISNULL(A.K3专票金额,0)) + SUM(ISNULL(A.K3普票金额,0)) AS '专票金额'
SUM(ISNULL(A.ZPBillingAmount,0)) + SUM(ISNULL(A.K3专票金额,0)) AS '专票金额'
SUM(ISNULL(A.ZPBillingAmount,0)) + SUM(ISNULL(A.PPBillingAmount,0)) + SUM(ISNULL(A.K3专票金额,0)) + SUM(ISNULL(A.K3普票金额,0)) AS '专票金额'
--SUM(ISNULL(A.ZPBillingAmount,0)) + SUM(ISNULL(A.K3专票金额,0)) AS '专票金额'
INTO #TEMP3
FROM YingShouZhanKuanMX_GZTH A
WHERE A.[K3数据] = 0

View File

@ -155,11 +155,11 @@ UPDATE a
SET a.[K3普票金额] = b.
FROM YingShouZhanKuanMX_GZTH A
INNER JOIN T_SAL_ORDERENTRY C ON A.FENTRYID = C.FENTRYID
INNER JOIN (SELECT ,,SUM() AS '发票金额' FROM [oldk3ICSale0802] GROUP BY ,) 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. = ''
AND ISNULL(b.,'') <> 1
UPDATE a SET a.[K3专票金额] = CASE B.rownumber WHEN 1 THEN b. ELSE 0 END,a.[K3普票金额]= CASE B.rownumber WHEN 1 THEN b. ELSE 0 END
FROM YingShouZhanKuanMX_GZTH A

View File

@ -38,7 +38,8 @@ BEGIN
AND A.FDOCUMENTSTATUS = 'C'
AND A.FApproveDate >= @StartDate
AND A.FApproveDate < @EndDate
AND A.F_SFQC = 0
AND A.F_SFQC = 0
AND A.F_GENERALINVOICE <> 'Y'
----
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
@ -62,7 +63,8 @@ BEGIN
AND A.FDOCUMENTSTATUS = 'C'
AND A.FApproveDate >= @StartDate
AND A.FApproveDate < @EndDate
AND A.F_SFQC = 0
AND A.F_SFQC = 0
AND A.F_GENERALINVOICE <> 'Y'
------
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
@ -91,6 +93,7 @@ BEGIN
AND A.FApproveDate >= @StartDate
AND A.FApproveDate < @EndDate
AND A.F_SFQC = 0
AND A.F_GENERALINVOICE <> 'Y'
-----
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
@ -117,6 +120,7 @@ BEGIN
AND A.FApproveDate >= @StartDate
AND A.FApproveDate < @EndDate
AND A.F_SFQC = 0
AND A.F_GENERALINVOICE <> 'Y'
-----
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
@ -142,6 +146,7 @@ BEGIN
AND A.FApproveDate >= @StartDate
AND A.FApproveDate < @EndDate
AND A.F_SFQC = 0
AND A.F_GENERALINVOICE <> 'Y'
------
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
@ -170,6 +175,7 @@ BEGIN
AND A.FApproveDate >= @StartDate
AND A.FApproveDate < @EndDate
AND A.F_SFQC = 0
AND A.F_GENERALINVOICE <> 'Y'
-----
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
@ -196,6 +202,7 @@ BEGIN
AND A.FApproveDate >= @StartDate
AND A.FApproveDate < @EndDate
AND A.F_SFQC = 0
AND A.F_GENERALINVOICE <> 'Y'
--------
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
@ -226,6 +233,7 @@ BEGIN
AND A.FApproveDate >= @StartDate
AND A.FApproveDate < @EndDate
AND A.F_SFQC = 0
AND A.F_GENERALINVOICE <> 'Y'
-------
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
@ -254,6 +262,7 @@ BEGIN
AND A.FApproveDate >= @StartDate
AND A.FApproveDate < @EndDate
AND A.F_SFQC = 0
AND A.F_GENERALINVOICE <> 'Y'
------
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
@ -281,6 +290,7 @@ BEGIN
AND A.FApproveDate >= @StartDate
AND A.FApproveDate < @EndDate
AND A.F_SFQC = 0
AND A.F_GENERALINVOICE <> 'Y'
--
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
@ -304,6 +314,7 @@ BEGIN
AND A.FApproveDate >= @StartDate
AND A.FApproveDate < @EndDate
AND A.F_SFQC = 0
AND A.F_GENERALINVOICE <> 'Y'