1

Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs

@@ -238,7 +238,7 @@ else
             Dictionary<string, decimal> dicList = new Dictionary<string, decimal>();
             if (action.ReturnData != null)
             {
-
+                //this.View.ShowMessage("123");
                 string wheresql = " 1=1 ";
                 FilterParameter returnData = action.ReturnData as FilterParameter;//过滤框返回的数据
                 DynamicObject dyObj = returnData.CustomFilter as DynamicObject;
@@ -325,7 +325,7 @@ else
 
                 sql_1 += string.Format($@"/*dialect*/Select * From (Select  [FId],[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_041],[F_042],[F_043],[F_044],[F_045],[F_046],[F_047],[F_048],[F_049],[F_050],[F_051],[F_052],[F_053],[F_054],[F_055],[F_056],[F_057],[F_058],[F_059],[F_000],[F_060],[F_061],[F_062],[F_063],[销售单主键ID],[销售员ID],[收款条件主键ID],[EditTime],[IfManualEdit],[F_064],[F_065],[F_066],[F_067],[F_068],[BiBie],[HuiLv],[DingDanZongE_YuanBi],[ZeRenRen],[XinYongEDu],[客户编码],[DaoKuanJinE_YuanBi],[YingShouHeJi_YuanBi],[YunZaFei],[LeiJiTuiHuoJinE_YuanBi]
            ,[F_025]*[HuiLv] as  F_SJYCHYSKHJ_BWB, [F_024]*[HuiLv] as  F_WDQJE_BWB, [F_027]*[HuiLv]  F_DQJE_BWB ,[F_000] AS  F_zuzhi
-           ,Month([F_012]) as  F_Month , DATEPART(week, [F_012]) AS F_week from [ReceivablesDetailsTable] where {wheresql}
+           ,Month([F_012]) as  F_Month , DATEPART(week, [F_012]) AS F_week,[数据截止时间] from [ReceivablesDetailsTable] where {wheresql}
             Union ALL
             (Select 
             null,null,'合计：',null,null,null,null,null,null,null,SUM(F_010),
@@ -341,11 +341,11 @@ else
 		   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
          , null, null, null, null, null,'',1 [HuiLv],SUM([DingDanZongE_YuanBi]),'' [ZeRenRen],0 [XinYongEDu],'' [客户编码],SUM([DaoKuanJinE_YuanBi])  ,SUM([YingShouHeJi_YuanBi]),SUM([YunZaFei]),SUM([LeiJiTuiHuoJinE_YuanBi]) 
-         ,SUM([F_SJYCHYSKHJ_BWB]) ,sum(F_WDQJE_BWB)  F_WDQJE_BWB,sum(F_DQJE_BWB)  F_DQJE_BWB,null  AS  F_zuzhi,NULL,NULL
+         ,SUM([F_SJYCHYSKHJ_BWB]) ,sum(F_WDQJE_BWB)  F_WDQJE_BWB,sum(F_DQJE_BWB)  F_DQJE_BWB,null  AS  F_zuzhi,NULL,NULL,  max(数据截止时间)  [数据截止时间] 
             From  
 			(	select   [销售单主键ID],[销售员ID],[F_010],F_017,F_018,F_019,F_020,F_021,F_022 ,SUM([F_024]) as F_024 ,F_025,
 		SUM(F_027) F_027,SUM(F_036) F_036 ,[BiBie]   ,[DingDanZongE_YuanBi]   ,[DaoKuanJinE_YuanBi]   ,[YingShouHeJi_YuanBi] ,[YunZaFei], [LeiJiTuiHuoJinE_YuanBi] 
-          ,[F_025]*[HuiLv] as  F_SJYCHYSKHJ_BWB, SUM([F_024]*[HuiLv]) as  F_WDQJE_BWB, 	SUM([F_027]*[HuiLv]) F_DQJE_BWB   from
+          ,[F_025]*[HuiLv] as  F_SJYCHYSKHJ_BWB, SUM([F_024]*[HuiLv]) as  F_WDQJE_BWB, 	SUM([F_027]*[HuiLv]) F_DQJE_BWB ,max(数据截止时间) AS  [数据截止时间]   from
 			[ReceivablesDetailsTable] 
 			where {wheresql}
        	GROUP BY  [销售单主键ID],[销售员ID],[F_010],F_017,F_018,F_019,F_020,F_021,F_022 , F_025,
@@ -697,6 +697,8 @@ else
                     //到期金额(本位币)
                     this.View.Model.SetValue("F_DQJE_BWB", item["F_DQJE_BWB"], indexi);
 
+                    this.View.Model.SetValue("F_JZSJ", item["数据截止时间"], indexi);
+
                     //月
                     this.View.Model.SetValue("F_Month", item["F_Month"], indexi);
                     //周

非C#代码文件/应收明细SQL.sql

@@ -57,7 +57,7 @@ SELECT   A.FID [
     ,[<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ۼƷ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]=ISNULL( (SELECT  SUM(B.FBillAllAmount) AS '<EFBFBD>ۼƷ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'  FROM T_SAL_DELIVERYNOTICE SAL WITH(NOLOCK)            
   INNER JOIN T_SAL_DELIVERYNOTICEFIN B WITH(NOLOCK) ON SAL.FID =B.FID         
   WHERE SAL.FDOCUMENTSTATUS= 'C'   AND SAL.F_PAPERCONTRACT = A.F_contractnumber  AND SAL.FSALEORGID=a.FSALEORGID),0)
-  +ISNULL((SELECT SUM(F_sendAmount) FROM T_SAL_ORDERENTRY bb WHERE bb.fid=a.fid  )  ,0)
+  -- +ISNULL((SELECT SUM(old.<2E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>) FROM T_SAL_ORDER bb LEFT JOIN oldk3seorder0701 old ON bb.F_CONTRACTNUMBER=old.<2E><>ͬ<EFBFBD><CDAC> WHERE bb.fid=a.fid  ) ,0) //Ҫ<><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾK3<4B><33><EFBFBD><EFBFBD>,<2C><>ΪK3<4B>DZ<EFBFBD>λ<EFBFBD><CEBB>
 
   ,[<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>]=NULL
   --,[<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>]=ISNULL((CASE WHEN SUBSTRING(U.FNUMBER,1,1)= 'W' THEN T.<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> ELSE T.û<EFBFBD>к<EFBFBD>ɫ<EFBFBD>Ŀ<EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> END ),'')
@@ -76,7 +76,8 @@ SELECT   A.FID [
   FROM T_SAL_RETURNNOTICE AA  WITH(NOLOCK)         
   INNER JOIN T_SAL_RETURNNOTICEFIN B WITH(NOLOCK) ON AA.FID =B.FID         
   WHERE AA.FDOCUMENTSTATUS= 'C'  AND aa.FSALEORGID = a.FSALEORGID
-  AND  AA.F_SOURPAPERCONTRACT=a.F_CONTRACTNUMBER),0)+ ISNULL((SELECT SUM([<EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>])  FROM [oldk3seorder0701] WHERE a.FSaleOrgId=100302  AND <EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>=a.F_CONTRACTNUMBER),0)
+  AND  AA.F_SOURPAPERCONTRACT=a.F_CONTRACTNUMBER),0)
+  -- + ISNULL((SELECT SUM([<5B>˻<EFBFBD><CBBB><EFBFBD><EFBFBD><EFBFBD>])  FROM [oldk3seorder0701] WHERE a.FSaleOrgId=100302  AND <20><>ͬ<EFBFBD><CDAC>=a.F_CONTRACTNUMBER),0) //Ҫ<><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾK3<4B><33><EFBFBD><EFBFBD>,<2C><>ΪK3<4B>DZ<EFBFBD>λ<EFBFBD><CEBB>
 
 
   ,[<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ۼƿ<EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] =AD.<EFBFBD><EFBFBD>Ʊ<EFBFBD>ܽ<EFBFBD><EFBFBD><EFBFBD>       
@@ -286,8 +287,8 @@ UPDATE  [ZRP_YingShouMingXi_yuyubo] SET [
  [<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>2]= 
  ISNULL(  (
  SELECT  
- STRING_AGG(CONVERT(NVARCHAR(10),kaipiaoriqi,23)+'---'+FORMAT( F_GeneralInvoice,'0.00')+'Ԫ',',')[<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>2] FROM (
- SELECT   F_PaperNumber, t0.FSALEORGID,
+STRING_AGG(CONVERT(NVARCHAR(10),kaipiaoriqi,23)+'---'+FORMAT( F_GeneralInvoice,'0.00')+'Ԫ',',')[<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>2] FROM (
+SELECT   F_PaperNumber, t0.FSALEORGID,
 	CASE WHEN   F_ORDERCATEGORY ='67283ced82f38d' THEN FINVOICEDATE
 	WHEN   F_ORDERCATEGORY !='67283ced82f38d' AND F_GENERALINVOICE='Y' THEN NULL ELSE FINVOICEDATE END AS kaipiaoriqi
 	,CASE WHEN   F_ORDERCATEGORY ='67283ced82f38d' THEN FAFTERTOTALTAX

非C#代码文件/收款单核销流水存储过程.sql

@@ -64,7 +64,7 @@ ORDER BY FDATE
 	     SELECT @fid2=0,@fid3=0,@F_contractnumber='',@amount=0;
 	   SELECT @fid2=FID FROM dbo.VRYF_t_Cust_Entry100025  WHERE FBILLNO3=@FBILLNO
 	   
-	   SELECT @FDATE=FCREATEDATE,@fid3=FID  FROM  VRYF_t_Cust100015  
+	   SELECT @FDATE=ISNULL(F_YeWuDate,FCREATEDATE),@fid3=FID  FROM  VRYF_t_Cust100015  
         WHERE FID=@fid2 AND  FDOCUMENTSTATUS='C'  
       IF(@fid3>0)	    
 	    BEGIN