11

Merge branch 'master' of http://8.130.121.29:3000/Develop/Piolot_RepotForm_PeiHao
2025-08-28 19:20:32 +08:00 · 2025-08-28 19:20:11 +08:00 · 2025-08-28 13:26:57 +08:00 · 2025-08-28 13:26:51 +08:00
4 changed files with 33 additions and 20 deletions
--- a/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs
+++ b/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs
@@ -333,7 +333,7 @@ else
 	        ,[K3FaHuoJinEMX]
 	        ,[K3TuiHuoJinEMX]
 	        ,[K3ZhuanPiaoJinEMX]
-	        ,[K3PuPiaoJinEMX] 
+	        ,[K3PuPiaoJinEMX] ,[F_019]*HuiLv AS F_YunikaiPiao,[F_019]*HuiLv+K3PuPiaoJinEMX+K3ZhuanPiaoJinEMX AS  F_LeiJiKaiPiaoJinE_Sum
            from [ReceivablesDetailsTable] where {wheresql}
            Union ALL
            (Select 
@@ -358,10 +358,10 @@ else
 		    ,sum([K3FaHuoJinEMX]) AS [K3FaHuoJinEMX]
 		    ,sum([K3TuiHuoJinEMX]) AS [K3TuiHuoJinEMX]
 		    ,sum([K3ZhuanPiaoJinEMX]) AS [K3ZhuanPiaoJinEMX]
-		    ,sum([K3PuPiaoJinEMX]) AS [K3PuPiaoJinEMX]
+		    ,sum([K3PuPiaoJinEMX]) AS [K3PuPiaoJinEMX],SUM(a.F_019*[HuiLv]) AS F_YunikaiPiao,SUM([F_019]*HuiLv+K3PuPiaoJinEMX+K3ZhuanPiaoJinEMX) AS  F_LeiJiKaiPiaoJinE_Sum
            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] 
+			(	select   [销售单主键ID],[销售员ID],[F_010],F_017,F_018,F_019 AS 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] , sum([YunZaFei]) as [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  [数据截止时间]
            ,[K3FaHuoJinE]
 			,[K3TuiHuoJinE]
@@ -370,12 +370,12 @@ else
 			,[K3FaHuoJinEMX]
 			,[K3TuiHuoJinEMX]
 			,[K3ZhuanPiaoJinEMX]
-			,[K3PuPiaoJinEMX]       
+			,[K3PuPiaoJinEMX]       ,[HuiLv]
        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]
+		  [BiBie]   ,[DingDanZongE_YuanBi]   ,[DaoKuanJinE_YuanBi]   ,[YingShouHeJi_YuanBi], [LeiJiTuiHuoJinE_YuanBi] ,[HuiLv]
            ,[K3FaHuoJinE]
 			,[K3TuiHuoJinE]
 			,[K3ZhuanPiaoJinE]
@@ -760,11 +760,21 @@ else
                    this.View.Model.SetValue("F_LeiJiFaHuoJinE", decimal.Parse(item["F_017"]?.ToString()) + decimal.Parse(item["K3FaHuoJinEMX"]?.ToString()), indexi);
                    this.View.Model.SetValue("F_LeIjITuiHuoJinE", decimal.Parse(item["F_018"]?.ToString()) + decimal.Parse(item["K3TuiHuoJinEMX"]?.ToString()), indexi);

-                    var fapiao = decimal.Parse(item["F_019"]?.ToString()) * decimal.Parse(item["HuiLv"]?.ToString());
-                    
-                    this.View.Model.SetValue("F_LeiJiKaiPiaoJinE_Sum_YuanBi", fapiao, indexi);
-                    this.View.Model.SetValue("F_YunikaiPiao", fapiao, indexi);
-                    this.View.Model.SetValue("F_LeiJiKaiPiaoJinE_Sum", fapiao + decimal.Parse(item["K3PuPiaoJinEMX"]?.ToString()) + decimal.Parse(item["K3ZhuanPiaoJinEMX"]?.ToString()), indexi);
+                    //云星空累计开票金额(原币)
+                    var fapiao = decimal.Parse(item["F_019"]?.ToString()) ;
+                    //汇率
+                    var huiLv = decimal.Parse(item["HuiLv"]?.ToString());
+
+                    //累计开票金额(原币)
+                    this.View.Model.SetValue("F_LeiJiKaiPiaoJinE_Sum_YuanBi", fapiao + decimal.Parse(item["K3PuPiaoJinEMX"]?.ToString())/ huiLv + decimal.Parse(item["K3ZhuanPiaoJinEMX"]?.ToString())/ huiLv, indexi);
+                     
+                     //云星空累计开票金额(本位币)
+                    this.View.Model.SetValue("F_YunikaiPiao", decimal.Parse(item["F_YunikaiPiao"]?.ToString()), indexi);
+                   
+                   
+
+                   //累计开票金额(本位币)
+                    this.View.Model.SetValue("F_LeiJiKaiPiaoJinE_Sum", decimal.Parse(item["F_LeiJiKaiPiaoJinE_Sum"]?.ToString()), indexi);


                    if (item["F_038"]!=null)
