Develop/Piolot_RepotForm_PeiHao
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://8.130.121.29:3000/Develop/Piolot_RepotForm_PeiHao

Browse Source
This commit is contained in:
liqionghai
2025-09-03 09:53:48 +08:00
parent 3308d39707 495a12764c
commit e656de6ad1
9 changed files with 603 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs
View File

@@ -3,6 +3,7 @@ using Kingdee.BOS.Core.CommonFilter;
using Kingdee.BOS.Core.DynamicForm;
using Kingdee.BOS.Core.DynamicForm.PlugIn;
using Kingdee.BOS.Core.DynamicForm.PlugIn.Args;
using Kingdee.BOS.Log;
using Kingdee.BOS.Orm.DataEntity;
using Kingdee.BOS.Util;
using Kingdee.K3.FIN.Core;
@@ -333,7 +334,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 +359,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 +371,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]
@@ -552,6 +553,7 @@ else
//Loghelp.Log("合计");
//Loghelp.Log(sql_1);
var sql_List1 = DBUtils.ExecuteDynamicObject(Context, sql_1);
//Logger.Error("应收表SQL", sql_1, new Exception());
int indexi = 0;
@@ -760,11 +762,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)

14
Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs
View File

@@ -223,9 +223,7 @@ WHERE
(D.FNUMBER IN ( 'P', 'E', 'C', 'S','B' ))
AND (B.F_SPECIALOFFER = '1' OR B2.FTaxPrice*fin.FExchangeRate < B.F_SettlementP)
AND B.F_YKQC_CHECKBOX_QTR != '1'
AND A.FDOCUMENTSTATUS = 'C'
AND A.FBUSINESSTYPE = 'NORMAL'
AND A.FDOCUMENTSTATUS = 'C'
AND B.FQTY >= 0
AND A.FMANUALCLOSE = '0'
AND A.FMANUALCLOSE <> '1'
@@ -319,11 +317,9 @@ FROM T_SAL_ORDERENTRY B --销售订单明细表
ON G.FMATERIALID = B.FMATERIALID
WHERE
(D.FNUMBER IN ('CS','CW' ))
AND B.F_SPECIALOFFER = '1'
AND ( B.F_SPECIALOFFER = '1' or ABS(B2.FAllAmount_LC)< ABS(B.F_SettlementP*B.FQTY) )
AND B.F_YKQC_CHECKBOX_QTR != '1'
AND A.FDOCUMENTSTATUS = 'C'
AND A.FBUSINESSTYPE = 'NORMAL'
AND B.FQTY >= 0
AND A.FMANUALCLOSE = '0'
AND A.FMANUALCLOSE <> '1'
@@ -380,9 +376,7 @@ WHERE
--AND B.F_SPECIALOFFER = '1'
--AND B.F_YKQC_CHECKBOX_QTR != '1'
AND (A.F_SpecialContracts = '是' OR a.F_GROSSMARGIN1='<35%') and (a.F_CancelSpecialContracts !='是' or a.F_CancelSpecialContracts is null )
AND A.FDOCUMENTSTATUS = 'C'
AND A.FBUSINESSTYPE = 'NORMAL'
AND A.FDOCUMENTSTATUS = 'C'
AND B.FQTY >= 0
AND A.FMANUALCLOSE = '0'
AND A.FMANUALCLOSE <> '1'
@@ -509,7 +503,7 @@ FROM #PLChongDianZhuangHeTong ;");
END AS 'OrderAllAmount', --订单总额
CASE
WHEN ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY a.FID,AAA.TableName,b.FENTRYID) = 1 THEN
C.FBILLALLAMOUNT_LC - ISNULL(ABS(B3.FBillAllAmount_LC), 0) - ISNULL(H6.FALLAMOUNT_LC, 0)
C.FBILLALLAMOUNT_LC - ISNULL(H6.FALLAMOUNT_LC, 0)
ELSE
NULL
END AS 'NotShipmentsAmount', --未发货金额