11
This commit is contained in:
@@ -315,10 +315,10 @@ else
|
||||
FROM ( SELECT DISTINCT [销售单主键ID],hh.收款条件主键ID,F_036
|
||||
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
|
||||
, null, null, null, null, null,'',1 [HuiLv],SUM([DingDanZongE_YuanBi]),'' [ZeRenRen],0 [XinYongEDu],'' [客户编码],SUM([DaoKuanJinE_YuanBi]) ,SUM([YingShouHeJi_YuanBi]),SUM([YunZaFei]),SUM([LeiJiTuiHuoJinE_YuanBi])
|
||||
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 from
|
||||
0 as F_027,0 F_036 ,[BiBie] ,[DingDanZongE_YuanBi] ,[DaoKuanJinE_YuanBi] ,[YingShouHeJi_YuanBi] ,[YunZaFei], [LeiJiTuiHuoJinE_YuanBi] from
|
||||
[ReceivablesDetailsTable]
|
||||
where {wheresql}
|
||||
) a )) W Order by W.F_001");
|
||||
@@ -639,6 +639,24 @@ else
|
||||
this.View.Model.SetValue("F_067", item["F_067"], indexi);
|
||||
//68
|
||||
this.View.Model.SetValue("F_068", item["F_068"], indexi);
|
||||
//结算币别
|
||||
this.View.Model.SetValue("FBiBie", item["BiBie"], indexi);
|
||||
//汇率
|
||||
this.View.Model.SetValue("FHuiLv", item["HuiLv"], indexi);
|
||||
//订单总额(原币)
|
||||
this.View.Model.SetValue("FDingDanZongE_YuanBi", item["DingDanZongE_YuanBi"], indexi);
|
||||
//责任人
|
||||
this.View.Model.SetValue("FZeRenRen", item["ZeRenRen"], indexi);
|
||||
//客户信用额度
|
||||
this.View.Model.SetValue("FXinYongEDu", item["XinYongEDu"], indexi);
|
||||
//累计到款金额(原币)
|
||||
this.View.Model.SetValue("FDaoKuanJinE_YuanBi", item["DaoKuanJinE_YuanBi"], indexi);
|
||||
//应收款合计(原币)
|
||||
this.View.Model.SetValue("FYingShouHeJi_YuanBi", item["YingShouHeJi_YuanBi"], indexi);
|
||||
//运杂费
|
||||
this.View.Model.SetValue("FYunZaFei", item["YunZaFei"], indexi);
|
||||
//累计退货金额(原币)
|
||||
this.View.Model.SetValue("FLeiJiTuiHuoJinE_YuanBi", item["LeiJiTuiHuoJinE_YuanBi"], indexi);
|
||||
|
||||
//【订单总额、累计发货金额、累计退货金额、累计开票金额、累计到款金额、应收款合计、未出货总额、实际已出货应收款合计、】的明细需要去重
|
||||
if (dicList.ContainsKey(item["销售单主键ID"].ToString() + "-" + item["销售员ID"].ToString()))
|
||||
@@ -651,7 +669,12 @@ else
|
||||
this.View.Model.SetValue("F_021", null, indexi);
|
||||
this.View.Model.SetValue("F_022", null, indexi);
|
||||
this.View.Model.SetValue("F_025", null, indexi);
|
||||
|
||||
this.View.Model.SetValue("FLeiJiTuiHuoJinE_YuanBi", null, indexi);
|
||||
this.View.Model.SetValue("FDaoKuanJinE_YuanBi", null, indexi);
|
||||
this.View.Model.SetValue("FYingShouHeJi_YuanBi", null, indexi);
|
||||
this.View.Model.SetValue("FXinYongEDu", null, indexi);
|
||||
this.View.Model.SetValue("FDingDanZongE_YuanBi", null, indexi);
|
||||
|
||||
}
|
||||
else
|
||||
dicList.Add(item["销售单主键ID"].ToString() + "-" + item["销售员ID"].ToString(), 0);
|
||||
|
||||
Reference in New Issue
Block a user