--- a/非C#代码文件/应收明细SQL.sql
+++ b/非C#代码文件/应收明细SQL.sql
@@ -262,7 +262,7 @@ GROUP BY  F_PaperNumber, FSALEORGID
 WHERE ( ( A.FSALEORGID = 100302
 AND C.FNAME  NOT IN ('<EFBFBD><EFBFBD>ŵ<EFBFBD>Ƽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ۣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>޹<EFBFBD>˾','<EFBFBD>人<EFBFBD><EFBFBD>ŵ<EFBFBD>Ƽ<EFBFBD><EFBFBD><EFBFBD>չ<EFBFBD><EFBFBD><EFBFBD>޹<EFBFBD>˾','<EFBFBD>ͻ<EFBFBD>-<2D><><EFBFBD><EFBFBD>ʹ<EFBFBD><CAB9>'
 ,'<EFBFBD>麣<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޹<EFBFBD>˾','<EFBFBD>麣<EFBFBD><EFBFBD>ŵ<EFBFBD><EFBFBD>Դ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޹<EFBFBD>˾','<EFBFBD>㶫̼<EFBFBD><EFBFBD><EFBFBD>ǿؿƼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>޹<EFBFBD>˾','<EFBFBD>㶫ŵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ܿƼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>޹<EFBFBD>˾')                                       
- ) OR   A.FSALEORGID != 100302)    AND A.FDocumentStatus = 'C'                   
+ ) OR   A.FSALEORGID != 100302)    AND A.FDocumentStatus = 'C'  AND Cccc.F_correlation <> '1'
 --AND  EXISTS(SELECT 1 FROM T_SAL_ORDERENTRY bb WHERE bb.fid=a.fid  ) 
 ) A
   --where [<EFBFBD><EFBFBD><EFBFBD>۵<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ID]= 102802
--- a/非C#代码文件/收款单核销流水存储过程.sql
+++ b/非C#代码文件/收款单核销流水存储过程.sql
@@ -213,7 +213,7 @@ ORDER BY FDATE
 		WHERE FVERIFYSEQ IN (SELECT FVERIFYSEQ FROM T_AR_RECMacthLog a 
 		LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID 
 		WHERE  b.FSRCBILLNO=@FBILLNO AND b.FSOURCETYPE='36cf265bd8c3452194ed9c83ec5e73d2' AND FVERIFYDATE>=@BeginDATE		
-		)  AND FVERIFYSEQ NOT IN (100135,100138,100042)
+		)  AND FVERIFYSEQ NOT IN (100135,100138,100042,100141,100139)
 --SELECT * FROM #temp2
    --SELECT @amount= SUM(FCURWRITTENOFFAMOUNT) FROM #temp2 WHERE FBILLFORMID !='AR_RECEIVEBILL'
 	SELECT @fid2=FSRCBILLID,@fid3=FVERIFYSEQ FROM #temp2 WHERE FBILLFORMID ='AR_receivable'
@@ -247,7 +247,7 @@ ORDER BY FDATE
 			   ,[ShouKuanFDate]
 			   ,[BenCiHeXiao]
 			   ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType],Remark)
-			   ( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,d.FVERIFYDATE,FCURWRITTENOFFAMOUNTFOR*FALLAMOUNTFOR_D,@FSALEORGID,'Ӧ<EFBFBD>պ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><EFBFBD>',@fid3
+			   ( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,d.FVERIFYDATE,FCURWRITTENOFFAMOUNTFOR*FALLAMOUNTFOR_D,@FSALEORGID,'Ӧ<EFBFBD>պ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><EFBFBD>',d.FVERIFYSEQ
 			   ,dd.FEXCHANGERATE,dd.FSettleCurrId,dd.FLOCALCURRID,0  ,@remark
 			   FROM T_SAL_ORDER a
 			     LEFT JOIN T_SAL_ORDERFIN dd ON a.FID=dd.FID			 
@@ -274,7 +274,7 @@ ORDER BY FDATE
 			   ,[ShouKuanFDate]
 			   ,[BenCiHeXiao]
 			   ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType],Remark)
