1

Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs

@@ -325,7 +325,16 @@ 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,[数据截止时间] 
+            ,[K3FaHuoJinE]
+	        ,[K3TuiHuoJinE]
+	        ,[K3ZhuanPiaoJinE]
+	        ,[K3PuPiaoJinE]
+	        ,[K3FaHuoJinEMX]
+	        ,[K3TuiHuoJinEMX]
+	        ,[K3ZhuanPiaoJinEMX]
+	        ,[K3PuPiaoJinEMX] 
+            from [ReceivablesDetailsTable] where {wheresql}
             Union ALL
             (Select 
             null,null,'合计：',null,null,null,null,null,null,null,SUM(F_010),
@@ -342,14 +351,39 @@ else
           ,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,  max(数据截止时间)  [数据截止时间]
+            ,sum([K3FaHuoJinE]) AS [K3FaHuoJinE]
+		    ,sum([K3TuiHuoJinE]) AS [K3TuiHuoJinE]
+		    ,sum([K3ZhuanPiaoJinE]) AS [K3ZhuanPiaoJinE]
+		    ,sum([K3PuPiaoJinE]) AS [K3PuPiaoJinE]
+		    ,sum([K3FaHuoJinEMX]) AS [K3FaHuoJinEMX]
+		    ,sum([K3TuiHuoJinEMX]) AS [K3TuiHuoJinEMX]
+		    ,sum([K3ZhuanPiaoJinEMX]) AS [K3ZhuanPiaoJinEMX]
+		    ,sum([K3PuPiaoJinEMX]) AS [K3PuPiaoJinEMX]
             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 ,max(数据截止时间) AS  [数据截止时间]   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  [数据截止时间]
+            ,[K3FaHuoJinE]
+			,[K3TuiHuoJinE]
+			,[K3ZhuanPiaoJinE]
+			,[K3PuPiaoJinE]
+			,[K3FaHuoJinEMX]
+			,[K3TuiHuoJinEMX]
+			,[K3ZhuanPiaoJinEMX]
+			,[K3PuPiaoJinEMX]       
+        from
 			[ReceivablesDetailsTable] 
 			where {wheresql}
        	GROUP BY  [销售单主键ID],[销售员ID],[F_010],F_017,F_018,F_019,F_020,F_021,F_022 , F_025,
 		  [BiBie]   ,[DingDanZongE_YuanBi]   ,[DaoKuanJinE_YuanBi]   ,[YingShouHeJi_YuanBi] ,[YunZaFei], [LeiJiTuiHuoJinE_YuanBi] ,[HuiLv]
+            ,[K3FaHuoJinE]
+			,[K3TuiHuoJinE]
+			,[K3ZhuanPiaoJinE]
+			,[K3PuPiaoJinE]
+			,[K3FaHuoJinEMX]
+			,[K3TuiHuoJinEMX]
+			,[K3ZhuanPiaoJinEMX]
+			,[K3PuPiaoJinEMX]
 		    ) a )) W Order by W.F_001");
 
                 var sql_2 = "";
@@ -704,7 +738,25 @@ else
                     //周
                     this.View.Model.SetValue("F_week", item["F_week"], indexi);
 
-                    if(item["F_038"]!=null)
+
+                    //K3整单累计发货金额(本位币)
+                    this.View.Model.SetValue("F_K3FaHuoJinE", item["K3FaHuoJinE"], indexi);
+                    //K3整单累计退货金额(本位币)
+                    this.View.Model.SetValue("F_K3TuiHuoJinE", item["K3TuiHuoJinE"], indexi);
+                    //K3整单累计专票金额(本位币)
+                    this.View.Model.SetValue("F_K3ZhuanPiaoJinE", item["K3ZhuanPiaoJinE"], indexi);
+                    //K3整单累计普票金额(本位币)
+                    this.View.Model.SetValue("F_K3PuPiaoJinE", item["K3PuPiaoJinE"], indexi);
+                    //K3累计发货金额(本位币)
+                    this.View.Model.SetValue("F_K3FaHuoJinEMX", item["K3FaHuoJinEMX"], indexi);
+                    //K3累计退货金额(本位币)
+                    this.View.Model.SetValue("F_K3TuiHuoJinEMX", item["K3TuiHuoJinEMX"], indexi);
+                    //K3累计专票金额(本位币)
+                    this.View.Model.SetValue("F_K3ZhuanPiaoJinEMX", item["K3ZhuanPiaoJinEMX"], indexi);
+                    //K3累计普票金额(本位币)
+                    this.View.Model.SetValue("F_K3PuPiaoJinEMX", item["K3PuPiaoJinEMX"], indexi);
+
+                    if (item["F_038"]!=null)
                         this.View.Model.SetValue("F_10060",decimal.Parse(item["F_038"]?.ToString()) * decimal.Parse(item["HuiLv"]?.ToString()), indexi);
                     if (item["F_039"] != null)
                         this.View.Model.SetValue("F_70012", decimal.Parse(item["F_039"]?.ToString()) * decimal.Parse(item["HuiLv"]?.ToString()), indexi);
