diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index b6a9dac7..767b54c6 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -3592,8 +3592,8 @@ namespace Myshipping.Application } catch { } } - - if (App.Configuration["RunType"] is not CommonConst.RUN_TYPE_DJY or CommonConst.RUN_TYPE_CUST) + // 以后需要把RUN_TYPE_CUST 、 RUN_TYPE_NORMAL放开 + if (App.Configuration["RunType"] is not CommonConst.RUN_TYPE_CUST or CommonConst.RUN_TYPE_DJY or CommonConst.RUN_TYPE_NORMAL) { await SendLetterYard(input.BookingId); } @@ -9679,7 +9679,8 @@ namespace Myshipping.Application [NonAction] public async Task SendBookingOrder(long[] ids) { - if (App.Configuration["RunType"] is CommonConst.RUN_TYPE_CUST or CommonConst.RUN_TYPE_DJY) + // 以后需要把RUN_TYPE_CUST 、 RUN_TYPE_NORMAL放开 + if (App.Configuration["RunType"] is CommonConst.RUN_TYPE_CUST or CommonConst.RUN_TYPE_DJY or CommonConst.RUN_TYPE_NORMAL) { return null; } diff --git a/Myshipping.Core/Const/TenantParamCode.cs b/Myshipping.Core/Const/TenantParamCode.cs index 278ab91a..9338d797 100644 --- a/Myshipping.Core/Const/TenantParamCode.cs +++ b/Myshipping.Core/Const/TenantParamCode.cs @@ -14,5 +14,10 @@ /// 是否启用费用相关功能 /// public const string ENABLE_FEE_ABILITY = "ENABLE_FEE_ABILITY"; + + /// + /// 是否必须使用船期表录入船期参数 + /// + public const string VESSEL_FROM_CONFIG_ONLY = "VESSEL_FROM_CONFIG_ONLY"; } } diff --git a/Myshipping.Core/Myshipping.Core.xml b/Myshipping.Core/Myshipping.Core.xml index 7a4c81b6..82179c19 100644 --- a/Myshipping.Core/Myshipping.Core.xml +++ b/Myshipping.Core/Myshipping.Core.xml @@ -857,6 +857,11 @@ 是否启用费用相关功能 + + + 是否必须使用船期表录入船期参数 + + 代码 diff --git a/Myshipping.Core/Service/Auth/AuthService.cs b/Myshipping.Core/Service/Auth/AuthService.cs index 49862fbd..38cc35d7 100644 --- a/Myshipping.Core/Service/Auth/AuthService.cs +++ b/Myshipping.Core/Service/Auth/AuthService.cs @@ -255,7 +255,7 @@ public class AuthService : IAuthService, IDynamicApiController, ITransient } // 返回前端需要使用的租户参数 - var paraCodeArr = new string[] { TenantParamCode.ENABLE_SLOT_ABILITY, TenantParamCode.ENABLE_FEE_ABILITY }; + var paraCodeArr = new string[] { TenantParamCode.ENABLE_SLOT_ABILITY, TenantParamCode.ENABLE_FEE_ABILITY, TenantParamCode.VESSEL_FROM_CONFIG_ONLY }; loginOutput.TenantParams = await _djyTenantParamService.GetParaCodeWithValue(paraCodeArr); // 增加登录日志 diff --git a/Myshipping.Web.Core/Startup.cs b/Myshipping.Web.Core/Startup.cs index cb21380b..3fccebdb 100644 --- a/Myshipping.Web.Core/Startup.cs +++ b/Myshipping.Web.Core/Startup.cs @@ -142,8 +142,8 @@ public class Startup : AppStartup builder.AddSubscriber(); }); - // 客户订舱:客户端订阅大简云公司用户信息同步 - if (runType == CommonConst.RUN_TYPE_CUST) + // 客户订舱客户端模式 与 标准模式(自用):订阅大简云公司用户信息同步 + if (runType is CommonConst.RUN_TYPE_CUST or CommonConst.RUN_TYPE_NORMAL) { // 公司员工变动消息队列服务 services.AddHostedService();