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

1

Browse Source
This commit is contained in:
liqionghai 2025-08-21 16:54:17 +08:00
parent 838cd44862
commit 64b8abf342
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DDWFHMX.cs
View File

@ -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);

4
HKBaoBiao/回款报表服务器插件.py
View File

@ -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

4
YSZKDZGongNeng_MX/LiteVersionPlugIn2.cs
View File

@ -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对象