@@ -747,6 +799,50 @@ else
                     indexi++;
                     #endregion
                 }
+
+                var sql_4 = "";
+                sql_4 += string.Format(@"/*dialect*/
+                Select T1.FPAYORGID As ZZ,T2.FNAME As GHDW,Sum(FRECAMOUNT) As SKJE,Sum(FRECAMOUNT-F_AMOUNT*FEXCHANGERATE) AS DHXJE
+                From T_AR_RECEIVEBILL T1
+                Join T_BD_CUSTOMER_L T2 On T1.FCONTACTUNIT = T2.FCUSTID And T2.FLOCALEID = 2052
+				Join (Select * 
+				From ZRP_YingShouMingXi_yuyubo 
+				Where ([整单正数订单总额]-[累计退货金额(原币)]-[K3整单累计退货金额(本位币)])<>[累计到款金额(原币)]) T3 On T3.组织ID = T1.FPAYORGID
+                Where 1=1
+                And FCONTACTUNITTYPE = 'BD_Customer'
+                ");
+                if (CUST != null)
+                {
+                    CustFid = Convert.ToString(CUST["name"]);
+                    sql_4 += $@" And t2.FNAME = '{CustFid}'";
+                }
+                if (FSaleOrg != null)
+                {
+                    FSaleOrgId = Convert.ToString(FSaleOrg["ID"]);
+                    sql_4 += $@" And T1.FPAYORGID ={FSaleOrgId}";
+                }
+                sql_4 += " Group By T1.FPAYORGID,T2.FNAME";
+                var sql_List3 = DBUtils.ExecuteDynamicObject(Context, sql_4);
+                this.View.Model.CreateNewEntryRow("F_MBBA_Entity_qtr");
+                //类型
+                this.View.Model.SetValue("F_009", "类型", indexi);
+                indexi += 1;
+                foreach (var item in sql_List3)
+                {
+                    this.View.Model.CreateNewEntryRow("F_MBBA_Entity_qtr");
+                    //组织
+                    this.View.Model.SetValue("F_zuzhi", item["ZZ"], indexi);
+                    //购货单位
+                    this.View.Model.SetValue("F_005", item["GHDW"], indexi);
+                    //收款金额
+                    this.View.Model.SetValue("F_010", item["SKJE"], indexi);
+                    //待核销金额
+                    this.View.Model.SetValue("FDingDanZongE_YuanBi", item["DHXJE"], indexi);
+                    //类型
+                    this.View.Model.SetValue("F_009", "收款单", indexi);
+                    indexi++;
+                }
+
                 this.View.UpdateView("F_MBBA_Entity_qtr");
                
             }

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

@@ -24,7 +24,8 @@ BEGIN
  [反馈表商务人员引用],[反馈表引用分组],[取值销售],[是否坏账],[是否预发货],[是否集采项目],[合同类型],[是否已存在],[订单总额],[应收比例],[累计发货金额]
  ,[累计退货金额],[累计开票金额],[应收款合计],[未出货总额],[未到期金额],[到期时间],[到期金额],[实际已出货应收款合计],[项目阶段],[收款人],[累计到款金额],
  [1-6个月],[7-12个月],[13-18个月],[19个月以上],[1年以上],[账龄-阶段],[风险评估级别],[组织ID],[天数],[销售订单编号],[收款条件分摊金额],[收款条件分摊比例],[整单正数订单总额],[收款条件累计核销金额]
