Develop/Piolot_RepotForm_PeiHao
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

123

Browse Source
This commit is contained in:
余宇波 2025-10-22 16:55:25 +08:00
parent 1c61483d90
commit 9929904e16
3 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs
View File

@ -266,7 +266,7 @@ FROM T_SAL_ORDERENTRY B --销售订单明细表
--ES、W、SX、CW、D、CY
WHERE D.FNUMBER NOT IN ( 'P', 'E', 'C','CS','CW','B' )
AND (A.F_SpecialContracts = '是' OR a.F_GROSSMARGIN1='<35%' OR a.F_VRYF_Amount_yrr > c.FBillAllAmount OR a.F_ManuallySpecialPrices ='是' )
AND (A.F_SpecialContracts = '是' OR a.F_GROSSMARGIN1='<35%' OR a.F_VRYF_Amount_yrr > c.FBillAllAmount_LC OR a.F_ManuallySpecialPrices ='是' )
AND (a.F_ManuallySpecialPrices !='否' or a.F_CancelSpecialContracts ='' )
AND B.FQTY >= 0
AND A.FDOCUMENTSTATUS = 'C'

15
国庆后的需求变化.txt
View File

@ -25,9 +25,18 @@
1.按照物料属性 型号分类 产品分类 产品线
2.非（E、ES、NWE、HKE ）合同号，销售订单明细字段项目方案类型判断系统剩余部分
3.按照合同号 E、ES、NWE、HKE 直接将 型号分类 产品分类 写为同样值（储能、微电风、光储充）剩余部分，产品线字段（储能、微电风、光储充）
4.按照合同号 BS 直接将 型号分类 产品分类 写为同样值（BMS产品线）剩余部分, 产品线字段（BMS产品线）
@格致--余宇波
4、按合同号 C,CS、CW、CY开头 直接将 型号分类 产品分类 写为同样值（充电桩）剩余部分，产品线字段（充电桩业务）
4.按照合同号 B, BS 直接将 型号分类 产品分类 写为同样值（BMS产品线）剩余部分, 产品线字段（BMS产品线）
2.非（E、ES、NWE、HKE ）合同号，销售订单明细字段项目方案类型判断系统剩余部分 产品线 改为=''
@格致--余宇波
产品分类= A
A（储能、微电风、光储充）剩余部分 OK
223223

33
非C#代码文件/派诺合同明细存储过程.sql
View File

