Compare commits

...

2 Commits

Author SHA1 Message Date
11181cc106 Merge branch 'master' of http://8.130.121.29:3000/TianHua/Piolot_RepotForm
# Conflicts:
#	Pilot.Report.Exploitation/SaleOrderProgress/PHBSaleOrderReport.cs
2025-03-17 19:04:52 +08:00
e897e7f0dc 11 2025-03-17 19:04:06 +08:00
9 changed files with 111 additions and 131 deletions

View File

@ -3,16 +3,8 @@
"WorkspaceRootPath": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\",
"Documents": [
{
"AbsoluteMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|f:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\piolot_repotform_git\\pilot.report.exploitation\\receivables\\receivablesdetails.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|solutionrelative:pilot.report.exploitation\\receivables\\receivablesdetails.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\pilot.report.exploitation\\common\\loghelp.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|solutionrelative:pilot.report.exploitation\\common\\loghelp.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\pilot.report.exploitation\\resultskanbansummary\\resultskanbansumreport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|solutionrelative:pilot.report.exploitation\\resultskanbansummary\\resultskanbansumreport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
"AbsoluteMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|f:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\piolot_repotform_git\\pilot.report.exploitation\\annualsalespaymentsum\\annualsalespaymentsumreport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|solutionrelative:pilot.report.exploitation\\annualsalespaymentsum\\annualsalespaymentsumreport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
}
],
"DocumentGroupContainers": [
@ -27,40 +19,14 @@
{
"$type": "Document",
"DocumentIndex": 0,
"Title": "ReceivablesDetails.cs",
"DocumentMoniker": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\Pilot.Report.Exploitation\\Receivables\\ReceivablesDetails.cs",
"RelativeDocumentMoniker": "Pilot.Report.Exploitation\\Receivables\\ReceivablesDetails.cs",
"ToolTip": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\Pilot.Report.Exploitation\\Receivables\\ReceivablesDetails.cs",
"RelativeToolTip": "Pilot.Report.Exploitation\\Receivables\\ReceivablesDetails.cs",
"ViewState": "AgIAAFsAAAAAAAAAAAAIwGwAAACpAAAAAAAAAA==",
"Title": "AnnualSalesPaymentSumReport.cs",
"DocumentMoniker": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\Pilot.Report.Exploitation\\AnnualSalesPaymentSum\\AnnualSalesPaymentSumReport.cs",
"RelativeDocumentMoniker": "Pilot.Report.Exploitation\\AnnualSalesPaymentSum\\AnnualSalesPaymentSumReport.cs",
"ToolTip": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\Pilot.Report.Exploitation\\AnnualSalesPaymentSum\\AnnualSalesPaymentSumReport.cs",
"RelativeToolTip": "Pilot.Report.Exploitation\\AnnualSalesPaymentSum\\AnnualSalesPaymentSumReport.cs",
"ViewState": "AgIAAJgDAAAAAAAAAAAQwBsEAAAbAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-03-15T12:19:32.438Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 1,
"Title": "Loghelp.cs",
"DocumentMoniker": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\Pilot.Report.Exploitation\\Common\\Loghelp.cs",
"RelativeDocumentMoniker": "Pilot.Report.Exploitation\\Common\\Loghelp.cs",
"ToolTip": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\Pilot.Report.Exploitation\\Common\\Loghelp.cs",
"RelativeToolTip": "Pilot.Report.Exploitation\\Common\\Loghelp.cs",
"ViewState": "AgIAAAAAAAAAAAAAAAAAAA4AAAAJAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-03-14T11:47:51.103Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 2,
"Title": "ResultsKanbanSumReport.cs",
"DocumentMoniker": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsKanbanSumReport.cs",
"RelativeDocumentMoniker": "Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsKanbanSumReport.cs",
"ToolTip": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsKanbanSumReport.cs",
"RelativeToolTip": "Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsKanbanSumReport.cs",
"ViewState": "AgIAAGgAAAAAAAAAAAAAwNACAAABAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-03-14T11:26:46.159Z",
"WhenOpened": "2025-03-17T07:39:30.7Z",
"EditorCaption": ""
}
]

View File

@ -11,6 +11,8 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Pilot.Report.Exploitation.PublicClass;
using Kingdee.BOS.Log;
using Pilot.Report.Exploitation.Common;
namespace Pilot.Report.Exploitation.AnnualSalesPaymentSum
{
@ -1046,7 +1048,8 @@ namespace Pilot.Report.Exploitation.AnnualSalesPaymentSum
INTO {0}
From
#TempTable9;", tableName);
Loghelp.Log("年度销售额&回款额汇总");
Loghelp.Log(sql);
DBUtils.Execute(this.Context, sql);
}

View File