- ,[结算币别],[结算币别ID],[汇率],[客户信用额度],[客户编码],[累计到款金额(原币)],[应收款合计(原币)] ,[运杂费],[责任人] ,[到期日],[仪表发货金额],[系统验收金额],[创建人])
+ ,[结算币别],[结算币别ID],[汇率],[客户信用额度],[客户编码],[累计到款金额(原币)],[应收款合计(原币)] ,[运杂费],[责任人] ,[到期日],[仪表发货金额],[系统验收金额],[创建人]
+ ,[K3整单累计发货金额(本位币)],[K3整单累计退货金额(本位币)],[K3整单累计专票金额(本位币)],[K3整单累计普票金额(本位币)],[K3累计发货金额(本位币)],[K3累计退货金额(本位币)],[K3累计专票金额(本位币)],[K3累计普票金额(本位币)])
 SELECT  
 [销售单主键ID],[销售员ID],[收款条件主键ID],[收款条件],[F_RecConditionId],[整单订单总额],[销售员],[分摊比例],[分摊金额],[SBU]
  ,[明细区域],[购货单位],[公司性质],[客户信用],[纸质合同号],[项目名称],[签订年份],[订单日期],[发货日期],[整单累计发货金额],[开票日期],
@@ -34,6 +35,7 @@ SELECT
  ,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],[天数],[销售订单编号],[收款条件分摊金额],[收款条件分摊比例],[整单正数订单总额]
 ,[收款条件累计核销金额] ,[结算币别],[结算币别ID],[汇率],[客户信用额度],[客户编码],[累计到款金额(原币)],[应收款合计(原币)],[运杂费],[责任人] ,[到期日],[仪表发货金额],[系统验收金额],[创建人]
