From 3e885b108940d1852e8a21f3682c3f1fee3ac0ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=94=A6=E9=BA=9F=20=E7=8E=8B?= <2452821485@qq.com>
Date: Thu, 15 May 2025 18:19:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8A=A5=E9=80=81=E6=96=87?=
=?UTF-8?q?=E4=BB=B6=E5=BC=80=E5=A7=8B=E7=BC=96=E5=8F=B7=E5=B1=9E=E6=80=A7?=
=?UTF-8?q?=E5=8F=8A=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Framework/YLErp.Core/Configuration/Abstract/IErpConfig.cs | 4 ++++
Framework/YLErp.Core/Configuration/ProjectConfig.cs | 5 +++++
Framework/YLErp.Core/Configuration/ProjectSettings.cs | 2 ++
YLErpDAL/Modules/AppModule/AppUpgrader.cs | 1 +
.../SuperviseReportModule/SAC/Service/ReportService.cs | 4 ++++
5 files changed, 16 insertions(+)
diff --git a/Framework/YLErp.Core/Configuration/Abstract/IErpConfig.cs b/Framework/YLErp.Core/Configuration/Abstract/IErpConfig.cs
index 0ff29b71..be6c8365 100644
--- a/Framework/YLErp.Core/Configuration/Abstract/IErpConfig.cs
+++ b/Framework/YLErp.Core/Configuration/Abstract/IErpConfig.cs
@@ -695,5 +695,9 @@ namespace YLErp.Configuration
/// 衡泰内证账号
///
public string HTAccount { get; }
+ ///
+ /// 报送文件开始编号
+ ///
+ int ReportFileBeginNumber { get; }
}
}
\ No newline at end of file
diff --git a/Framework/YLErp.Core/Configuration/ProjectConfig.cs b/Framework/YLErp.Core/Configuration/ProjectConfig.cs
index 79d541fe..5c0d3e51 100644
--- a/Framework/YLErp.Core/Configuration/ProjectConfig.cs
+++ b/Framework/YLErp.Core/Configuration/ProjectConfig.cs
@@ -140,6 +140,11 @@ namespace YLErp.Configuration
///
public int UploadFileSizeLimit => ErpElement.UploadFileSizeLimit;
+ ///
+ /// 报送文件开始编号
+ ///
+ public int ReportFileBeginNumber => ErpElement.ReportFileBeginNumber;
+
#region-----is-----
///
diff --git a/Framework/YLErp.Core/Configuration/ProjectSettings.cs b/Framework/YLErp.Core/Configuration/ProjectSettings.cs
index c11323a1..a541c391 100644
--- a/Framework/YLErp.Core/Configuration/ProjectSettings.cs
+++ b/Framework/YLErp.Core/Configuration/ProjectSettings.cs
@@ -813,6 +813,8 @@ namespace YLErp
/// 衡泰内证账号
///
public string HTAccount { get; set; } = "";
+
+ public int ReportFileBeginNumber { get; set; } = 0;
}
}
}
\ No newline at end of file
diff --git a/YLErpDAL/Modules/AppModule/AppUpgrader.cs b/YLErpDAL/Modules/AppModule/AppUpgrader.cs
index 4617f13f..b6fea8ad 100644
--- a/YLErpDAL/Modules/AppModule/AppUpgrader.cs
+++ b/YLErpDAL/Modules/AppModule/AppUpgrader.cs
@@ -303,6 +303,7 @@ namespace YLErp.Modules.AppModule
// 5.4.1
//-----------------------------------------------
configService.AddDataIfNotExists("ProjectConfig", "Erp.IsAutoSealAfterGeneratedBook", "false", "bool", "确认书生成时是否自动用印(IsAutoSealAndUploadFiles勾选时生效)");
+ configService.AddDataIfNotExists("ProjectConfig", "Erp.ReportFileBeginNumber", "0", "int", "报送文件开始编号");
//-----------------------------------------------
// 删除不再使用的
//-----------------------------------------------
diff --git a/YLErpDAL/Modules/SuperviseReportModule/SAC/Service/ReportService.cs b/YLErpDAL/Modules/SuperviseReportModule/SAC/Service/ReportService.cs
index eee1e5ed..a49bbeaf 100644
--- a/YLErpDAL/Modules/SuperviseReportModule/SAC/Service/ReportService.cs
+++ b/YLErpDAL/Modules/SuperviseReportModule/SAC/Service/ReportService.cs
@@ -262,6 +262,10 @@ namespace YLErp.Modules.SuperviseReportModule.SAC.Service
fileId = Regex.Match(fileId, @"\d{4}$").Value;
index = int.Parse(fileId) + 1;
}
+ if (index <= PS.Config.ReportFileBeginNumber)
+ {
+ index += PS.Config.ReportFileBeginNumber;
+ }
return index;
}