Jaymr/zszq-trs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(swap): 删除确认书/结算报告厂商定制死分支——国联专属分支Company恒定,24个厂商确认书编号生成器+批量开关收敛国联直调(瑞达/海通/格林大华批量方法连带),结算报告模板与HasExtendVol同款收敛；保留WCZD公开方法(插件接口ITradeDocGeneratorContext成员,防外部DLL ABI)；顺手修正GenerateGuolianContractNo存量错注释(国贸→国联)。-1214行,Release/Debug/UnitTestProject构建0错误

Browse Source
This commit is contained in:
hjhan
2026-08-22 08:11:43 +08:00
parent 7b65ec0979
commit 7ac219ad0f
4 changed files with 8 additions and 1222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YLErpDAL/Modules/ReportModule/SettlementReportModule/SettlementReportService.cs
+3 -18
View File
@@ -842,25 +842,10 @@ namespace YLErp.Modules.ReportModule
bool isShowMargin = false;
var sourcePath = OtcAppContext.MapPath("~/App_Docs/导出模板");
string sourceFileName;
switch (PS.Config.Company)
sourceFileName = Path.Combine(sourcePath, $"结算报告模板_{PS.Config.Company}.xlsx");
if (!File.Exists(sourceFileName))
{
case CompanyEnum.国泰君安:
//isShowMargin = new TradeMarketReportConfigureService(UserInfo).IsShowMarginByTradeMarketReportConfigure(report.client.id);
sourceFileName = Path.Combine(sourcePath, isShowMargin ? "结算报告模板_国君_含预付金.xlsx" : "结算报告模板_国君.xlsx");
break;
case CompanyEnum.弘业:
sourceFileName = Path.Combine(sourcePath, "结算报告模板_弘业.xlsx");
break;
case CompanyEnum.润和:
sourceFileName = Path.Combine(sourcePath, "结算报告模板_东证.xlsx");
break;
default:
sourceFileName = Path.Combine(sourcePath, $"结算报告模板_{PS.Config.Company}.xlsx");
if (!File.Exists(sourceFileName))
{
sourceFileName = Path.Combine(sourcePath, "结算报告模板.xlsx");
}
break;
sourceFileName = Path.Combine(sourcePath, "结算报告模板.xlsx");
}
if (PS.Config.ErpElement.ForwardTradePriceModel == Configuration.Enums.ForwardTradePriceModel.STANDARD)
{