+,0 [K3整单累计发货金额(本位币)],0 [K3整单累计退货金额(本位币)],0 [K3整单累计专票金额(本位币)],0 [K3整单累计普票金额(本位币)],0 [K3累计发货金额(本位币)],0 [K3累计退货金额(本位币)],0 [K3累计专票金额(本位币)],0 [K3累计普票金额(本位币)]
 FROM (
 SELECT   A.FID [销售单主键ID]
 ,ISNULL(O.fid,l.fid) [销售员ID]
@@ -271,6 +273,25 @@ GROUP BY  F_PaperNumber, FSALEORGID
   --UPDATE  [ZRP_YingShouMingXi_yuyubo] SET  [责任人]= [销售员]
   --WHERE ISNULL([责任人],'')='' OR [责任人] LIKE ' %';
 
+  ---更新K3整单字段
+UPDATE T1 SET [K3整单累计发货金额(本位币)] = T2.[累计发货],[K3整单累计退货金额(本位币)] = T2.[累计退货]
+,[K3整单累计专票金额(本位币)] = T2.[累计专票],[K3整单累计普票金额(本位币)] = T2.[累计普票]
+FROM [ZRP_YingShouMingXi_yuyubo] T1
+INNER JOIN (
+	SELECT 合同号,SUM(ISNULL(发货金额,0)) AS [累计发货], SUM(ISNULL(退货金额,0)) AS [累计退货],SUM(ISNULL(专票金额,0)) AS [累计专票],SUM(ISNULL(普票金额,0)) AS [累计普票]
+	FROM [oldk3seorder0701]
+	GROUP BY 合同号
+	) T2 ON T1.纸质合同号 = T2.合同号
+WHERE T1.组织ID = 100302
+
+---更新K3明细字段
+update [ZRP_YingShouMingXi_yuyubo] set 
+[K3累计发货金额(本位币)]=[K3整单累计发货金额(本位币)]*[分摊比例]*[收款条件分摊比例]*0.01*0.01
+,[K3累计退货金额(本位币)]=[K3整单累计退货金额(本位币)]*[分摊比例]*[收款条件分摊比例]*0.01*0.01
+,[K3累计专票金额(本位币)]=[K3整单累计专票金额(本位币)]*[分摊比例]*[收款条件分摊比例]*0.01*0.01
+,[K3累计普票金额(本位币)]=[K3整单累计普票金额(本位币)]*[分摊比例]*[收款条件分摊比例]*0.01*0.01
+
+
 
   UPDATE [ZRP_YingShouMingXi_yuyubo] SET SBU=b.区域,[明细区域]=b.明细区域
   FROM  (SELECT DISTINCT ACO22.名称,ACO22.明细区域,ACO22.区域 FROM   ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO22   ) b 
@@ -306,22 +327,22 @@ GROUP BY  F_PaperNumber, FSALEORGID
    -- 补充一点，这些字段还要按销售员分摊进行区分，比如订单金额100元，销售员A 30%，销售员B 70%，这些字段就会显示 A显示30元，B显示70元
 update [ZRP_YingShouMingXi_yuyubo] set 
 [订单总额]=[整单正数订单总额]*[分摊比例]*0.01
-,[累计发货金额]=[整单累计发货金额]*[分摊比例]*0.01
+,[累计发货金额]=[整单累计发货金额]*[分摊比例]*0.01+[K3整单累计发货金额(本位币)]*[分摊比例]*0.01
-,[累计退货金额]=[整单累计退货金额]*[分摊比例]*0.01
+,[累计退货金额]=[整单累计退货金额]*[分摊比例]*0.01+[K3整单累计退货金额(本位币)]*[分摊比例]*0.01
-,[累计开票金额]=[整单累计开票金额]*[分摊比例]*0.01
+,[累计开票金额]=[整单累计开票金额]*[分摊比例]*0.01+[K3整单累计专票金额(本位币)]*[分摊比例]*0.01+[K3整单累计普票金额(本位币)]*[分摊比例]*0.01
 ,[累计到款金额]=[整单累计到款金额]*[分摊比例]*0.01
 ,[收款条件分摊比例]=ISNULL([收款条件分摊比例],100)
 ,[运杂费]=[运杂费]*[分摊比例]*0.01;
 --UPDATE [ZRP_YingShouMingXi_yuyubo] set  [分摊金额]=[订单总额];
 UPDATE  [ZRP_YingShouMingXi_yuyubo] set
-[应收款合计]=CASE WHEN  [整单正数订单总额]>0 then ABS([订单总额])-ABS(([整单累计退货金额]+[整单累计到款金额])*[分摊比例]*0.01) +[运杂费] ELSE 0 end
+[应收款合计]=CASE WHEN  [整单正数订单总额]>0 then ABS([订单总额])-ABS(([整单累计退货金额]+[K3整单累计退货金额(本位币)]+[整单累计到款金额])*[分摊比例]*0.01) +[运杂费] ELSE 0 end
-,[未出货总额]=CASE WHEN  [整单正数订单总额]>0 then  ABS([订单总额])-ABS([整单累计发货金额]*[分摊比例]*0.01) ELSE 0 end
+,[未出货总额]=CASE WHEN  [整单正数订单总额]>0 then  ABS([订单总额])-ABS(([整单累计发货金额]+[K3整单累计退货金额(本位币)])*[分摊比例]*0.01) ELSE 0 end
 
 --,[到期时间]='2022-01-01'
 --,[到期时间]=CASE WHEN  [预计到期时间] IS NOT  NULL AND  [预计到期时间] <= GETDATE() AND [预计到期时间] >'1990-01-01' AND [订单总额]>0 THEN [预计到期时间] ELSE NULL END 
 
 --,[到期金额]=CASE WHEN  [预计到期时间] IS NOT NULL AND   [预计到期时间] <= GETDATE() AND [预计到期时间] >'1990-01-01' AND [订单总额]>0 THEN([整单累计发货金额]-[整单累计退货金额]-[整单累计到款金额])*[分摊比例]*0.01*ISNULL([收款条件分摊比例],100)*0.01 ELSE 0 END
-,[实际已出货应收款合计]=CASE WHEN  [整单正数订单总额] >0 THEN ([整单累计发货金额]-[整单累计退货金额]- [整单累计到款金额] )*[分摊比例]*0.01  ELSE 0 end
+,[实际已出货应收款合计]=CASE WHEN  [整单正数订单总额] >0 THEN ([整单累计发货金额]+[K3整单累计发货金额(本位币)]-[整单累计退货金额]-[K3整单累计退货金额(本位币)]- [整单累计到款金额] )*[分摊比例]*0.01  ELSE 0 end
 ,[项目阶段]= CASE WHEN [项目验收时间]>='1990-01-01' AND [项目验收时间] IS NOT NULL THEN '验收完成'
  WHEN [项目调试时间]>='1990-01-01' AND [项目调试时间] IS NOT NULL THEN '调试完成'
  WHEN  ISNULL([项目进度],'') <> '' THEN [项目进度] WHEN  ISNULL([整单累计发货金额],0) = 0 THEN '未启动'
@@ -351,9 +372,9 @@ WHERE T0.FREDBLUE=0   AND aa1.fid=
 
    
  update [ZRP_YingShouMingXi_yuyubo] SET [未到期金额]=CASE WHEN  ([收款条件] LIKE '货到%'  OR  [收款条件] LIKE '款到发货%'  OR  [收款条件] LIKE '协议付款%') AND [订单总额]>0
- THEN ([整单累计发货金额]-[整单累计退货金额])*[分摊比例]*0.01*[收款条件分摊比例]*0.01 - [收款条件累计核销金额]*[分摊比例]*0.01+[运杂费] 
+ THEN ([整单累计发货金额]-[整单累计退货金额])*[分摊比例]*0.01*[收款条件分摊比例]*0.01 - [收款条件累计核销金额]*[分摊比例]*0.01+[运杂费]+[K3累计发货金额(本位币)]-[K3累计退货金额(本位币)] 
  WHEN [订单总额]>0
- THEN  ([整单正数订单总额]-[整单累计退货金额])*[分摊比例]*0.01*[收款条件分摊比例]*0.01 - [收款条件累计核销金额]*[分摊比例]*0.01 +[运杂费]  ELSE 0 END ;
+ THEN  ([整单正数订单总额]-[整单累计退货金额])*[分摊比例]*0.01*[收款条件分摊比例]*0.01 - [收款条件累计核销金额]*[分摊比例]*0.01 +[运杂费]+[K3累计发货金额(本位币)]-[K3累计退货金额(本位币)]   ELSE 0 END ;
 
  
     UPDATE  [ZRP_YingShouMingXi_yuyubo] SET [预计到期时间]=NULL
@@ -390,7 +411,7 @@ UPDATE [ZRP_YingShouMingXi_yuyubo] SET
  ,[1-2年]=CASE WHEN [账龄月]>=13 AND [账龄月]<=24  THEN  [未到期金额]  ELSE 0 END
  ,[2-3年]=CASE WHEN [账龄月]>=25 AND [账龄月]<=36  THEN   [未到期金额] ELSE 0 END
  ,[4-5年]=CASE WHEN [账龄月]>=37 AND [账龄月]<=60  THEN   [未到期金额] ELSE 0 END
- ,[5年以上]=CASE WHEN [账龄月]> 60  THEN (([整单正数订单总额]-[整单累计退货金额])*[收款条件分摊比例]*0.01 -[收款条件累计核销金额])*[分摊比例]*0.01 +[运杂费] ELSE 0 END
+ ,[5年以上]=CASE WHEN [账龄月]> 60  THEN (([整单正数订单总额]-[整单累计退货金额])*[收款条件分摊比例]*0.01 -[收款条件累计核销金额])*[分摊比例]*0.01 +[运杂费]+[K3累计专票金额(本位币)]-[K3累计普票金额(本位币)] ELSE 0 END
 
  update [ZRP_YingShouMingXi_yuyubo] SET [预计到期时间]=CASE WHEN ([到期时间] IS  not  NULL ) OR ([未到期金额]=0 AND [到期金额]=0)  THEN  NULL   ELSE  [预计到期时间] END 
  ,[未到期金额]=CASE WHEN  [到期时间] IS NOT NULL  THEN 0 ELSE [未到期金额]  END 
@@ -465,6 +486,8 @@ FROM
 		 ) a  
    WHERE A.FID=[ZRP_YingShouMingXi_yuyubo].销售单主键ID  AND [合同类型] IN ('充电桩系统','储能带安装','系统增补','系统施工合同')
 
