修复一些问题

This commit is contained in:
余宇波 2025-03-20 09:41:04 +08:00
parent 11181cc106
commit 428f91e0af
4 changed files with 165 additions and 78 deletions

View File

@ -3,8 +3,20 @@
"WorkspaceRootPath": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\", "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": [ "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\\annualsalespaymentsum\\annualsalespaymentsumreport.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\\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\\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}" "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}"
},
{
"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\\receivablesautoexecute.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\\receivablesautoexecute.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
} }
], ],
"DocumentGroupContainers": [ "DocumentGroupContainers": [
@ -19,12 +31,50 @@
{ {
"$type": "Document", "$type": "Document",
"DocumentIndex": 0, "DocumentIndex": 0,
"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": "AgIAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-03-19T10:12:26.006Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 3,
"Title": "ReceivablesAutoExecute.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\\ReceivablesAutoExecute.cs",
"RelativeDocumentMoniker": "Pilot.Report.Exploitation\\Receivables\\ReceivablesAutoExecute.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\\ReceivablesAutoExecute.cs",
"RelativeToolTip": "Pilot.Report.Exploitation\\Receivables\\ReceivablesAutoExecute.cs",
"ViewState": "AgIAAAAAAAAAAAAAAAAAABkAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-03-18T01:50:18.881Z"
},
{
"$type": "Document",
"DocumentIndex": 1,
"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": "AgIAADABAAAAAAAAAAAUwOIBAAAZAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-03-17T10:11:20.902Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 2,
"Title": "AnnualSalesPaymentSumReport.cs", "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", "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", "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", "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", "RelativeToolTip": "Pilot.Report.Exploitation\\AnnualSalesPaymentSum\\AnnualSalesPaymentSumReport.cs",
"ViewState": "AgIAAJgDAAAAAAAAAAAQwBsEAAAbAAAAAAAAAA==", "ViewState": "AgIAAHkAAAAAAAAAAAAiwIUDAABxAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-03-17T07:39:30.7Z", "WhenOpened": "2025-03-17T07:39:30.7Z",
"EditorCaption": "" "EditorCaption": ""

View File

@ -13,7 +13,7 @@ namespace Pilot.Report.Exploitation.Common
public static void Log(string str) public static void Log(string str)
{ {
//return; return;
str = DateTime.Now + "----\n" + str; str = DateTime.Now + "----\n" + str;
string now = DateTime.Now.Date.ToString("yyyy-MM-dd"); string now = DateTime.Now.Date.ToString("yyyy-MM-dd");
string currentDirectory = Environment.CurrentDirectory; string currentDirectory = Environment.CurrentDirectory;

View File

@ -235,9 +235,10 @@ else
/// <param name="action"></param> /// <param name="action"></param>
public void FilterCallBack(FormResult action) public void FilterCallBack(FormResult action)
{ {
Dictionary<string, decimal> dicList = new Dictionary<string, decimal>();
if (action.ReturnData != null) if (action.ReturnData != null)
{ {
string wheresql = " 1=1 "; string wheresql = " 1=1 ";
FilterParameter returnData = action.ReturnData as FilterParameter;//过滤框返回的数据 FilterParameter returnData = action.ReturnData as FilterParameter;//过滤框返回的数据
DynamicObject dyObj = returnData.CustomFilter as DynamicObject; DynamicObject dyObj = returnData.CustomFilter as DynamicObject;
@ -299,22 +300,26 @@ else
//获取表1 //获取表1
var sql_1 = ""; var sql_1 = "";
sql_1 += string.Format($@"/*dialect*/Select * From (Select * From View_PerformanceSharing_yuyubo where {wheresql} sql_1 += string.Format($@"/*dialect*/Select * From (Select * From [ReceivablesDetailsTable] where {wheresql}
Union ALL Union ALL
(Select (Select
null,null,'',null,null,null,null,null,null,null,SUM(F_010), null,null,'',null,null,null,null,null,null,null,SUM(F_010),
null,null,null,null,null,null,SUM(F_017),SUM(F_018),SUM(F_019),SUM(F_020),SUM(F_021),SUM(F_022),null,SUM(F_024),SUM(F_025), null,null,null,null,null,null,SUM(F_017),SUM(F_018),SUM(F_019),SUM(F_020),SUM(F_021),SUM(F_022),null
null,SUM(F_027),null,null,null,null,null,null,null,null,SUM(F_036),null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,0,0,0,null,0 ,F_024=(SELECT SUM(F_024) FROM [ReceivablesDetailsTable] hh where {wheresql})
,SUM(F_025),
null
,F_027=(SELECT SUM(F_027) FROM [ReceivablesDetailsTable] hh where {wheresql})
,null,null,null,null,null,null,null,null,SUM(F_036),null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,0,0,0,null,0
From From
(select distinct [ID],[ID],[F_010],F_017,F_018,F_019,F_020,F_021,F_022 ,F_024 ,F_025, (select distinct [ID],[ID],[F_010],F_017,F_018,F_019,F_020,F_021,F_022 ,0 as F_024 ,F_025,
F_027,F_036 from 0 as F_027,F_036 from
View_PerformanceSharing_yuyubo [ReceivablesDetailsTable]
where {wheresql} where {wheresql}
) a )) W Order by W.F_001"); ) a )) W Order by W.F_001");
var sql_2 = ""; var sql_2 = "";
sql_2 += string.Format(@"/*dialect*/Select top 1 * From ReceivablesDetailsTable"); sql_2 += string.Format(@"/*dialect*/Select top 1 * From ReceivablesDetailsTable");
var sql_List2 = DBUtils.ExecuteDynamicObject(Context, sql_2); var sql_List2 = DBUtils.ExecuteDynamicObject(Context, sql_2);
@ -475,6 +480,8 @@ else
#endregion #endregion
} }
} }
Loghelp.Log("合计");
Loghelp.Log(sql_1);
var sql_List1 = DBUtils.ExecuteDynamicObject(Context, sql_1); var sql_List1 = DBUtils.ExecuteDynamicObject(Context, sql_1);
int indexi = 0; int indexi = 0;
@ -616,6 +623,23 @@ else
this.View.Model.SetValue("F_062", item["F_062"], indexi); this.View.Model.SetValue("F_062", item["F_062"], indexi);
//63 //63
this.View.Model.SetValue("F_063", item["F_063"], indexi); this.View.Model.SetValue("F_063", item["F_063"], indexi);
//【订单总额、累计发货金额、累计退货金额、累计开票金额、累计到款金额、应收款合计、未出货总额、实际已出货应收款合计、】的明细需要去重
if (dicList.ContainsKey(item["销售单主键ID"].ToString() + "-" + item["销售员ID"].ToString()))
{
this.View.Model.SetValue("F_010", null, indexi);
this.View.Model.SetValue("F_017", null, indexi);
this.View.Model.SetValue("F_018", null, indexi);
this.View.Model.SetValue("F_019", null, indexi);
this.View.Model.SetValue("F_020", null, indexi);
this.View.Model.SetValue("F_021", null, indexi);
this.View.Model.SetValue("F_022", null, indexi);
this.View.Model.SetValue("F_025", null, indexi);
}
else
dicList.Add(item["销售单主键ID"].ToString() + "-" + item["销售员ID"].ToString(), 0);
indexi++; indexi++;
#endregion #endregion
} }

View File

@ -23,7 +23,7 @@ BEGIN
[],[],[],[],[],[],[],[],[], [],[],[],[],[],[],[],[],[],
[],[],[],[],[],[],[],[],[],[],[] [],[],[],[],[],[],[],[],[],[],[]
,[退],[],[],[],[],[],[],[],[],[],[], ,[退],[],[],[],[],[],[],[],[],[],[],
[1-6],[7-12],[13-18],[19],[1],[-],[],[ID],[],[]) [1-6],[7-12],[13-18],[19],[1],[-],[],[ID],[],[],[],[])
SELECT SELECT
[ID],[ID],[ID],[],[F_RecConditionId],[],[],[],[],[SBU] [ID],[ID],[ID],[],[F_RecConditionId],[],[],[],[],[SBU]
,[],[],[],[],[],[],[],[],[],[],[], ,[],[],[],[],[],[],[],[],[],[],[],
@ -31,14 +31,14 @@ SELECT
[],[],[],[],[],[],[],[],[], [],[],[],[],[],[],[],[],[],
[],[],[],[],[],[],[],[],0 [],[], 0 [] [],[],[],[],[],[],[],[],0 [],[], 0 []
,0 [退],0 [],0 [],0 [],0 [],NULL [],0 [],0 [],NULL [],NULL [],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 ( FROM (
SELECT A.FID [ID] SELECT A.FID [ID]
,ISNULL(O.fid,l.fid) [ID] ,ISNULL(O.fid,l.fid) [ID]
,ISNULL(w.FENTRYID,0) [ID], ISNULL(w.FNAME,'') AS [], W.F_RecConditionId ,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 [] ,(SELECT SUM(FBillAllAmount_LC) FROM T_SAL_ORDERFIN FF WHERE FF.FID = A.FID ) AS [],w.FRECADVANCEAMOUNT [],w.FRECADVANCERATE []
,ISNULL(O.FNAME,L.FNAME) AS [],CONVERT(DECIMAL(18,2),ISNULL(n.FSHARERATE,100)) 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 [] ,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 [] ,P.FDATAVALUE AS [],A.F_contractnumber AS [] , G.FNAME AS []
,CONVERT( NVARCHAR(10), YEAR(A.FAPPROVEDATE)) AS [],CONVERT(VARCHAR(10), A.FAPPROVEDATE,23) AS [] ,CONVERT( NVARCHAR(10), YEAR(A.FAPPROVEDATE)) AS [],CONVERT(VARCHAR(10), A.FAPPROVEDATE,23) AS []
@ -47,7 +47,7 @@ SELECT A.FID [
WHERE SAL.FDOCUMENTSTATUS= 'C' AND SAL.F_PAPERCONTRACT = A.F_contractnumber),'') 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 INNER JOIN T_SAL_DELIVERYNOTICEFIN B ON SAL.FID =B.FID
WHERE SAL.FDOCUMENTSTATUS= 'C' AND SAL.F_PAPERCONTRACT = A.F_contractnumber),0) WHERE SAL.FDOCUMENTSTATUS= 'C' AND SAL.F_PAPERCONTRACT = A.F_contractnumber AND SAL.FSALEORGID=a.FSALEORGID),0)
,[]=ISNULL((CASE WHEN SUBSTRING(U.FDATAVALUE,0,1)= 'W' THEN T. ELSE T. END ),'') ,[]=ISNULL((CASE WHEN SUBSTRING(U.FDATAVALUE,0,1)= 'W' THEN T. ELSE T. END ),'')
,[退]=ISNULL(( ,[退]=ISNULL((
@ -56,9 +56,9 @@ SELECT A.FID [
INNER JOIN T_SAL_RETURNSTOCKFIN B ON AA.FID =B.FID INNER JOIN T_SAL_RETURNSTOCKFIN B ON AA.FID =B.FID
WHERE AA.FDOCUMENTSTATUS= 'C' AND A.F_contractnumber = AA.F_contractnumber ),0) WHERE AA.FDOCUMENTSTATUS= 'C' AND A.F_contractnumber = AA.F_contractnumber ),0)
,[] =ISNULL( CASE WHEN SUBSTRING(U.FDATAVALUE,0,1)= 'W' THEN AD. ELSE AD.[()] END,0) ,[] =AD.
,[]=ISNULL(ae.,0) ,[]=ISNULL(a.F_Amount,0)
,[]=FaHuoRiQi.[] ,[]
,[]=W.FRECADVANCEAMOUNT ,[]=W.FRECADVANCEAMOUNT
,[]=W.F_DAY ,[]=W.F_DAY
@ -69,20 +69,20 @@ SELECT A.FID [
,CONVERT(NVARCHAR(10),a.F_XMYSSJ,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 '质保金到期时间' ,CONVERT(NVARCHAR(10),DATEADD(DAY,ISNULL(w.f_day,0) ,w.F_PMSDate),23) AS '质保金到期时间'
,[]=CASE WHEN a.F_YYS = 0 THEN '' ELSE '' END ,[]=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 ) ,[]= 0
----,CASE WHEN A.F_OrderType in ('仪表','YB') THEN '元器件' ELSE s.FCAPTION END AS '结算类别' ----#,当值为仪表时,改成元器件,其他为系统 ----,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 LEFT JOIN T_META_FORMENUMITEM_L S ON S.FENUMID = R.FENUMID AND S.FLOCALEID = 2052
WHERE r.FVALUE = A.F_OrderType ) WHERE r.FVALUE = A.F_OrderType )
,(SELECT TOP 1 CASE WHEN S.FCAPTION = '仪表' AND a.F_XMYSSJ <> '' then '项目已做完,回部分款' ,(SELECT TOP 1 CASE WHEN S.FCAPTION = '仪表' AND a.F_XMYSSJ <> '' THEN '项目已做完,回部分款'
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 '款到发货'
WHEN S.FCAPTION <> '仪表' AND w.FID is not null then '协议付款' WHEN S.FCAPTION <> '仪表' AND w.FID IS NOT NULL THEN '协议付款'
ELSE '预收款+到货/调试款+质保金' END from T_META_FORMENUMITEM R ELSE '预收款+到货/调试款+质保金' END FROM T_META_FORMENUMITEM R
LEFT JOIN T_META_FORMENUMITEM_L S ON S.FENUMID = R.FENUMID AND S.FLOCALEID = 2052 LEFT JOIN T_META_FORMENUMITEM_L S ON S.FENUMID = R.FENUMID AND S.FLOCALEID = 2052
where r.FVALUE = A.F_OrderType) AS '结算类型' WHERE r.FVALUE = A.F_OrderType) AS '结算类型'
,isnull(convert(nvarchar(10),dateadd(day,isnull(w.f_day,0)+180 ,W.F_PMSDate),23),'') AS '转专责小组时间' ,ISNULL(CONVERT(NVARCHAR(10),DATEADD(DAY,ISNULL(w.f_day,0)+180 ,W.F_PMSDate),23),'') AS '转专责小组时间'
,case when convert(nvarchar(10),dateadd(day,isnull(w.f_day,0)+180 ,W.F_PMSDate),23) is null then '' else '' end AS '是否超账龄转出' ,CASE WHEN CONVERT(NVARCHAR(10),DATEADD(DAY,ISNULL(w.f_day,0)+180 ,W.F_PMSDate),23) IS NULL THEN '' ELSE '' END AS '是否超账龄转出'
,'' AS '超账龄是否申请归还大区' -- ,'' AS '超账龄是否申请归还大区' --
,'' AS '反馈表商务人员引用' -- ,'' AS '反馈表商务人员引用' --
,'' AS '反馈表引用分组' -- ,'' AS '反馈表引用分组' --
@ -139,58 +139,66 @@ SELECT A.FID [
) T ON T.F_PAPER = A.F_contractnumber ) T ON T.F_PAPER = A.F_contractnumber
LEFT JOIN V_ASSISTANTDATA U ON U.FENTRYID = A.F_Ordercategory LEFT JOIN V_ASSISTANTDATA U ON U.FENTRYID = A.F_Ordercategory
LEFT JOIN -- LEFT JOIN
( --(
SELECT -- SELECT
F_Papercontract,CAST( sum(b.FALLAMOUNT) AS DECIMAL(18,6)) AS '发票总金额', -- F_Papercontract,CAST( sum(b.FALLAMOUNT) AS DECIMAL(18,6)) AS '发票总金额',
CAST (sum(CASE WHEN F_Papercontract = 'Y' THEN b.FALLAMOUNT ELSE 0 END ) AS DECIMAL(18,6)) AS '发票总金额(普票存财务)' -- CAST (sum(CASE WHEN F_Papercontract = 'Y' THEN b.FALLAMOUNT ELSE 0 END ) AS DECIMAL(18,6)) AS '发票总金额(普票存财务)'
FROM t_AR_receivable A -- FROM t_AR_receivable A
INNER JOIN T_AR_RECEIVABLEFIN B ON A.FID = B.FID -- INNER JOIN T_AR_RECEIVABLEFIN B ON A.FID = B.FID
GROUP BY F_Papercontract -- GROUP BY F_Papercontract
) AD ON AD.F_PAPERCONTRACT = A.F_contractnumber --) AD ON AD.F_PAPERCONTRACT = A.F_contractnumber
LEFT join
( LEFT JOIN
SELECT a.F_Papercontract, (
sum(d.FCURWRITTENOFFAMOUNT) as '累计收款' SELECT F_PaperNumber, FSALEORGID ,SUM(FAFTERTOTALTAX) AS '发票总金额' FROM (
FROM t_AR_receivable A SELECT F_PaperNumber, t0.FSALEORGID,
INNER JOIN T_AR_RECEIVABLEENTRY E ON E.FID =A.FID CASE WHEN SUBSTRING(F_PaperNumber,1,1)='w' THEN FAFTERTOTALTAX
INNER JOIN T_AR_RECMacthLogENTRY B ON A.FBILLNO = B.FSRCBILLNO WHEN SUBSTRING(F_PaperNumber,1,1)!='w' AND F_GENERALINVOICE='Y' THEN 0 ELSE FAFTERTOTALTAX END AS F_GeneralInvoice,
INNER JOIN T_AR_RECMacthLog C ON C.FID = B.FID FAFTERTOTALTAX
INNER JOIN T_AR_RECMacthLogENTRY D ON D.FID = B.FID FROM T_IV_SALESIC t0 ) tt
AND D.FSOURCETYPE = '36cf265bd8c3452194ed9c83ec5e73d2' GROUP BY F_PaperNumber, FSALEORGID
WHERE ) AD ON AD.F_PaperNumber = A.F_contractnumber AND ad.FSALEORGID=a.FSALEORGID
1=1 --LEFT join
group by a.F_Papercontract --(
) AE ON AE.F_Papercontract = A.F_contractnumber -- SELECT a.F_Papercontract,
-- sum(d.FCURWRITTENOFFAMOUNT) as '累计收款'
-- FROM t_AR_receivable A
-- INNER JOIN T_AR_RECEIVABLEENTRY E ON E.FID =A.FID
-- INNER JOIN T_AR_RECMacthLogENTRY B ON A.FBILLNO = B.FSRCBILLNO
-- INNER JOIN T_AR_RECMacthLog C ON C.FID = B.FID
-- INNER JOIN T_AR_RECMacthLogENTRY D ON D.FID = B.FID
-- AND D.FSOURCETYPE = '36cf265bd8c3452194ed9c83ec5e73d2'
-- WHERE
-- 1=1
-- group by a.F_Papercontract
--) AE ON AE.F_Papercontract = A.F_contractnumber
LEFT JOIN LEFT JOIN
(select FID,max([]) AS [] FROM (SELECT DISTINCT FID,[] AS [] , F_RECCONDITIONID ,FNAME ,F_DAY FROM
(select plan1.FID ,CASE (
WHEN X.FNAME in ('预付款(仪表)','预付款(系统)') THEN CONVERT(NVARCHAR, AA.FDATE, 120) SELECT plan1.FID ,CASE
WHEN X.FNAME in ('货到收款(仪表)','货到收款(系统)') AND DATEADD(day, plan1.F_DAY, CK.F_SFSIGNATURETIME) >= GETDATE() THEN CONVERT(NVARCHAR,DATEADD(day, ISNULL(plan1.F_DAY, 0), ISNULL(CK.F_SFSIGNATURETIME,'')) , 120) WHEN X.FNAME LIKE '%预付款%' THEN CONVERT(NVARCHAR, AA.FDATE, 120)
WHEN X.FNAME in ('货到票到收款(系统)','货到票到收款(仪表)') AND DATEADD(day, plan1.F_DAY,FP.F_DATE) >= GETDATE() THEN CONVERT(NVARCHAR,DATEADD(day, ISNULL(plan1.F_DAY,0),ISNULL(FP.F_DATE,'')) , 120) WHEN X.FNAME LIKE '%货到收款%' THEN DATEADD(day, plan1.F_DAY, CK.F_SFSIGNATURETIME)
WHEN X.FNAME in ('款到发货(仪表)','款到发货(系统)') AND DATEADD(day, plan1.F_DAY,Q.) >= GETDATE() THEN CONVERT(NVARCHAR,DATEADD(day, ISNULL(plan1.F_DAY,0),ISNULL(Q.,'')) , 120) WHEN X.FNAME LIKE '%货到票到收款%' THEN DATEADD(day, plan1.F_DAY,FP.FAPPROVEDATE)
ELSE '' --EXEC [GetReceiveData2] '100302','',''; --WHEN X.FNAME LIKE '%款到发货%' THEN DATEADD(day, plan1.F_DAY,Q.)
END AS '预计到期时间' ----PMS日期# -- 注意销售订单【验收日期】年后会加这个字段由PMS系统传输过来 该字段未添加
ELSE null
END AS '预计到期时间' ----PMS日期#
,plan1.F_RECCONDITIONID,X.FNAME, plan1.F_DAY
from from
T_SAL_ORDER AA T_SAL_ORDER AA
left join left join
T_SAL_ORDERPLAN plan1 on plan1.FID=aa.FID T_SAL_ORDERPLAN plan1 on plan1.FID=aa.FID
LEFT JOIN T_BD_RecCondition_L X on X.FID = plan1.F_RecConditionId LEFT JOIN T_BD_RecCondition_L X on X.FID = plan1.F_RecConditionId
LEFT JOIN T_SAL_OUTSTOCK CK on CK.F_CONTRACTNUMBER = aa.F_CONTRACTNUMBER -- LEFT JOIN T_SAL_OUTSTOCK CK on CK.F_CONTRACTNUMBER = aa.F_CONTRACTNUMBER AND CK.FSALEORGID = AA.FSALEORGID --
LEFT JOIN T_IV_SALESIC FP on FP.F_PAPERNUMBER = aa.F_CONTRACTNUMBER -- LEFT JOIN T_IV_SALESIC FP on FP.F_PAPERNUMBER = aa.F_CONTRACTNUMBER --
LEFT JOIN
( ) dd ) FaHuoRiQi1
SELECT F_Papercontract,MAX(CONVERT(NVARCHAR(10), AA.FDATE,23)) AS '发货日期',SUM(B.FBillAllAmount_LC) AS '累计发货金额' FROM T_SAL_DELIVERYNOTICE AA on FaHuoRiQi1.FID=a.fid AND FaHuoRiQi1.F_RECCONDITIONID=w.F_RECCONDITIONID
INNER JOIN T_SAL_DELIVERYNOTICEFIN B ON AA.FID =B.FID LEFT JOIN
WHERE AA.FDOCUMENTSTATUS= 'C' (SELECT distinct F_Papercontract,FSALEORGID FROM T_SAL_DELIVERYNOTICE WHERE F_SFYFH ='') AB
GROUP BY AA.F_Papercontract ON AB.F_PAPERCONTRACT = A.F_contractnumber AND AB.FSALEORGID=a.FSaleOrgId
) Q ON Q.F_PAPERCONTRACT = aa.F_contractnumber --
) FaHuoRiQi1
GROUP BY 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 ( WHERE ( ( A.FSALEORGID = 100302 AND (
(ACO. != '碳索智控' OR ACO. IS null ) (ACO. != '碳索智控' OR ACO. IS null )
@ -205,13 +213,16 @@ SELECT A.FID [
WHERE []<>0 AND SUBSTRING([],1,1) != 'Z' WHERE []<>0 AND SUBSTRING([],1,1) != 'Z'
ORDER BY A.[ID],[ID] ORDER BY A.[ID],[ID]
update [ZRP_YingShouMingXi_yuyubo] set []=[],[]=[]*[]*0.01,[退]=[退]*[]*0.01 update [ZRP_YingShouMingXi_yuyubo] set []=[],[]=[]*[]*0.01
,[]=[]*[]*0.01,[]=[]*[]*0.01 ,[退]=[退]*[]*0.01
,[]=[]-([退]+[])*[]*0.01,[]=[]-[]*[]*0.01 ,[]=[]*[]*0.01
,[]=CASE WHEN [] <'1990-01-01' OR [] > GETDATE() THEN ([]-[退]-[])*[]*0.01 ELSE 0 END ,[]=[]*[]*0.01
,[]=[]-([退]+[])*[]*0.01
,[]=[]-[]*[]*0.01
,[]=CASE WHEN [] <'1990-01-01' OR [] > GETDATE() THEN ([]-[退]-[])*[]*0.01*ISNULL([],100)*0.01 ELSE 0 END
,[]=CASE WHEN [] <= GETDATE() AND [] >'1990-01-01' THEN [] ELSE NULL END ,[]=CASE WHEN [] <= GETDATE() AND [] >'1990-01-01' THEN [] ELSE NULL END
,[]=CASE WHEN [] <= GETDATE() AND [] >'1990-01-01' THEN([]-[退]-[])*[]*0.01 ELSE 0 END ,[]=CASE WHEN [] <= GETDATE() AND [] >'1990-01-01' THEN([]-[退]-[])*[]*0.01*ISNULL([],100)*0.01 ELSE 0 END
,[]=([]-[退]- [] )*[]*0.01 ,[]=([]-[退]- [] )*[]*0.01
,[]=CASE WHEN []>6 THEN '转应收专责小组' ELSE [] END ,[]=CASE WHEN []>6 THEN '转应收专责小组' ELSE [] END
,[]= CASE WHEN ISNULL([],'') <> '' THEN [] WHEN ISNULL([],0) = 0 THEN '未启动' ,[]= CASE WHEN ISNULL([],'') <> '' THEN [] WHEN ISNULL([],0) = 0 THEN '未启动'
@ -231,6 +242,7 @@ update [ZRP_YingShouMingXi_yuyubo] SET [
,[]=CASE WHEN [] > '1990-01-01' THEN [] ELSE NULL END ,[]=CASE WHEN [] > '1990-01-01' THEN [] ELSE NULL END ,[]=CASE WHEN [] > '1990-01-01' THEN [] ELSE NULL END ,[]=CASE WHEN [] > '1990-01-01' THEN [] ELSE NULL END
,[]=CASE WHEN [] > '1990-01-01' THEN [] ELSE NULL END ,[]=CASE WHEN [] > '1990-01-01' THEN [] ELSE NULL END
,[]=CASE WHEN [] > '1990-01-01' THEN [] ELSE NULL END ,[]=CASE WHEN [] > '1990-01-01' THEN [] ELSE NULL END
, []= ISNULL( ROUND( DATEDIFF(DAY,[],GETDATE()) / 30,0) ,0 )
update [ReceivablesDetailsTable] set [F_001]=b.[ID],[F_002]=b.[],[F_003]=b.[SBU],[F_004]=B.[],[F_005]=b.[],[F_006]=b.[] update [ReceivablesDetailsTable] set [F_001]=b.[ID],[F_002]=b.[],[F_003]=b.[SBU],[F_004]=B.[],[F_005]=b.[],[F_006]=b.[]
@ -252,6 +264,7 @@ update [ZRP_YingShouMingXi_yuyubo] SET [
AND [ReceivablesDetailsTable].[ID]=[ZRP_YingShouMingXi_yuyubo].[ID] AND [ReceivablesDetailsTable].[ID]=[ZRP_YingShouMingXi_yuyubo].[ID]
DELETE [ReceivablesDetailsTable] WHERE [ID] IS NULL OR [ID]=0 ; DELETE [ReceivablesDetailsTable] WHERE [ID] IS NULL OR [ID]=0 ;
INSERT INTO [ReceivablesDetailsTable] INSERT INTO [ReceivablesDetailsTable]
( [F_001],[F_002],[F_003],[F_004],[F_005],[F_006],[F_007],[F_008],[F_009],[F_010],[F_011],[F_012],[F_013],[F_014],[F_015],[F_016],[F_017],[F_018],[F_019],[F_020] ( [F_001],[F_002],[F_003],[F_004],[F_005],[F_006],[F_007],[F_008],[F_009],[F_010],[F_011],[F_012],[F_013],[F_014],[F_015],[F_016],[F_017],[F_018],[F_019],[F_020]
,[F_021],[F_022],[F_023],[F_024],[F_025],[F_026],[F_027],[F_028],[F_029],[F_030],[F_031],[F_032],[F_033],[F_034],[F_035],[F_036],[F_037],[F_038],[F_039],[F_040], ,[F_021],[F_022],[F_023],[F_024],[F_025],[F_026],[F_027],[F_028],[F_029],[F_030],[F_031],[F_032],[F_033],[F_034],[F_035],[F_036],[F_037],[F_038],[F_039],[F_040],