This commit is contained in:
李狗蛋
2025-07-02 10:10:05 +08:00
parent 5088e60df2
commit 4c8304f04f
39 changed files with 437 additions and 1013 deletions

View File

@@ -83,6 +83,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
header.AddChild("InvoicedDebt", new LocaleValue("已开票欠款"), SqlStorageType.SqlDecimal);
header.AddChild("OwedTickets", new LocaleValue("欠票"), SqlStorageType.SqlDecimal);
header.AddChild("IsEnded", new LocaleValue("是否已完结"), SqlStorageType.Sqlvarchar);
header.AddChild("FSalerId", new LocaleValue("销售员"), SqlStorageType.Sqlvarchar);
header.AddChild("Remark", new LocaleValue("备注"), SqlStorageType.Sqlvarchar);
foreach (var item in header.GetChilds())
@@ -133,33 +134,46 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
string sql = string.Format(@"/*dialect*/
--更新MX表中的字段
EXEC UpdateYSDZBMX_GZTH '{0}','{1}','{2}','{3}'
EXEC UpdateYSDZBMX_GZTH '{0}','{1}','{2}','{3}','{4}','{5}'
--更新MX表中的发票金额
EXEC GXFPJEYSDZDMX_GZTH
--更新JY表
EXEC UpdateYSDZBJY_GZTH
", FSDate, fDate, ZZFID, fClient,XSYFID,ZZHTH);
SELECT
ROW_NUMBER() OVER (ORDER BY [FID]) AS FIDENTITYID,
*
INTO {4}
FROM YingShouZhanKuanJY_GZTH
WHERE 1=1
", FSDate, fDate, ZZFID, fClient, tableName);
if (!string.IsNullOrEmpty(XSYFID))
{
sql += string.Format(@"AND FSalerId = '{0}'",XSYFID);
}
sql += string.Format(@"
INSERT INTO YingShouZhanKuanJY_GZTH(Number,OrderAmount,ShipmentsAmount,FBillAllAmount,
FALLAmountFor,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets)
Select
'合计',
SUM(OrderAmount) as OrderAmount,
SUM(ShipmentsAmount) as ShipmentsAmount,
SUM(FBillAllAmount) as FBillAllAmount,
SUM(FALLAMOUNTFOR) as FALLAMOUNTFOR,
SUM(PaymentAmount) as PaymentAmount,
SUM(ShippedDebt) as ShippedDebt,
SUM(InvoicedDebt) as InvoicedDebt,
SUM(OwedTickets) as OwedTickets
From YingShouZhanKuanJY_GZTH
where 1=1
");
if (fGROUP == "2")
{
sql += string.Format(@"AND IsEnded = '未完结'");
}
if (!string.IsNullOrEmpty(ZZHTH))
sql += string.Format(@"
SELECT
ROW_NUMBER() OVER (ORDER BY [FID]) AS FIDENTITYID,
*
INTO {0}
FROM YingShouZhanKuanJY_GZTH
WHERE 1=1
",tableName);
if (fGROUP == "2")
{
sql += string.Format(@"AND ContractNumber = '{0}'", ZZHTH);
sql += string.Format(@"AND IsEnded = '未完结'");
}
DBUtils.Execute(this.Context, sql);
}
@@ -219,20 +233,21 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
}
//设计报表合计列
public override List<SummaryField> GetSummaryColumnInfo(IRptParams filter)
{
//public override List<SummaryField> GetSummaryColumnInfo(IRptParams filter)
//{
var result = base.GetSummaryColumnInfo(filter);
result.Add(new SummaryField("OrderAmount", BOSEnums.Enu_SummaryType.SUM));
result.Add(new SummaryField("ShipmentsAmount", BOSEnums.Enu_SummaryType.SUM));
result.Add(new SummaryField("FBillAllAmount", BOSEnums.Enu_SummaryType.SUM));
result.Add(new SummaryField("PPFALLAmountFor", BOSEnums.Enu_SummaryType.SUM));
result.Add(new SummaryField("ZPFALLAmountFor", BOSEnums.Enu_SummaryType.SUM));
result.Add(new SummaryField("FALLAMOUNTFOR", BOSEnums.Enu_SummaryType.SUM));
result.Add(new SummaryField("PaymentAmount", BOSEnums.Enu_SummaryType.SUM));
result.Add(new SummaryField("ShippedDebt", BOSEnums.Enu_SummaryType.SUM));
result.Add(new SummaryField("InvoicedDebt", BOSEnums.Enu_SummaryType.SUM));
return result;
}
// var result = base.GetSummaryColumnInfo(filter);
// result.Add(new SummaryField("OrderAmount", BOSEnums.Enu_SummaryType.SUM));
// result.Add(new SummaryField("ShipmentsAmount", BOSEnums.Enu_SummaryType.SUM));
// result.Add(new SummaryField("FBillAllAmount", BOSEnums.Enu_SummaryType.SUM));
// result.Add(new SummaryField("PPFALLAmountFor", BOSEnums.Enu_SummaryType.SUM));
// result.Add(new SummaryField("ZPFALLAmountFor", BOSEnums.Enu_SummaryType.SUM));
// result.Add(new SummaryField("FALLAMOUNTFOR", BOSEnums.Enu_SummaryType.SUM));
// result.Add(new SummaryField("PaymentAmount", BOSEnums.Enu_SummaryType.SUM));
// result.Add(new SummaryField("ShippedDebt", BOSEnums.Enu_SummaryType.SUM));
// result.Add(new SummaryField("InvoicedDebt", BOSEnums.Enu_SummaryType.SUM));
// result.Add(new SummaryField("OwedTickets", BOSEnums.Enu_SummaryType.SUM));
// return result;
//}
}
}