+
+ 
  --	UPDATE [ZRP_YingShouMingXi_yuyubo]
 	-- SET 订单总额=0,[订单总额(原币)]=0,累计发货金额=0,累计退货金额=0, 累计发货金额 = 0	,累计开票金额= 0,BillingAmount=0
 	--from (
@@ -539,7 +562,15 @@ FROM
       ,[客户编码]
       ,[DaoKuanJinE_YuanBi]
       ,[YingShouHeJi_YuanBi]
-      ,[YunZaFei],[LeiJiTuiHuoJinE_YuanBi])
+      ,[YunZaFei],[LeiJiTuiHuoJinE_YuanBi]
+	  ,[K3FaHuoJinE]
+      ,[K3TuiHuoJinE]
+      ,[K3ZhuanPiaoJinE]
+      ,[K3PuPiaoJinE]
+      ,[K3FaHuoJinEMX]
+      ,[K3TuiHuoJinEMX]
+      ,[K3ZhuanPiaoJinEMX]
+      ,[K3PuPiaoJinEMX])
 
  SELECT [销售单主键ID],[销售员],[SBU],[明细区域],[购货单位],[公司性质],[客户信用] ,[纸质合同号],[项目名称],[订单总额],[签订年份],CONVERT(NVARCHAR(20),[订单日期],23),[收款条件]
   ,[发货日期2]