@ -54,13 +54,13 @@ A.F_contractnumber+C.FSPECIFICATION AS '
CASE WHEN C.F_114 IS NOT NULL AND C.F_114 !=' ' AND C.F_114 !='' THEN C.F_114 WHEN W8.FNUMBER IN ('E','ES','NWE','HKE') THEN '储能、微电风、光储充剩余部分'
WHEN W8.FNUMBER IN ('B','BS') THEN 'BMS产品线剩余部分'
WHEN W8.FNUMBER IN ('C','CS','CW','CY') THEN '充电桩剩余部分'
WHEN W8.FNUMBER not IN ('E','ES','NWE','HKE','BS') THEN ''
WHEN W8.FNUMBER NOT IN ('E','ES','NWE','HKE','BS') THEN ''
ELSE C.F_114 END AS '型号分类',
CASE WHEN C.F_115 IS NOT NULL AND C.F_115 !=' ' AND C.F_115 !='' THEN C.F_115 WHEN W8.FNUMBER IN ('E','ES','NWE','HKE') THEN '储能、微电风、光储充剩余部分'
WHEN W8.FNUMBER IN ('C','CS','CW','CY') THEN '充电桩剩余部分'
WHEN W8.FNUMBER IN ('B','BS') THEN 'BMS产品线剩余部分'
WHEN W8.FNUMBER not IN ('E','ES','NWE','HKE','BS') THEN ''
WHEN W8.FNUMBER NOT IN ('E','ES','NWE','HKE','BS') THEN ''
ELSE C.F_115 END AS '产品分类',
CASE WHEN C.F_116 IS NOT NULL AND C.F_116 !=' ' AND C.F_116 !='' THEN C.F_116 WHEN W8.FNUMBER IN ('E','ES','NWE','HKE') THEN '储能、微电风、光储充'
WHEN W8.FNUMBER IN ('C','CS','CW','CY') THEN '充电桩业务'
@ -84,7 +84,7 @@ CASE WHEN n.FSHARERATE IS NULL THEN ROUND(BB.FALLAMOUNT_LC,2)
ELSE ROUND( BB.FALLAMOUNT_LC * (n.FSHARERATE/100) ,2) END AS '合同总价' --业绩分摊只分摊金额不分摊数量，分录【价税合计本位币】*业绩分摊单中的分摊比例
,CASE WHEN ROW_NUMBER() OVER (PARTITION BY A.FID ORDER BY A.FID, B.FENTRYID ,FSHARERATE DESC) = 1
THEN CAST(BB.FAllAmount_LC AS NUMERIC(18,2)) ELSE NULL END AS '订单总额' ,
THEN CAST(j.FBILLALLAMOUNT_LC AS NUMERIC(18,2)) ELSE NULL END AS '订单总额' ,
CASE
WHEN ROW_NUMBER() OVER (PARTITION BY A.FID, B.FENTRYID ORDER BY N.FENTRYID) = 1 THEN (SELECT FStockOutQty FROM T_SAL_ORDERENTRY_R WHERE FENTRYID = B.FENTRYID)
@ -142,6 +142,7 @@ T_SAL_ORDER A
JOIN
T_SAL_ORDERENTRY B
ON B.FID = A.FID
INNER JOIN T_SAL_ORDERFIN J ON J.FID= A.FID
LEFT JOIN T_PerformanceSharing M WITH(NOLOCK) ON M.FSOURCEBILLNO = A.FBILLNO AND M.FDOCUMENTSTATUS = 'C'
LEFT JOIN (SELECT FID,FENTRYID,FSALEID,CASE WHEN ISNULL(F_res,'')='' THEN NULL ELSE F_res END AS F_res,FSHARERATE FROM T_PerformanceSharingEntry N WITH(NOLOCK) ) N ON N.FID=M.FID
LEFT JOIN V_BD_SALESMAN_L O WITH(NOLOCK) ON O.fid= N.FSALEID
@ -159,25 +160,25 @@ AND ISNULL(
LEFT JOIN (SELECT DISTINCT ACO22.名称,ACO22.明细区域,ACO22.区域 FROM ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO22 ) ACO
ON ACO.名称=ISNULL(N.F_res,O.FNAME) AND ISNULL(ACO.明细区域,'') != ''
LEFT JOIN
T_BD_DEPARTMENT_L W6 on A.FSaleDeptId = W6.FDEPTID --所属区域
T_BD_DEPARTMENT_L W6 ON A.FSaleDeptId = W6.FDEPTID --所属区域
LEFT JOIN
T_BAS_PREBDTHREE W7 on W7.FID = A.F_BON --商机
T_BAS_PREBDTHREE W7 ON W7.FID = A.F_BON --商机
LEFT JOIN
T_BD_CUSTOMER_L K on A.FCUSTID = K.FCUSTID --客户
T_BD_CUSTOMER_L K ON A.FCUSTID = K.FCUSTID --客户
LEFT JOIN
(Select FNumber,FENTRYID From T_BAS_ASSISTANTDATAENTRY Where FID = '670cc977263353') W8 --合同类型
on W8.FENTRYID = A.F_ORDERCATEGORY
(SELECT FNumber,FENTRYID FROM T_BAS_ASSISTANTDATAENTRY WHERE FID = '670cc977263353') W8 --合同类型
ON W8.FENTRYID = A.F_ORDERCATEGORY
LEFT JOIN
(Select a2.FDATAVALUE,a2.FENTRYID From T_BAS_ASSISTANTDATAENTRY a1 JOIN T_BAS_ASSISTANTDATAENTRY_L a2
on a1.FENTRYID = a2.FENTRYID Where a1.FID = '670cc977263353') W5 on W5.FENTRYID = A.F_ORDERCATEGORY
Left JOIN
(Select aq.FNUMBER,aq.F_114,aq.F_115,aq.FMATERIALID,qa.FNAME,aq.F_XHDL,aq.F_116,qa.FSpecification
From
(SELECT a2.FDATAVALUE,a2.FENTRYID FROM T_BAS_ASSISTANTDATAENTRY a1 JOIN T_BAS_ASSISTANTDATAENTRY_L a2
ON a1.FENTRYID = a2.FENTRYID WHERE a1.FID = '670cc977263353') W5 ON W5.FENTRYID = A.F_ORDERCATEGORY
LEFT JOIN
(SELECT aq.FNUMBER,aq.F_114,aq.F_115,aq.FMATERIALID,qa.FNAME,aq.F_XHDL,aq.F_116,qa.FSpecification
FROM
T_BD_MATERIAL aq
Left JOIN
LEFT JOIN
T_BD_MATERIAL_L qa
on aq.FMATERIALID = qa.FMATERIALID) C --获取物料名称
on B.FMaterialId = C.FMATERIALID
ON aq.FMATERIALID = qa.FMATERIALID) C --获取物料名称
ON B.FMaterialId = C.FMATERIALID
LEFT JOIN
(Select a1.FORDERNUMBER,MAX(a1.FOPENSTATUS)'FOPENSTATUS' From T_AR_RECEIVABLEENTRY a1 JOIN T_AR_RECEIVABLE a2 on a1.FID = a2.FID
Where ISNULL(a1.FORDERNUMBER,'') != '' AND a2.FDOCUMENTSTATUS = 'C' GROUP BY FORDERNUMBER) D on A.FBILLNO = D.FORDERNUMBER