diff --git a/.vs/Pilot.Report/v17/DocumentLayout.backup.json b/.vs/Pilot.Report/v17/DocumentLayout.backup.json
index 36e8a70..75bb071 100644
--- a/.vs/Pilot.Report/v17/DocumentLayout.backup.json
+++ b/.vs/Pilot.Report/v17/DocumentLayout.backup.json
@@ -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": ""
}
]
diff --git a/Pilot.Report.Exploitation/AnnualSalesPaymentSum/AnnualSalesPaymentSumReport.cs b/Pilot.Report.Exploitation/AnnualSalesPaymentSum/AnnualSalesPaymentSumReport.cs
index 4cbec1d..edcfa6c 100644
--- a/Pilot.Report.Exploitation/AnnualSalesPaymentSum/AnnualSalesPaymentSumReport.cs
+++ b/Pilot.Report.Exploitation/AnnualSalesPaymentSum/AnnualSalesPaymentSumReport.cs
@@ -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);
}
diff --git a/Pilot.Report.Exploitation/Pilot.Report.Exploitation.csproj b/Pilot.Report.Exploitation/Pilot.Report.Exploitation.csproj
index 875ebb1..2786c60 100644
--- a/Pilot.Report.Exploitation/Pilot.Report.Exploitation.csproj
+++ b/Pilot.Report.Exploitation/Pilot.Report.Exploitation.csproj
@@ -188,6 +188,7 @@
+
diff --git a/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs b/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs
index bf3f37f..a8ae2b2 100644
--- a/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs
+++ b/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs
@@ -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
}
}
+
+
}
}
diff --git a/Pilot.Report.Exploitation/ResultsKanbanSummary/ResultsKanbanSumReport.cs b/Pilot.Report.Exploitation/ResultsKanbanSummary/ResultsKanbanSumReport.cs
index c673d68..a717299 100644
--- a/Pilot.Report.Exploitation/ResultsKanbanSummary/ResultsKanbanSumReport.cs
+++ b/Pilot.Report.Exploitation/ResultsKanbanSummary/ResultsKanbanSumReport.cs
@@ -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))
{
@@ -682,8 +682,7 @@ namespace Pilot.Report.Exploitation.ResultsKanbanSummary
(
{0}
UNION ALL
- SELECT
- null,
+ SELECT
null,
'合计：',
null,
@@ -701,6 +700,7 @@ namespace Pilot.Report.Exploitation.ResultsKanbanSummary
SUM(Payment),
SUM(ShippedReceivables),
SUM(ExpiredReceivables),
+ null,
3,
{2} FID,
{2} FIDENTITYID
diff --git a/Pilot.Report.Exploitation/SaleOrderProgress/PHBSaleOrderReport.cs b/Pilot.Report.Exploitation/SaleOrderProgress/PHBSaleOrderReport.cs
index 25a1ab5..73db5f3 100644
--- a/Pilot.Report.Exploitation/SaleOrderProgress/PHBSaleOrderReport.cs
+++ b/Pilot.Report.Exploitation/SaleOrderProgress/PHBSaleOrderReport.cs
@@ -410,7 +410,7 @@ 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);
}
diff --git a/Pilot.Report.Exploitation/bin/Debug/Pilot.Report.Exploitation.dll b/Pilot.Report.Exploitation/bin/Debug/Pilot.Report.Exploitation.dll
deleted file mode 100644
index 9f540bb..0000000
Binary files a/Pilot.Report.Exploitation/bin/Debug/Pilot.Report.Exploitation.dll and /dev/null differ
diff --git a/Pilot.Report.Exploitation/bin/Debug/Pilot.Report.Exploitation.pdb b/Pilot.Report.Exploitation/bin/Debug/Pilot.Report.Exploitation.pdb
deleted file mode 100644
index 713788b..0000000
Binary files a/Pilot.Report.Exploitation/bin/Debug/Pilot.Report.Exploitation.pdb and /dev/null differ
diff --git a/应收明细SQL.sql b/应收明细SQL.sql
index 2f24730..481d04d 100644
--- a/应收明细SQL.sql
+++ b/应收明细SQL.sql
@@ -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 ('DZ','YB') THEN 'Ԫ' ELSE s.FCAPTION END AS '' --ȡ۶-ͷ-#ֵΪDZʱijԪΪϵͳ
- ,[]=(select top 1 case when s.FCAPTION = 'DZ' THEN 'Ԫ' ELSE s.FCAPTION END from T_META_FORMENUMITEM R
+ ,[]=(SELECT TOP 1 CASE WHEN s.FCAPTION = 'DZ' 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 = 'DZ' AND a.F_XMYSSJ <> '' then 'Ŀ꣬زֿ'
+ WHERE r.FVALUE = A.F_OrderType )
+ ,(SELECT TOP 1 CASE WHEN S.FCAPTION = 'DZ' AND a.F_XMYSSJ <> '' then 'Ŀ꣬زֿ'
WHEN S.FCAPTION = 'DZ' AND a.F_XMYSSJ = '' then 'Ŀδ깤Ƿͬ'
WHEN S.FCAPTION <> 'DZ' AND w.FID is not null then ''
WHEN S.FCAPTION <> 'DZ' 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
+
+