This commit is contained in:
余宇波 2025-06-11 14:51:56 +08:00
parent db010d0204
commit 8b13e2506c
2 changed files with 20 additions and 4 deletions

View File

@ -301,7 +301,7 @@ else
var sql_1 = "";
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]
From [ReceivablesDetailsTable] where {wheresql}
,[F_025]*[HuiLv] as F_SJYCHYSKHJ_BWB, [F_024]*[HuiLv] as F_WDQJE_BWB, [F_027]*[HuiLv] F_DQJE_BWB From [ReceivablesDetailsTable] where {wheresql}
Union ALL
(Select
null,null,'',null,null,null,null,null,null,null,SUM(F_010),
@ -317,9 +317,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]) , null, null
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,0 F_036 ,[BiBie] ,[DingDanZongE_YuanBi] ,[DaoKuanJinE_YuanBi] ,[YingShouHeJi_YuanBi] ,[YunZaFei], [LeiJiTuiHuoJinE_YuanBi] from
0 as F_027,0 F_036 ,[BiBie] ,[DingDanZongE_YuanBi] ,[DaoKuanJinE_YuanBi] ,[YingShouHeJi_YuanBi] ,[YunZaFei], [LeiJiTuiHuoJinE_YuanBi]
,[F_025]*[HuiLv] as F_SJYCHYSKHJ_BWB, 0 as F_WDQJE_BWB,0 F_DQJE_BWB from
[ReceivablesDetailsTable]
where {wheresql}
) a )) W Order by W.F_001");
@ -659,6 +661,15 @@ else
//累计退货金额(原币)
this.View.Model.SetValue("FLeiJiTuiHuoJinE_YuanBi", item["LeiJiTuiHuoJinE_YuanBi"], indexi);
//实际已出货应收款合计(本位币)
this.View.Model.SetValue("F_SJYCHYSKHJ_BWB", item["F_SJYCHYSKHJ_BWB"], indexi);
//未到期金额(本位币)
this.View.Model.SetValue("F_WDQJE_BWB", item["F_WDQJE_BWB"], indexi);
//到期金额(本位币)
this.View.Model.SetValue("F_DQJE_BWB", item["F_DQJE_BWB"], indexi);
//【订单总额、累计发货金额、累计退货金额、累计开票金额、累计到款金额、应收款合计、未出货总额、实际已出货应收款合计、】的明细需要去重
if (dicList.ContainsKey(item["销售单主键ID"].ToString() + "-" + item["销售员ID"].ToString()))
{
@ -675,7 +686,7 @@ else
this.View.Model.SetValue("FYingShouHeJi_YuanBi", null, indexi);
this.View.Model.SetValue("FXinYongEDu", null, indexi);
this.View.Model.SetValue("FDingDanZongE_YuanBi", null, indexi);
this.View.Model.SetValue("F_SJYCHYSKHJ_BWB", null, indexi);
}
else
dicList.Add(item["销售单主键ID"].ToString() + "-" + item["销售员ID"].ToString(), 0);

View File

@ -57,6 +57,8 @@ SELECT A.FID [
,[]=ISNULL( (SELECT SUM(B.FBillAllAmount) AS '累计发货金额' 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)
,[]=NULL
--,[]=ISNULL((CASE WHEN SUBSTRING(U.FNUMBER,1,1)= 'W' THEN T. ELSE T. END ),'')
--,[]=T.
@ -65,7 +67,9 @@ SELECT A.FID [
FROM T_SAL_RETURNSTOCK AA WITH(NOLOCK)
INNER JOIN T_SAL_RETURNSTOCKFIN B WITH(NOLOCK) ON AA.FID =B.FID
WHERE AA.FDOCUMENTSTATUS= 'C' AND aa.FSALEORGID = a.FSALEORGID
AND AA.F_contractnumber LIKE CONCAT(A.F_contractnumber, '-%') AND AA.F_contractnumber NOT LIKE CONCAT(A.F_contractnumber, '-%-%') ),0)
AND (( AA.F_contractnumber LIKE CONCAT(A.F_contractnumber, '-%') AND AA.F_contractnumber NOT LIKE CONCAT(A.F_contractnumber, '-%-%') )
OR ( AA.F_contractnumber LIKE CONCAT(A.F_contractnumber, 'HH%') AND AA.F_contractnumber NOT LIKE CONCAT(A.F_contractnumber, 'HH%HH%') ) )
),0)+ISNULL((SELECT SUM(F_returnAmount) FROM T_SAL_ORDERENTRY bb WHERE bb.fid=a.fid ) ,0)
,[] =AD.
,[]=ISNULL(a.F_Amount,0)
@ -74,6 +78,7 @@ SELECT A.FID [
(
SELECT DISTINCT * FROM (
SELECT plan1.FID ,CASE
WHEN X.FNAME LIKE '%ЭÒ鸶¿î%' THEN null
WHEN X.FNAME LIKE '%预付款%' THEN CONVERT(NVARCHAR(20), AA.FAPPROVEDATE, 120)
WHEN X.FNAME LIKE '%货到收款%' THEN DATEADD(DAY, plan1.F_DAY, CK.F_SFSIGNATURETIME)
WHEN X.FNAME LIKE '%货到票到收款%' THEN DATEADD(DAY, plan1.F_DAY,FP.FAPPROVEDATE)