Merge branch 'master' of http://8.130.121.29:3000/TianHua/Piolot_RepotForm

# Conflicts:
#	Pilot.Report.Exploitation/Pilot.Report.Exploitation.csproj.user

Pilot.Report.Exploitation/Receivables/ReceivablesAutoExecute.cs

@@ -0,0 +1,25 @@
+using Kingdee.BOS.Contracts;
+using Kingdee.BOS.Core;
+using Kingdee.BOS.ServiceHelper;
+using Kingdee.BOS.Util;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Pilot.Report.Exploitation.Receivables
+{
+    [Description("定时刷新应收款报表的数据")]
+    [HotUpdate]
+    public class ReceivablesAutoExecute : IScheduleService
+    {
+        public void Run(Kingdee.BOS.Context ctx, Schedule schedule)
+        {
+            DBServiceHelper.Execute(ctx, "/*dialect*/ EXEC PR_YingShouMingXi_yuyubo");
+        }
+
+
+    }
+}

Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs

@@ -309,10 +309,15 @@ else
            ,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
+           ,null,null,null,null,null,null,null,null
+            ,F_036=(
+		   SELECT SUM(F_036)
+		   FROM ( SELECT DISTINCT [销售单主键ID],hh.收款条件主键ID,F_036
+		   FROM [ReceivablesDetailsTable] hh where {wheresql} ) a )
+          ,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  
 			(select distinct [销售单主键ID],[销售员ID],[F_010],F_017,F_018,F_019,F_020,F_021,F_022 ,0 as F_024 ,F_025,
-			0 as F_027,F_036 from
+			0 as F_027,0 F_036 , null, null, null, null, null  from
 			[ReceivablesDetailsTable] 
 			where {wheresql}
 		    ) a )) W Order by W.F_001");