@@ -554,8 +585,16 @@ FROM
 	,[合同类型] ,[组织ID],[是否集采项目],[天数]
 	 ,[销售单主键ID],[销售员ID],[收款条件主键ID],GETDATE(),0,[1-2年],[2-3年],[3-4年],[4-5年],[5年以上],[结算币别],[汇率],[订单总额(原币)],[责任人],[客户信用额度] ,[客户编码]
 	 ,[累计到款金额(原币)],[应收款合计(原币)],A.运杂费,[累计退货金额(原币)]
+	 ,[K3整单累计发货金额(本位币)]
+      ,[K3整单累计退货金额(本位币)]
+      ,[K3整单累计专票金额(本位币)]
+      ,[K3整单累计普票金额(本位币)]
+      ,[K3累计发货金额(本位币)]
+      ,[K3累计退货金额(本位币)]
+      ,[K3累计专票金额(本位币)]
+      ,[K3累计普票金额(本位币)]
 	 FROM [ZRP_YingShouMingXi_yuyubo] A
-	 WHERE ([整单正数订单总额]-[累计退货金额(原币)])<>[累计到款金额(原币)]
+	 WHERE ([整单正数订单总额]-[累计退货金额(原币)]-[K3整单累计退货金额(本位币)])<>[累计到款金额(原币)]
 	   ORDER BY A.[销售单主键ID],[销售员ID],[收款条件主键ID];
 
 	 update ReceivablesDetailsTable set  F_061=B.F_061, F_054=B.F_054 ,F_055=B.F_055,F_056=B.F_056
@@ -567,28 +606,3 @@ FROM
 	 --WHERE [销售单主键ID] IN (SELECT DISTINCT [销售单主键ID] FROM [ZRP_YingShouMingXi_yuyubo]  WHERE  [整单累计到款金额]=[整单订单总额]-[整单累计退货金额])
 
 END
-GO
-
-
-
---SELECT * FROM ZRP_YingShouMingXi_yuyubo
-
---TRUNCATE TABLE dbo.ReceivablesDetailsTable;
---EXEC PR_YingShouMingXi_yuyubo
-
-
---SELECT  TOP 10 * FROM ReceivablesDetailsTable
-
- --SELECT a.FID,b.FID,a.F_AMOUNT,b.F_MBBA_DECIMAL_UKY FROM T_SAL_ORDER a LEFT JOIN T_SAL_ORDERPLAN b
- --ON a.FID=b.FID WHERE a.F_AMOUNT <F_MBBA_DECIMAL_UKY
- ----and a.F_AMOUNT<0
- --ORDER BY a.FID
-
- --BEGIN TRAN
- --UPDATE T_SAL_ORDER SET F_AMOUNT=F_MBBA_DECIMAL_UKY
- --FROM ( SELECT a.FID,a.F_AMOUNT,b.F_MBBA_DECIMAL_UKY FROM T_SAL_ORDER a LEFT JOIN T_SAL_ORDERPLAN b
- --ON a.FID=b.FID WHERE a.F_AMOUNT <F_MBBA_DECIMAL_UKY) b
- --WHERE T_SAL_ORDER.fid=b.fid
- ------COMMIT
-
-