diff --git a/DDWFHMX.cs b/DDWFHMX.cs index d14cc41..90d6ba8 100644 --- a/DDWFHMX.cs +++ b/DDWFHMX.cs @@ -73,6 +73,7 @@ namespace GZ_LTHReportForms.ReporyDDWFH header.AddChild("含税单价", new LocaleValue("含税单价"), SqlStorageType.SqlDecimal); header.AddChild("折扣率", new LocaleValue("折扣率"), SqlStorageType.SqlDecimal); header.AddChild("价税合计", new LocaleValue("价税合计"), SqlStorageType.SqlDecimal); + header.AddChild("整单价税合计", new LocaleValue("整单价税合计"), SqlStorageType.SqlDecimal); header.AddChild("已发货数量", new LocaleValue("已发货数量"), SqlStorageType.SqlDecimal); header.AddChild("已发货金额", new LocaleValue("已发货金额"), SqlStorageType.SqlDecimal); header.AddChild("未发货数量", new LocaleValue("未发货数量"), SqlStorageType.SqlDecimal); diff --git a/HKBaoBiao/回款报表服务器插件.py b/HKBaoBiao/回款报表服务器插件.py index 9f65b91..ef07bc6 100644 --- a/HKBaoBiao/回款报表服务器插件.py +++ b/HKBaoBiao/回款报表服务器插件.py @@ -346,6 +346,10 @@ def BuilderReportSqlAndTempTable(Filter,tableName): FROM (SELECT DISTINCT ACO22.,ACO22.ϸ,ACO22. FROM ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO22 ) b WHERE Ա=b. + /*Ա'ӦտרС'ʱSBUϸ'ӦտרС'*/ + UPDATE #TEMP3 SET SBU=Ա,[ϸ]=Ա + WHERE Ա='ӦտרС' + /*̯β*/ UPDATE T1 SET ̯ = ISNULL(T1.̯,0)+(ISNULL(T1.,0)-ISNULL(T2.̯,0)) FROM #TEMP3 T1 INNER JOIN(SELECT ShouKuanFid,SUM(ISNULL(̯,0)) ̯ FROM #TEMP3 GROUP BY ShouKuanFid) T2 ON T1.ShouKuanFid = T2.ShouKuanFid diff --git a/YSZKDZGongNeng_MX/LiteVersionPlugIn2.cs b/YSZKDZGongNeng_MX/LiteVersionPlugIn2.cs index 8093665..129f005 100644 --- a/YSZKDZGongNeng_MX/LiteVersionPlugIn2.cs +++ b/YSZKDZGongNeng_MX/LiteVersionPlugIn2.cs @@ -354,9 +354,9 @@ namespace Pilot.Report.Exploitation.AccountsReceivable n++; //根据订单号分组合并单元格 - if(list[i]["CONTRACTNUMBER"].ToString() != GroupCONTRACTNUMBER || i == list.Count-2) + if(list[i]["CONTRACTNUMBER"].ToString() != GroupCONTRACTNUMBER || i == list.Count-3) { - int k = (i == list.Count - 2 && list[i]["CONTRACTNUMBER"].ToString() == GroupCONTRACTNUMBER) ? 0 : 1; + int k = (i == list.Count - 3 && list[i]["CONTRACTNUMBER"].ToString() == GroupCONTRACTNUMBER) ? 0 : 1; if (GroupCount > 1 || k == 0) { // 创建CellRangeAddress对象