From 3de705b4dc38bb251f156692b36d7db3c6288dd6 Mon Sep 17 00:00:00 2001 From: cjy Date: Sat, 3 Aug 2024 12:00:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DS.Module.Core/Constants/MultiLanguageConst.cs | 4 ++-- ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs | 8 ++++---- ds-wms-service/DS.WMS.OpApi/DS.WMS.OpApi.csproj.user | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ds-wms-service/DS.Module.Core/Constants/MultiLanguageConst.cs b/ds-wms-service/DS.Module.Core/Constants/MultiLanguageConst.cs index 734c5390..7d53df9f 100644 --- a/ds-wms-service/DS.Module.Core/Constants/MultiLanguageConst.cs +++ b/ds-wms-service/DS.Module.Core/Constants/MultiLanguageConst.cs @@ -521,9 +521,9 @@ public static class MultiLanguageConst [Description("海运出口信息分提单号已存在")] public const string SeaExportHBLNOExist = "Sea_Export_HBLNO_Exist"; - [Description("截港日期不允许小于开船日期")] + [Description("截港日期不允许大于开船日期")] public const string SeaExportCloseDateLimit = "Sea_Export_CloseDate_Limit"; - [Description("截单日期不允许小于开船日期")] + [Description("截单日期不允许大于开船日期")] public const string SeaExportCloseDocDateLimit = "Sea_Export_CloseDocDate_Limit"; [Description("箱信息不存在")] diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs index 5da78c73..d1e31ca8 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs @@ -437,11 +437,11 @@ public partial class SeaExportService : ISeaExportService //TODO 会计期间不允许小于已结转期间 if (req.CloseDocDate.IsNotNull() && req.ETD.IsNotNull() && req.CloseDocDate > req.ETD) { - return await Task.FromResult(DataResult.Failed("截单日期不允许小于开船日期!", MultiLanguageConst.SeaExportCloseDocDateLimit)); + return await Task.FromResult(DataResult.Failed("截单日期不允许大于开船日期!", MultiLanguageConst.SeaExportCloseDocDateLimit)); } if (req.ClosingDate.IsNotNull() && req.ETD.IsNotNull() && req.ClosingDate > req.ETD) { - return await Task.FromResult(DataResult.Failed("截港日期不允许小于开船日期!", MultiLanguageConst.SeaExportCloseDateLimit)); + return await Task.FromResult(DataResult.Failed("截港日期不允许大于开船日期!", MultiLanguageConst.SeaExportCloseDateLimit)); } var sequence = commonService.GetSequenceNext(); if (!sequence.Succeeded) @@ -524,11 +524,11 @@ public partial class SeaExportService : ISeaExportService //TODO 会计期间不允许小于已结转期间 if (info.CloseDocDate.IsNotNull() && info.CloseDocDate > info.ETD) { - return await Task.FromResult(DataResult.Failed("截单日期不允许小于开船日期!", MultiLanguageConst.SeaExportCloseDocDateLimit)); + return await Task.FromResult(DataResult.Failed("截单日期不允许大于开船日期!", MultiLanguageConst.SeaExportCloseDocDateLimit)); } if (info.ClosingDate.IsNotNull() && info.ClosingDate > info.ETD) { - return await Task.FromResult(DataResult.Failed("截港日期不允许小于开船日期!", MultiLanguageConst.SeaExportCloseDateLimit)); + return await Task.FromResult(DataResult.Failed("截港日期不允许大于开船日期!", MultiLanguageConst.SeaExportCloseDateLimit)); } #region 处理箱型箱量 if (req.CtnInfo.Count > 0) diff --git a/ds-wms-service/DS.WMS.OpApi/DS.WMS.OpApi.csproj.user b/ds-wms-service/DS.WMS.OpApi/DS.WMS.OpApi.csproj.user index da141c5a..99e0fcb6 100644 --- a/ds-wms-service/DS.WMS.OpApi/DS.WMS.OpApi.csproj.user +++ b/ds-wms-service/DS.WMS.OpApi/DS.WMS.OpApi.csproj.user @@ -1,7 +1,7 @@  - E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\Properties\PublishProfiles\FolderProfile.pubxml + D:\Code\DS\ds8-solution-pro\ds-wms-service\DS.WMS.OpApi\Properties\PublishProfiles\FolderProfile.pubxml MvcControllerEmptyScaffolder root/Common/MVC/Controller