Compare commits

..

No commits in common. "35f7bf58f4c4e2468a798ae6a5adbb47cefdda0b" and "64b8abf342243aa1e3cf118e1e827db1a84e10be" have entirely different histories.

View File

@ -154,9 +154,6 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
A.FID ,
A.FBILLNO ,
B.FENTRYID ,
a.F_INVOICEAMOUNT '开票金额',
j.FBILLALLAMOUNT- a.F_INVOICEAMOUNT '未开票金额',
ISNULL(N.FSHARERATE,100) AS FSHARERATE,
F.FALLAMOUNT_LC ,
MONTH(A.FApproveDate) AS '月份' -----
@ -214,7 +211,7 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
ELSE '区域线' END AS '业绩类型'
,CASE WHEN N.FSHARERATE is null THEN '100' ELSE CONCAT( CAST ( N.FSHARERATE AS REAL),'%') END as '业绩分摊比例' ----
, b.F_ProjectProposal AS '项目方案类型'
,a.F_Amount AS '收款金额' --
,'' AS '收款金额' --
, CAST( J.FEXCHANGERATE AS REAL) AS '汇率' ----
,H.F_Province AS '项目所属省份' --CRM系统商机ERP商机需要增加文本字段对应
,h.F_City AS '项目所属城市' --CRM系统商机ERP商机需要增加文本字段对应
@ -296,10 +293,10 @@ AND A.F_contractnumber NOT LIKE 'Z%'
,round( (ISNULL(P.FAMOUNT,0)-isnull(q.FAMOUNT,0)) * isnull(A.FSHARERATE,100)/100 ,2) AS '已交货金额-含退货' --2024-11-20AS发货金额-AU退货金额*
,B.FQTY - AR.FDeliQty AS '未交货数' ---
, round( (A.FALLAMOUNT_LC - ISNULL(P.FAMOUNT,0) +ISNULL(Q.FAMOUNT,0))* isnull(A.FSHARERATE,100)/100,2) as '未发货金额'--(-+退)*
--,CAST( ISNULL(AB.FQTY,0) AS REAL) AS '已开票数量' ---退
--,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开票金额)*
,CAST( ISNULL(AB.FQTY,0) AS REAL) AS '已开票数量' ---退
,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 '源订单号' ,CONVERT(DECIMAL(18,2),0) AS
INTO #TEMP1
FROM #TEMP4 A
@ -309,7 +306,7 @@ LEFT JOIN #SAL P ON P.FENTRYID = A.FENTRYID --
LEFT JOIN #RETURN q ON q.FENTRYID = A.FENTRYID --退货通知单
LEFT JOIN #OUTSTOCK R ON R.FENTRYID = A.FENTRYID --销售出库单
LEFT JOIN #RETURNSTOCK AA ON AA.FENTRYID = A.FENTRYID --销售退货单
--LEFT JOIN #RECE AB ON AB.FENTRYID = A.FENTRYID --应收单
LEFT JOIN #RECE AB ON AB.FENTRYID = A.FENTRYID --应收单
LEFT JOIN #TEMP2 AD ON AD.FID = A.FID
LEFT JOIN (
SELECT T1.FENTRYID,T3.F_CONTRACTNUMBER FROM T_SAL_ORDERENTRY_R T1