Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -3592,8 +3592,8 @@ namespace Myshipping.Application
                 }
                 catch { }
             }
-
+            // 以后需要把RUN_TYPE_CUST 、 RUN_TYPE_NORMAL放开
-            if (App.Configuration["RunType"] is not CommonConst.RUN_TYPE_DJY or CommonConst.RUN_TYPE_CUST)
+            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<dynamic> 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;
             }

Myshipping.Core/Const/TenantParamCode.cs

@@ -14,5 +14,10 @@
         /// 是否启用费用相关功能
         /// </summary>
         public const string ENABLE_FEE_ABILITY = "ENABLE_FEE_ABILITY";
+
+        /// <summary>
+        /// 是否必须使用船期表录入船期参数
+        /// </summary>
+        public const string VESSEL_FROM_CONFIG_ONLY = "VESSEL_FROM_CONFIG_ONLY";
     }
 }

Myshipping.Core/Myshipping.Core.xml

@@ -857,6 +857,11 @@
             是否启用费用相关功能
             </summary>
         </member>
+        <member name="F:Myshipping.Core.Const.TenantParamCode.VESSEL_FROM_CONFIG_ONLY">
+            <summary>
+            是否必须使用船期表录入船期参数
+            </summary>
+        </member>
         <member name="P:Myshipping.Core.Entity.CodeCarrier.Code">
             <summary>
             代码

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);
 
         // 增加登录日志

Myshipping.Web.Core/Startup.cs

@@ -142,8 +142,8 @@ public class Startup : AppStartup
             builder.AddSubscriber<BookingFeeSubscriber>();
         });
 
-        // 客户订舱：客户端订阅大简云公司用户信息同步
+        // 客户订舱客户端模式 与 标准模式（自用）：订阅大简云公司用户信息同步
-        if (runType == CommonConst.RUN_TYPE_CUST)
+        if (runType is CommonConst.RUN_TYPE_CUST or CommonConst.RUN_TYPE_NORMAL)
         {
             // 公司员工变动消息队列服务
             services.AddHostedService<RecCompanyUserChangeService>();