Compare commits

...

2 Commits

Author SHA1 Message Date
6d407bdaf2 Merge branch 'main' of http://8.130.121.29:3000/TianHua/PiolotTH_ReportFrom into main 2025-08-05 20:23:29 +08:00
0d5ccf85c7 1 2025-08-05 20:23:21 +08:00

View File

@ -182,8 +182,8 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
--,cast( B.FQTY as real) AS '数量台' ----
,cast( ROUND( F.FTAXPRICE,2) as real) AS '单价元台' ---- "业绩分摊只分摊金额不分摊数量
,cast( ROUND( f.FALLAMOUNT_LC,2) as real) as '行含税单价'
,CASE WHEN n.FSHARERATE IS NULL THEN ROUND(F.FALLAMOUNT_LC,10)
ELSE ROUND( f.FALLAMOUNT_LC * (n.FSHARERATE/100) ,10) END as '合同总价' --*
,CASE WHEN n.FSHARERATE IS NULL THEN ROUND(F.FALLAMOUNT_LC,2)
ELSE ROUND( f.FALLAMOUNT_LC * (n.FSHARERATE/100) ,2) END as '合同总价' --*
, G.FNAME as '销售订单-单据头-项目名称' ----
,y.FCAPTION AS '项目所属领域'----
,CASE
@ -208,15 +208,17 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
OR (CASE WHEN ISNULL(O.FNAME,'')='' THEN ACL. ELSE ACO. END) LIKE '%机场%'
THEN '行业线'
ELSE '区域线' END AS '业绩类型'
,CASE WHEN N.FSHARERATE is null THEN '' ELSE CONCAT( CAST ( N.FSHARERATE AS REAL),'%') END as '业绩分摊比例' ----
,CASE WHEN N.FSHARERATE is null THEN '100' ELSE CONCAT( CAST ( N.FSHARERATE AS REAL),'%') END as '业绩分摊比例' ----
, b.F_ProjectProposal AS '项目方案类型'
,'' AS '收款金额' --
, CAST( J.FEXCHANGERATE AS REAL) AS '汇率' ----
,H.F_Province AS '项目所属省份' --CRM系统商机ERP商机需要增加文本字段对应
,h.F_City AS '项目所属城市' --CRM系统商机ERP商机需要增加文本字段对应
,u.FCAPTION AS '表计或系统'-- ERP物料档案--
,CASE WHEN ROW_NUMBER() OVER (PARTITION BY A.FID ORDER BY B.FENTRYID) = COUNT(*) OVER (PARTITION BY A.FID)
THEN CAST(J.FBILLALLAMOUNT_LC AS numeric(18,2)) ELSE NULL END AS '订单总额'
,CASE WHEN ROW_NUMBER() OVER (PARTITION BY A.FID ORDER BY A.FID, B.FENTRYID ,FSHARERATE desc) = 1
THEN CAST(J.FBILLALLAMOUNT_LC AS numeric(18,2)) ELSE NULL END AS '订单总额'
,K.FDATAVALUE AS '企业类型公司性质'---
,'' AS '欠款总额' --退-*
, TU.FNAME AS '制单人' -----
@ -294,7 +296,7 @@ AND A.F_contractnumber NOT LIKE 'Z%'
,CAST(round( ISNULL(AB.FAMOUNT,0) * isnull(A.FSHARERATE,100)/100,2) AS REAL) AS '开票金额'---*
,CAST( ISNULL(P.FQTY,0)-isnull(q.FQTY,0) - ISNULL(AB.FQTY,0) AS REAL) AS '未开票数量' --AV已交货数-BB已开票数量
,round( (ISNULL(P.FAMOUNT,0)-isnull(q.FAMOUNT,0)- ISNULL(AB.FAMOUNT,0) ) * isnull(A.FSHARERATE,100)/100 ,2) AS '未开票金额' --(AW已交货金额-BC开票金额)*
,ISNULL(G.F_CONTRACTNUMBER,'') AS '源订单号'
,ISNULL(G.F_CONTRACTNUMBER,'') AS '源订单号' ,CONVERT(DECIMAL(18,2),0) AS
INTO #TEMP1
FROM #TEMP4 A
LEFT JOIN T_SAL_orderentry b on a.FENTRYID = B.FENTRYID --
@ -311,9 +313,26 @@ LEFT JOIN (
LEFT JOIN T_SAL_ORDER T3 on T3.FBILLNO = T1.FSRCBILLNO
WHERE T1.FSRCTYPE = 'SAL_SaleOrder'
)G ON A.FENTRYID = G.FENTRYID AND A.[]<0
SELECT * FROM #TEMP1 ORDER BY [订单号]
ORDER BY fid,FENTRYID ,FSHARERATE
UPDATE #TEMP1 SET 分摊金额=b.合同总价2
FROM (SELECT SUM(CONVERT(DECIMAL(18,2),)) AS 2 ,FBILLNO FROM #TEMP1 GROUP BY FBILLNO) b
WHERE #TEMP1.FBILLNO=b.FBILLNO AND 订单总额 <>0
--UPDATE #TEMP1 SET rownum=b.rownum2
--FROM (SELECT ROW_NUMBER() OVER (PARTITION BY FID, FENTRYID ORDER BY FENTRYID) AS rownum2, FID, FENTRYID FROM #TEMP1 ) b
--WHERE #TEMP1.FID=b.fid AND #TEMP1.FENTRYID=b.FENTRYID
UPDATE #TEMP1 SET 合同总价=合同总价+(订单总额- 分摊金额 )
WHERE <>0
SELECT * FROM #TEMP1 ORDER BY fid,FENTRYID ,FSHARERATE desc
drop table #TEMP2
drop table #RECE
drop table #RETURNSTOCK