@ -188,6 +188,7 @@
<Compile Include="ContractDetails\ContractDetailsReport.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="PublicClass\EnvironmentTEST.cs" />
<Compile Include="Receivables\ReceivablesAutoExecute.cs" />
<Compile Include="Receivables\ReceivablseGL.cs" />
<Compile Include="Receivables\ReceivablesDetails.cs" />
<Compile Include="ResultsKanbanSummary\ResultsKanbanSumReport.cs" />

View File

@ -209,9 +209,9 @@ else
if (e.BarItemKey == "MBBA_tbButton_3")
{
string sql = string.Format("Delete From ReceivablesDetailsTable");
DBUtils.ExecuteDynamicObject(Context, sql);
this.View.Model.SetValue("F_ISSX", "需要刷新");
//string sql = string.Format("Delete From ReceivablesDetailsTable");
//DBUtils.ExecuteDynamicObject(Context, sql);
//this.View.Model.SetValue("F_ISSX", "需要刷新");
}
}
@ -623,5 +623,7 @@ else
}
}
}
}

View File

@ -75,28 +75,28 @@ namespace Pilot.Report.Exploitation.ResultsKanbanSummary
int year = Convert.ToInt32(fDate.Split('-')[0]);
//int year = 2011;
header.AddChild("ID", new LocaleValue("序号"), SqlStorageType.Sqlvarchar);
//header.AddChild("ID", new LocaleValue("序号"), SqlStorageType.Sqlvarchar);
header.AddChild("DetailArea", new LocaleValue("明细区域"), SqlStorageType.Sqlvarchar);
header.AddChild("Salesperson", new LocaleValue("销售员"), SqlStorageType.Sqlvarchar);
header.AddChild("FPERFORMANCETARGETS", new LocaleValue(""+year+"年业绩目标(万元)"), SqlStorageType.SqlDecimal);
header.AddChild("Pilot2024", new LocaleValue(""+year+ "派诺业绩(万元)"), SqlStorageType.SqlDecimal);
header.AddChild("SiNO2024", new LocaleValue(""+year+ "兴诺业绩(万元)"), SqlStorageType.SqlDecimal);
header.AddChild("WuHanPilot2024", new LocaleValue(""+year+ "武汉派诺(万元)"), SqlStorageType.SqlDecimal);
header.AddChild("Discovery2024", new LocaleValue(""+year+ "碳索业绩(万元)"), SqlStorageType.SqlDecimal);
header.AddChild("HongKongPilot2024", new LocaleValue(""+year+ "香港派诺业绩(万元)"), SqlStorageType.SqlDecimal);
header.AddChild("HuaXiaYunLian2024", new LocaleValue(""+year+ "华夏云联业绩(万元)"), SqlStorageType.SqlDecimal);
header.AddChild("2024Pilot", new LocaleValue(""+year+ "派诺业绩(万元)"), SqlStorageType.SqlDecimal);
header.AddChild("2024SiNO", new LocaleValue(""+year+ "兴诺业绩(万元)"), SqlStorageType.SqlDecimal);
header.AddChild("2024WuHanPilot", new LocaleValue(""+year+ "武汉派诺(万元)"), SqlStorageType.SqlDecimal);
header.AddChild("2024Discovery", new LocaleValue(""+year+ "碳索业绩(万元)"), SqlStorageType.SqlDecimal);
header.AddChild("2024HongKongPilot", new LocaleValue(""+year+ "香港派诺业绩(万元)"), SqlStorageType.SqlDecimal);
header.AddChild("2024HuaXiaYunLian", new LocaleValue(""+year+ "华夏云联业绩(万元)"), SqlStorageType.SqlDecimal);
header.AddChild("UsualAlterAmount", new LocaleValue("往年订单变更金额(万元)"), SqlStorageType.SqlDecimal);
header.AddChild("SumAmount2024", new LocaleValue(""+year+ "合计业绩额(万元)"), SqlStorageType.SqlDecimal);
header.AddChild("2024SumAmount", new LocaleValue(""+year+ "合计业绩额(万元)"), SqlStorageType.SqlDecimal);
header.AddChild("SumAmount2024", new LocaleValue(""+year+ "合计业绩额(万元)"), SqlStorageType.SqlDecimal);
header.AddChild("AttainmentRate", new LocaleValue("达标率"), SqlStorageType.Sqlvarchar);
header.AddChild("SumAmount2023", new LocaleValue(""+(year-1)+ "合计业绩额(万元)"), SqlStorageType.SqlDecimal);
header.AddChild("2023SumAmount", new LocaleValue(""+(year-1)+ "合计业绩额(万元)"), SqlStorageType.SqlDecimal);
header.AddChild("SameGrowthRate", new LocaleValue("同比增长率"), SqlStorageType.Sqlvarchar);
header.AddChild("FPAYMENTSUM", new LocaleValue(""+year+"回款目标(万元)"), SqlStorageType.SqlDecimal);
header.AddChild("Payment", new LocaleValue("回款额(万元)"), SqlStorageType.SqlDecimal);
header.AddChild("PaymentRate", new LocaleValue("回款率"), SqlStorageType.Sqlvarchar);
header.AddChild("ShippedReceivables", new LocaleValue("已发货应收款(万元)"), SqlStorageType.SqlDecimal);
header.AddChild("ExpiredReceivables", new LocaleValue("已到期应收款(万元)"), SqlStorageType.SqlDecimal);
header.AddChild("SBU", new LocaleValue("SBU"), SqlStorageType.Sqlvarchar);
header.AddChild("Area", new LocaleValue("SBU"), SqlStorageType.Sqlvarchar);
foreach (var item in header.GetChilds())
{
@ -151,37 +151,37 @@ namespace Pilot.Report.Exploitation.ResultsKanbanSummary
CASE WHEN ISNULL(W4.FNAME,'') = '' THEN ISNULL(A.,'') ELSE ISNULL(A2.,'') END as 'DetailArea',
CASE WHEN ISNULL(W4.FNAME,'') = '' THEN W1.FNAME ELSE W4.FNAME END as 'Salesperson',
ISNULL(E.FPERFORMANCETARGETS,0) as 'FPERFORMANCETARGETS', --> 2024
CASE WHEN YEAR(D.FDATE) = {0} AND D.FSaleOrgId = 100302 AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
CASE WHEN YEAR(D.FApproveDate) = {0} AND D.FSaleOrgId = 100302 AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
THEN ISNULL(W3.FSHAREAMOUNT,0)/10000
WHEN YEAR(D.FDATE) = {0} AND D.FSaleOrgId = 100302 THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
WHEN YEAR(D.FApproveDate) = {0} AND D.FSaleOrgId = 100302 THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
ELSE 0
END as '2024Pilot', -->2024
CASE WHEN YEAR(D.FDATE) = {0} AND D.FSaleOrgId = 100303 AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
CASE WHEN YEAR(D.FApproveDate) = {0} AND D.FSaleOrgId = 100303 AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
THEN ISNULL(W3.FSHAREAMOUNT,0)/10000
WHEN YEAR(D.FDATE) = {0} AND D.FSaleOrgId = 100303 THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
WHEN YEAR(D.FApproveDate) = {0} AND D.FSaleOrgId = 100303 THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
ELSE 0
END as '2024SiNO', -->2024
CASE WHEN YEAR(D.FDATE) = {0} AND D.FSaleOrgId = 100305 AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
CASE WHEN YEAR(D.FApproveDate) = {0} AND D.FSaleOrgId = 100305 AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
THEN ISNULL(W3.FSHAREAMOUNT,0)/10000
WHEN YEAR(D.FDATE) = {0} AND D.FSaleOrgId = 100305 THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
WHEN YEAR(D.FApproveDate) = {0} AND D.FSaleOrgId = 100305 THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
ELSE 0
END as '2024WuHanPilot', -->2024
CASE WHEN YEAR(D.FDATE) = {0} AND D.FSaleOrgId = 438223 AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
CASE WHEN YEAR(D.FApproveDate) = {0} AND D.FSaleOrgId = 438223 AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
THEN ISNULL(W3.FSHAREAMOUNT,0)/10000
WHEN YEAR(D.FDATE) = {0} AND D.FSaleOrgId = 438223 THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
WHEN YEAR(D.FApproveDate) = {0} AND D.FSaleOrgId = 438223 THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
ELSE 0
END as '2024Discovery', -->2024
CASE WHEN YEAR(D.FDATE) = {0} AND D.FSaleOrgId = 438224 AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
CASE WHEN YEAR(D.FApproveDate) = {0} AND D.FSaleOrgId = 438224 AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
THEN ISNULL(W3.FSHAREAMOUNT,0)/10000
WHEN YEAR(D.FDATE) = {0} AND D.FSaleOrgId = 438224 THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
WHEN YEAR(D.FApproveDate) = {0} AND D.FSaleOrgId = 438224 THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
ELSE 0
END as '2024HongKongPilot', -->2024
CASE WHEN YEAR(D.FDATE) = {0} AND D.FSaleOrgId = 533896 AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
CASE WHEN YEAR(D.FApproveDate) = {0} AND D.FSaleOrgId = 533896 AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
THEN ISNULL(W3.FSHAREAMOUNT,0)/10000
WHEN YEAR(D.FDATE) = {0} AND D.FSaleOrgId = 533896 THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
WHEN YEAR(D.FApproveDate) = {0} AND D.FSaleOrgId = 533896 THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
ELSE 0
END as '2024HuaXiaYunLian', -->2024
CASE WHEN YEAR(D.FDATE) < {0} AND D.FSalerId = D.FSALERID
CASE WHEN YEAR(D.FApproveDate) < {0} AND D.FSalerId = D.FSALERID
THEN
ISNULL(((SELECT
CAST(JSON_VALUE(CAST(FJSONDATA AS NVARCHAR(MAX)), '$.SaleOrderFinance[0].BillAllAmount_LC') as decimal(23,10) ) AS FPrice
@ -210,14 +210,14 @@ namespace Pilot.Report.Exploitation.ResultsKanbanSummary
AND FBILLNO = D.FBILLNO))/10000,0)
ELSE 0
END as 'UsualAlterAmount', --> &
CASE WHEN YEAR(D.FDATE) = {0} AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
CASE WHEN YEAR(D.FApproveDate) = {0} AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
THEN ISNULL(W3.FSHAREAMOUNT,0)/10000
WHEN YEAR(D.FDATE) = {0} THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
WHEN YEAR(D.FApproveDate) = {0} THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
ELSE 0
END as '2024SumAmount', -->2024
CASE WHEN YEAR(D.FDATE) = {1} AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
CASE WHEN YEAR(D.FApproveDate) = {1} AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
THEN ISNULL(W3.FSHAREAMOUNT,0)/10000
WHEN YEAR(D.FDATE) = {1} THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
WHEN YEAR(D.FApproveDate) = {1} THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
ELSE 0
END as '2023SumAmount', -->2023
ISNULL(E.FPAYMENTSUM,0) as 'FPAYMENTSUM', -->()
@ -329,11 +329,11 @@ namespace Pilot.Report.Exploitation.ResultsKanbanSummary
}
if (!string.IsNullOrEmpty(fStrartDate))
{
sql += string.Format(@" AND D.FDate >= '{0}'", fStrartDate);
sql += string.Format(@" AND D.FApproveDate >= '{0}'", fStrartDate);
}
if (!string.IsNullOrEmpty(fEndDate))
{
sql += string.Format(@" AND D.FDate <= '{0}'", fEndDate);
sql += string.Format(@" AND D.FApproveDate <= '{0}'", fEndDate);
}
if (!string.IsNullOrEmpty(fSDate))
{
@ -352,37 +352,37 @@ namespace Pilot.Report.Exploitation.ResultsKanbanSummary
CASE WHEN ISNULL(W4.FNAME,'') = '' THEN ISNULL(A.,'') ELSE ISNULL(A2.,'') END as 'DetailArea',
CASE WHEN ISNULL(W4.FNAME,'') = '' THEN W1.FNAME ELSE W4.FNAME END as 'Salesperson',
ISNULL(E.FPERFORMANCETARGETS,0) as 'FPERFORMANCETARGETS', --> 2024
CASE WHEN YEAR(D.FDATE) = {0} AND D.FSaleOrgId = 100302 AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
CASE WHEN YEAR(D.FApproveDate) = {0} AND D.FSaleOrgId = 100302 AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
THEN ISNULL(W3.FSHAREAMOUNT,0)/10000
WHEN YEAR(D.FDATE) = {0} AND D.FSaleOrgId = 100302 THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
WHEN YEAR(D.FApproveDate) = {0} AND D.FSaleOrgId = 100302 THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
ELSE 0
END as '2024Pilot', -->2024
CASE WHEN YEAR(D.FDATE) = {0} AND D.FSaleOrgId = 100303 AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
CASE WHEN YEAR(D.FApproveDate) = {0} AND D.FSaleOrgId = 100303 AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
THEN ISNULL(W3.FSHAREAMOUNT,0)/10000
WHEN YEAR(D.FDATE) = {0} AND D.FSaleOrgId = 100303 THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
WHEN YEAR(D.FApproveDate) = {0} AND D.FSaleOrgId = 100303 THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
ELSE 0
END as '2024SiNO', -->2024
CASE WHEN YEAR(D.FDATE) = {0} AND D.FSaleOrgId = 100305 AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
CASE WHEN YEAR(D.FApproveDate) = {0} AND D.FSaleOrgId = 100305 AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
THEN ISNULL(W3.FSHAREAMOUNT,0)/10000
WHEN YEAR(D.FDATE) = {0} AND D.FSaleOrgId = 100305 THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
WHEN YEAR(D.FApproveDate) = {0} AND D.FSaleOrgId = 100305 THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
ELSE 0
END as '2024WuHanPilot', -->2024
CASE WHEN YEAR(D.FDATE) = {0} AND D.FSaleOrgId = 438223 AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
CASE WHEN YEAR(D.FApproveDate) = {0} AND D.FSaleOrgId = 438223 AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
THEN ISNULL(W3.FSHAREAMOUNT,0)/10000
WHEN YEAR(D.FDATE) = {0} AND D.FSaleOrgId = 438223 THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
WHEN YEAR(D.FApproveDate) = {0} AND D.FSaleOrgId = 438223 THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
ELSE 0
END as '2024Discovery', -->2024
CASE WHEN YEAR(D.FDATE) = {0} AND D.FSaleOrgId = 438224 AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
CASE WHEN YEAR(D.FApproveDate) = {0} AND D.FSaleOrgId = 438224 AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
THEN ISNULL(W3.FSHAREAMOUNT,0)/10000
WHEN YEAR(D.FDATE) = {0} AND D.FSaleOrgId = 438224 THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
WHEN YEAR(D.FApproveDate) = {0} AND D.FSaleOrgId = 438224 THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
ELSE 0
END as '2024HongKongPilot', -->2024
CASE WHEN YEAR(D.FDATE) = {0} AND D.FSaleOrgId = 533896 AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
CASE WHEN YEAR(D.FApproveDate) = {0} AND D.FSaleOrgId = 533896 AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
THEN ISNULL(W3.FSHAREAMOUNT,0)/10000
WHEN YEAR(D.FDATE) = {0} AND D.FSaleOrgId = 533896 THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
WHEN YEAR(D.FApproveDate) = {0} AND D.FSaleOrgId = 533896 THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
ELSE 0
END as '2024HuaXiaYunLian', -->2024
CASE WHEN YEAR(D.FDATE) < {0} AND D.FSalerId = D.FSALERID
CASE WHEN YEAR(D.FApproveDate) < {0} AND D.FSalerId = D.FSALERID
THEN
ISNULL(((SELECT
CAST(JSON_VALUE(CAST(FJSONDATA AS NVARCHAR(MAX)), '$.SaleOrderFinance[0].BillAllAmount_LC') as decimal(23,10) ) AS FPrice
@ -411,14 +411,14 @@ namespace Pilot.Report.Exploitation.ResultsKanbanSummary
AND FBILLNO = D.FBILLNO))/10000,0)
ELSE 0
END as 'UsualAlterAmount', --> &
CASE WHEN YEAR(D.FDATE) = {0} AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
CASE WHEN YEAR(D.FApproveDate) = {0} AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
THEN ISNULL(W3.FSHAREAMOUNT,0)/10000
WHEN YEAR(D.FDATE) = {0} THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
WHEN YEAR(D.FApproveDate) = {0} THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
ELSE 0
END as '2024SumAmount', -->2024
CASE WHEN YEAR(D.FDATE) = {1} AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
CASE WHEN YEAR(D.FApproveDate) = {1} AND ISNULL(W3.FSHAREAMOUNT,-1)!=-1
THEN ISNULL(W3.FSHAREAMOUNT,0)/10000
WHEN YEAR(D.FDATE) = {1} THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
WHEN YEAR(D.FApproveDate) = {1} THEN ISNULL(DD.FBILLALLAMOUNT_LC,0)/10000
ELSE 0
END as '2023SumAmount', -->2023
ISNULL(E.FPAYMENTSUM,0) as 'FPAYMENTSUM', -->()
@ -525,11 +525,11 @@ namespace Pilot.Report.Exploitation.ResultsKanbanSummary
}
if (!string.IsNullOrEmpty(fStrartDate))
{
sql += string.Format(@" AND D.FDate >= '{0}'", fStrartDate);
sql += string.Format(@" AND D.FApproveDate >= '{0}'", fStrartDate);
}
if (!string.IsNullOrEmpty(fEndDate))
{
sql += string.Format(@" AND D.FDate <= '{0}'", fEndDate);
sql += string.Format(@" AND D.FApproveDate <= '{0}'", fEndDate);
}
if (!string.IsNullOrEmpty(fSDate))
{
@ -684,7 +684,6 @@ namespace Pilot.Report.Exploitation.ResultsKanbanSummary
{0}
UNION ALL
SELECT
null,
null,
'',
null,
@ -702,6 +701,7 @@ namespace Pilot.Report.Exploitation.ResultsKanbanSummary
SUM(Payment),
SUM(ShippedReceivables),
SUM(ExpiredReceivables),
null,
3,
{2} FID,
{2} FIDENTITYID

View File

@ -14,6 +14,7 @@ using Pilot.Report.Exploitation.PublicClass;
using DocumentFormat.OpenXml.Bibliography;
using DocumentFormat.OpenXml.Spreadsheet;
using NPOI.SS.Formula.Functions;
using Pilot.Report.Exploitation.Common;
namespace Pilot.Report.Exploitation.SaleOrderProgress
{
@ -244,7 +245,7 @@ namespace Pilot.Report.Exploitation.SaleOrderProgress
Where A.FDOCUMENTSTATUS = 'C' AND W8.FNumber != 'Z' --AND ISNULL(X.FNAME,'') != ''
AND A.FSALEORGID = 100302 AND S. != '' AND A.FMANUALCLOSE != '1'
AND ISNULL(K.FNAME,'') NOT IN ('','')
AND X.FNAME != '';", year, year - 1, year - 2, year - 3, year - 4, year - 5, year - 6, tableNameView);
AND X.FNAME != '' ", year, year - 1, year - 2, year - 3, year - 4, year - 5, year - 6, tableNameView);
if (!string.IsNullOrEmpty(organization))
{
@ -409,7 +410,8 @@ Where a2.FMANUALROWCLOSE!='1' AND a1.FID = A.FID)*ISNULL(Y2.FSHARERATE,100
0 Sort
FROM #TABLETMEP4) t1
order by Sort;", tableName);
Loghelp.Log("BuilderReportSqlAndTempTable");
Loghelp.Log(sql);
DBUtils.Execute(this.Context, sql);
}

View File

@ -16,14 +16,14 @@ BEGIN
TRUNCATE TABLE ZRP_YingShouMingXi_yuyubo;
insert into ZRP_YingShouMingXi_yuyubo
INSERT INTO ZRP_YingShouMingXi_yuyubo
([ID],[ID],[ID],[],[F_RecConditionId],[],[],[],[],[SBU]
,[],[],[],[],[],[],[],[],[],[],[],
[退],[],[],[],[],[],[PMS日期时间],[],[],
[],[],[],[],[],[],[],[],[],
[],[],[],[],[],[],[],[],[],[],[]
,[退],[],[],[],[],[],[],[],[],[],[],
[1-6],[7-12],[13-18],[19],[1],[-],[],[ID],[])
[1-6],[7-12],[13-18],[19],[1],[-],[],[ID],[],[])
SELECT
[ID],[ID],[ID],[],[F_RecConditionId],[],[],[],[],[SBU]
,[],[],[],[],[],[],[],[],[],[],[],
@ -31,27 +31,27 @@ SELECT
[],[],[],[],[],[],[],[],[],
[],[],[],[],[],[],[],[],0 [],[], 0 []
,0 [退],0 [],0 [],0 [],0 [],NULL [],0 [],0 [],NULL [],NULL [],0 [],
NULL [1-6],NULL [7-12],NULL [13-18],NULL [19],NULL [1],NULL [-],NULL [],[ID],[]
NULL [1-6],NULL [7-12],NULL [13-18],NULL [19],NULL [1],NULL [-],NULL [],[ID],[],[]
FROM (
SELECT A.FID [ID]
,ISNULL(O.fid,l.fid) [ID]
,isnull(w.FENTRYID,0) [ID], ISNULL(w.FNAME,'') AS [], W.F_RecConditionId
,(SELECT FBILLALLAMOUNT_LC FROM T_SAL_ORDERFIN FF WHERE FF.FID = A.FID )AS []
,ISNULL(w.FENTRYID,0) [ID], ISNULL(w.FNAME,'') AS [], W.F_RecConditionId
,(SELECT SUM(FBillAllAmount_LC) FROM T_SAL_ORDERFIN FF WHERE FF.FID = A.FID )AS []
,ISNULL(O.FNAME,L.FNAME) AS [],CONVERT(DECIMAL(18,2),ISNULL(n.FSHARERATE,100)) AS []
,CONVERT(DECIMAL(18,6),ISNULL(n.FSHAREAMOUNT,fin.FBILLALLAMOUNT_LC)) []
,CONVERT(DECIMAL(18,6),ISNULL(n.FSHAREAMOUNT,fin.FBillAllAmount_LC)) []
,ISNULL(ACO.,ACL.) AS [SBU] , ISNULL (ACO.[] , ACL.) AS [],c.FNAME AS [] ,ISNULL(K.FDATAVALUE,'') AS []
,P.FDATAVALUE AS [],A.F_contractnumber AS [] , G.FNAME as []
,convert( nvarchar(10), year(A.FAPPROVEDATE)) AS [],CONVERT(VARCHAR(10), A.FAPPROVEDATE,23) AS []
,P.FDATAVALUE AS [],A.F_contractnumber AS [] , G.FNAME AS []
,CONVERT( NVARCHAR(10), YEAR(A.FAPPROVEDATE)) AS [],CONVERT(VARCHAR(10), A.FAPPROVEDATE,23) AS []
,[]=ISNULL((SELECT (CONVERT(NVARCHAR(10),MAX(SAL.FDATE),23)) AS '发货日期' FROM T_SAL_DELIVERYNOTICE SAL
INNER JOIN T_SAL_DELIVERYNOTICEFIN B ON SAL.FID =B.FID
WHERE SAL.FDOCUMENTSTATUS= 'C' AND SAL.F_PAPERCONTRACT = A.F_contractnumber),'')
,[]=ISNULL( (SELECT SUM(B.FBILLALLAMOUNT_LC) AS '累计发货金额' FROM T_SAL_DELIVERYNOTICE SAL
,[]=ISNULL( (SELECT SUM(B.FBillAllAmount_LC) AS '累计发货金额' FROM T_SAL_DELIVERYNOTICE SAL
INNER JOIN T_SAL_DELIVERYNOTICEFIN B ON SAL.FID =B.FID
WHERE SAL.FDOCUMENTSTATUS= 'C' AND SAL.F_PAPERCONTRACT = A.F_contractnumber),0)
,[]=ISNULL((CASE WHEN SUBSTRING(U.FDATAVALUE,0,1)= 'W' THEN T. ELSE T. END ),'')
,[退]=isnull((
SELECT SUM(B.FBILLALLAMOUNT_LC) AS '累计退货金额'
,[退]=ISNULL((
SELECT SUM(B.FBillAllAmount_LC) AS '累计退货金额'
FROM T_SAL_RETURNSTOCK AA
INNER JOIN T_SAL_RETURNSTOCKFIN B ON AA.FID =B.FID
WHERE AA.FDOCUMENTSTATUS= 'C' AND A.F_contractnumber = AA.F_contractnumber ),0)
@ -65,16 +65,16 @@ SELECT A.FID [
,[PMS日期时间]=W.F_DAY
,a.F_XMJDD AS '项目进度' ---
,convert(nvarchar(10),a.F_XMTSSJ,23) AS '项目调试时间' --
,convert(nvarchar(10),a.F_XMYSSJ,23) AS '项目验收时间' --
,convert(nvarchar(10),dateadd(day,isnull(w.f_day,0) ,w.F_PMSDate),23) AS '质保金到期时间'
,[]=case when a.F_YYS = 0 then '' else '' end
,[]= ISNULL( ROUND( DATEDIFF(DAY,convert(nvarchar(10),dateadd(day,isnull(w.f_day,0) ,W.F_PMSDate),23),Getdate()) / 30,0) ,0 )
,CONVERT(NVARCHAR(10),a.F_XMTSSJ,23) AS '项目调试时间' --
,CONVERT(NVARCHAR(10),a.F_XMYSSJ,23) AS '项目验收时间' --
,CONVERT(NVARCHAR(10),DATEADD(DAY,ISNULL(w.f_day,0) ,w.F_PMSDate),23) AS '质保金到期时间'
,[]=CASE WHEN a.F_YYS = 0 THEN '' ELSE '' END
,[]= ISNULL( ROUND( DATEDIFF(DAY,CONVERT(NVARCHAR(10),DATEADD(DAY,ISNULL(w.f_day,0) ,W.F_PMSDate),23),GETDATE()) / 30,0) ,0 )
----,CASE WHEN A.F_OrderType in ('仪表','YB') THEN '元器件' ELSE s.FCAPTION END AS '结算类别' ----#,当值为仪表时,改成元器件,其他为系统
,[]=(select top 1 case when s.FCAPTION = '仪表' THEN '元器件' ELSE s.FCAPTION END from T_META_FORMENUMITEM R
,[]=(SELECT TOP 1 CASE WHEN s.FCAPTION = '仪表' THEN '元器件' ELSE s.FCAPTION END FROM T_META_FORMENUMITEM R
LEFT JOIN T_META_FORMENUMITEM_L S ON S.FENUMID = R.FENUMID AND S.FLOCALEID = 2052
where r.FVALUE = A.F_OrderType )
,(select top 1 case when S.FCAPTION = '仪表' AND a.F_XMYSSJ <> '' then '项目已做完,回部分款'
WHERE r.FVALUE = A.F_OrderType )
,(SELECT TOP 1 CASE WHEN S.FCAPTION = '仪表' AND a.F_XMYSSJ <> '' then '项目已做完,回部分款'
WHEN S.FCAPTION = '仪表' AND a.F_XMYSSJ = '' then '项目未完工,欠款合同'
WHEN S.FCAPTION <> '仪表' AND w.FID is not null then '款到发货'
WHEN S.FCAPTION <> '仪表' AND w.FID is not null then '协议付款'
@ -101,6 +101,7 @@ SELECT A.FID [
,[]=w.FRECADVANCERATE
,A.FSALEORGID as '组织ID'
,W.F_DAY AS '天数'
,a.FBILLNO []
-----------------from --------
FROM T_SAL_ORDER A WITH(NOLOCK)
@ -110,7 +111,7 @@ SELECT A.FID [
,W.FRECADVANCEAMOUNT,w.F_DAY
,w.FENTRYID, W.F_RecConditionId ,w.FRECADVANCERATE
FROM T_SAL_ORDERPLAN w WITH(NOLOCK)
INNER JOIN T_BD_RecCondition_L X on X.FID = W.F_RecConditionId
LEFT JOIN T_BD_RecCondition_L X on X.FID = W.F_RecConditionId
) w ON w.FID=A.FID
left join (Select a2.FENTRYID,a2.FDATAVALUE From T_BAS_ASSISTANTDATAENTRY a1 JOIN T_BAS_ASSISTANTDATAENTRY_L a2 on a1.FENTRYID = a2.FENTRYID
Where a1.FID = '670cc977263353') B on A.F_ORDERCATEGORY = B.FENTRYID
@ -120,8 +121,8 @@ SELECT A.FID [
left JOIN T_PerformanceSharing M WITH(NOLOCK) ON M.FSOURCEBILLNO = A.FBILLNO AND M.FDOCUMENTSTATUS = 'C'
left JOIN T_PerformanceSharingEntry N WITH(NOLOCK) ON N.FID=M.FID
LEFT JOIN V_BD_SALESMAN_L O WITH(NOLOCK) ON O.fid= N.FSALEID
LEFT JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO ON ACO.=O.FNAME AND ISNULL(ACO.,'') != ''
LEFT JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACL ON ACL.=L.FNAME AND ISNULL(ACL.,'') != ''
LEFT JOIN (SELECT DISTINCT ACO22.,ACO22.,ACO22. FROM ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO22 ) ACO ON ACO.=O.FNAME AND ISNULL(ACO.,'') != ''
LEFT JOIN (SELECT DISTINCT ACL22.,ACL22. ,ACL22. FROM ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACL22 ) ACL ON ACL.=L.FNAME AND ISNULL(ACL.,'') != ''
LEFT JOIN T_SAL_ORDERFIN fin WITH(NOLOCK) ON a.FID=fin.FID
LEFT JOIN T_BD_CUSTOMER I WITH(NOLOCK) ON I .FCUSTID = A.FCUSTID
lEFT JOIN V_ASSISTANTDATA K WITH(NOLOCK) ON K.FENTRYID = i.FCompanyNature
@ -180,7 +181,7 @@ SELECT A.FID [
LEFT JOIN T_IV_SALESIC FP on FP.F_PAPERNUMBER = aa.F_CONTRACTNUMBER --
LEFT JOIN
(
SELECT F_Papercontract,MAX(CONVERT(NVARCHAR(10), AA.FDATE,23)) AS '发货日期',SUM(B.FBILLALLAMOUNT_LC) AS '累计发货金额' FROM T_SAL_DELIVERYNOTICE AA
SELECT F_Papercontract,MAX(CONVERT(NVARCHAR(10), AA.FDATE,23)) AS '发货日期',SUM(B.FBillAllAmount_LC) AS '累计发货金额' FROM T_SAL_DELIVERYNOTICE AA
INNER JOIN T_SAL_DELIVERYNOTICEFIN B ON AA.FID =B.FID
WHERE AA.FDOCUMENTSTATUS= 'C'
GROUP BY AA.F_Papercontract
@ -191,17 +192,17 @@ SELECT A.FID [
) FaHuoRiQi on FaHuoRiQi.FID=a.fid
LEFT JOIN (SELECT distinct F_Papercontract FROM T_SAL_DELIVERYNOTICE WHERE F_SFYFH ='') AB ON AB.F_PAPERCONTRACT = A.F_contractnumber
WHERE ( ( A.FSALEORGID = 100302 AND
ACO. != '碳索智控'
OR ACL. != '碳索智控'
OR C.FNAME NOT IN ('派诺科技(香港)有限公司','武汉派诺科技发展有限公司')
OR L.FNAME NOT IN ('兴诺总') ) OR A.FSALEORGID != 100302) AND A.FManualClose <> '1' AND A.FDocumentStatus = 'C'
AND EXISTS(SELECT 1 FROM T_SAL_ORDERENTRY bb WHERE bb.fid=a.fid AND bb.FManualRowClose <> '1' )
WHERE ( ( A.FSALEORGID = 100302 AND (
(ACO. != '碳索智控' OR ACO. IS null )
AND (ACL. != '碳索智控' OR ACL. IS null )
AND C.FNAME NOT IN ('派诺科技(香港)有限公司','武汉派诺科技发展有限公司')
AND L.FNAME NOT IN ('兴诺总','陈智勇') )) OR A.FSALEORGID != 100302) AND A.FDocumentStatus = 'C'
AND EXISTS(SELECT 1 FROM T_SAL_ORDERENTRY bb WHERE bb.fid=a.fid )
) A
--where [ID]= 102802
--where []< 100
--where [] !=''
WHERE []<>0 AND SUBSTRING([],0,1)!='Z'
WHERE []<>0 AND SUBSTRING([],1,1) != 'Z'
ORDER BY A.[ID],[ID]
update [ZRP_YingShouMingXi_yuyubo] set []=[],[]=[]*[]*0.01,[退]=[退]*[]*0.01
@ -265,8 +266,8 @@ update [ZRP_YingShouMingXi_yuyubo] SET [
,[ID],[ID],[ID],GETDATE(),0
FROM [ZRP_YingShouMingXi_yuyubo] WHERE ISNULL([],0)=0
DELETE [ReceivablesDetailsTable]
WHERE [ID] IN (SELECT DISTINCT [ID] FROM [ZRP_YingShouMingXi_yuyubo] WHERE []=[]-[退])
--DELETE [ReceivablesDetailsTable]
--WHERE [ID] IN (SELECT DISTINCT [ID] FROM [ZRP_YingShouMingXi_yuyubo] WHERE []=[]-[退])
END
GO
@ -274,3 +275,8 @@ GO
DELETE dbo.ReceivablesDetailsTable;
EXEC PR_YingShouMingXi_yuyubo