-			   ( SELECT 0,'','',@ShouKuanFID,@FBILLNO,d.FVERIFYDATE,FCURWRITTENOFFAMOUNTFOR,@FSALEORGID,'Ӧ<EFBFBD>պ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><EFBFBD><EFBFBD>ڳ<EFBFBD>Ӧ<EFBFBD>յ<EFBFBD>',@fid3
+			   ( SELECT 0,'','',@ShouKuanFID,@FBILLNO,d.FVERIFYDATE,FCURWRITTENOFFAMOUNTFOR,@FSALEORGID,'Ӧ<EFBFBD>պ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><EFBFBD><EFBFBD>ڳ<EFBFBD>Ӧ<EFBFBD>յ<EFBFBD>',FVERIFYSEQ
 			   ,FEXCHANGERATE,FCURRENCYID,FLOCALCURRID,0  ,@remark
 			   FROM    #temp2 d 
 			     WHERE  d.FBILLFORMID='AR_RECEIVEBILL'  )
@@ -405,7 +405,7 @@ WHERE
 (SELECT DISTINCT FVERIFYSEQ  from T_AR_RECMacthLog oo LEFT JOIN T_AR_RECMACTHLOGENTRY  ll ON  oo.FID=ll.FID
  LEFT JOIN T_BAS_BILLTYPE c ON ll.FSOURCETYPE=c.FBILLTYPEID 
  WHERE FBILLFORMID='AR_RECEIVEBILL' 
-  ) AND   FVERIFYSEQ NOT IN (100135,100138,100042)
+  ) AND   FVERIFYSEQ NOT IN (100135,100138,100042,100140)  AND FVERIFYSEQ NOT IN (100135,100138,100042,100141,100139)
 ORDER BY a.FVERIFYSEQ;

             INSERT INTO [dbo].[ZZZ_HeXiaoBook]
--- a/非C#代码文件/重置收款计划的已核销金额字段.sql
+++ b/非C#代码文件/重置收款计划的已核销金额字段.sql
@@ -81,16 +81,19 @@ BEGIN
        -- <20><><EFBFBD><EFBFBD><EFBFBD>տ<EFBFBD><D5BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
        IF (@rowId != @fid)
        BEGIN
-            SELECT @rowId = @fid,
-                   @amount = @F_AMOUNT - @F_EXPENSES;
+            SELECT @rowId = @fid,@amount = @F_AMOUNT;
+                   --@amount = @F_AMOUNT - @F_EXPENSES;
+
        END;
 		PRINT  @amount;
        IF (@amount >= @FRecAdvanceAmount and @FRecAdvanceAmount>0)
        BEGIN
+		    DECLARE @tempF_EXPENSES DECIMAL(18,2)=0;---<EFBFBD><EFBFBD>ʱ<EFBFBD>˷ѱ<EFBFBD><EFBFBD><EFBFBD>
+			
            UPDATE T_SAL_ORDERPLAN
-            SET F_MBBA_DECIMAL_UKY = @FRecAdvanceAmount
+            SET F_MBBA_DECIMAL_UKY = @FRecAdvanceAmount+@F_EXPENSES*FRECADVANCERATE*0.01,@tempF_EXPENSES=@F_EXPENSES*FRECADVANCERATE*0.01
            WHERE FENTRYID = @wfid;
-            SELECT @amount = @amount - @FRecAdvanceAmount;
+            SELECT @amount = @amount - @FRecAdvanceAmount-@tempF_EXPENSES;
        END;
        ELSE
        BEGIN
Author	SHA1	Message	Date
yuyubo	883052c749	11	2025-08-28 19:20:32 +08:00
yuyubo	c665e229b5	Merge branch 'master' of http://8.130.121.29:3000/Develop/Piolot_RepotForm_PeiHao	2025-08-28 19:20:11 +08:00
yuyubo	031ca9c828	Merge branch 'master' of http://8.130.121.29:3000/Develop/Piolot_RepotForm_PeiHao	2025-08-28 13:26:57 +08:00
yuyubo	2e7aa3e2be	1	2025-08-28 13:26:51 +08:00