Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev

ds-wms-service/DS.WMS.Core/Info/Method/ClientInfoService.cs

@@ -44,6 +44,9 @@ public class ClientInfoService : ServiceBase, IClientInfoService
         flowService = new Lazy<IClientFlowInstanceService>(serviceProvider.GetRequiredService<IClientFlowInstanceService>());
         taskService = new Lazy<ITaskService>(serviceProvider.GetRequiredService<ITaskService>());
         commonService = serviceProvider.GetRequiredService<ICommonService>();
+
+        TenantDb.QueryFilter.Clear<IOrgId>();
+        TenantDb.QueryFilter.Clear<ISharedOrgId>();
     }
 
     #region 审核

ds-wms-service/DS.WMS.Core/TaskInteraction/Entity/BusinessDataProvider.cs

@@ -0,0 +1,90 @@
+using System.ComponentModel;
+using SqlSugar;
+
+namespace DS.WMS.Core.TaskInteraction.Entity
+{
+    /// <summary>
+    /// 业务数据源提供程序配置
+    /// </summary>
+    [SugarTable("business_data_provider", "业务数据源提供程序配置")]
+    public class BusinessDataProvider
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 数据源程序类型名
+        /// </summary>
+        [SugarColumn(ColumnDescription = "数据源程序类型名", Length = 100, IsNullable = true)]
+        public string TypeName { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 数据源名称
+        /// </summary>
+        [SugarColumn(ColumnDescription = "数据源名称", Length = 100, IsNullable = false)]
+        public string Name { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 数据源描述
+        /// </summary>
+        [SugarColumn(ColumnDescription = "数据源描述", Length = 300, IsNullable = true)]
+        public string? Description { get; set; }
+
+        /// <summary>
+        /// 数据源内容
+        /// </summary>
+        [SugarColumn(ColumnDescription = "数据源内容", IsNullable = true)]
+        public string? Content { get; set; }
+
+        /// <summary>
+        /// 数据源类型
+        /// </summary>
+        [SugarColumn(ColumnDescription = "数据源类型")]
+        public DataProviderType Type { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [SugarColumn(ColumnDescription = "创建人", IsNullable = false)]
+        public long CreateBy { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "创建时间", IsNullable = false)]
+        public DateTime CreateTime { get; set; }
+    }
+
+    /// <summary>
+    /// 数据源类型
+    /// </summary>
+    public enum DataProviderType
+    {
+        /// <summary>
+        /// 自定义
+        /// </summary>
+        [Description("自定义")]
+        Custom = 0,
+
+        /// <summary>
+        /// 固定
+        /// </summary>
+        [Description("固定")]
+        Fixed = 1,
+
+        /// <summary>
+        /// SQL
+        /// </summary>
+        [Description("SQL")]
+        SQL = 2,
+
+        /// <summary>
+        /// 网络
+        /// </summary>
+        [Description("网络")]
+        Network = 3
+    }
+}

ds-wms-service/DS.WMS.Core/TaskInteraction/Entity/BusinessTask.cs

@@ -83,11 +83,5 @@ namespace DS.WMS.Core.TaskInteraction.Entity
         /// </summary>
         [SugarColumn(ColumnDescription = "审批驳回理由", Length = 200, IsNullable = true)]
         public string? RejectReason { get; set; }
-
-        ///// <summary>
-        ///// 下一任务配置ID
-        ///// </summary>
-        //[SugarColumn(ColumnDescription = "下一任务配置ID", IsNullable = true)]
-        //public long? NextId { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/TaskInteraction/Entity/BusinessTaskMail.cs

@@ -40,6 +40,18 @@ namespace DS.WMS.Core.TaskInteraction.Entity
         [SugarColumn(ColumnDescription = "客户名称", Length = 200, IsNullable = true)]
         public string? CustomerName { get; set; }
 
+        /// <summary>
+        /// 数据源提供程序ID
+        /// </summary>
+        [SugarColumn(ColumnDescription = "数据源提供程序ID", IsNullable = true)]
+        public int? ProviderId { get; set; }
+
+        /// <summary>
+        /// 数据源提供程序
+        /// </summary>
+        [Navigate(NavigateType.OneToOne, nameof(ProviderId))]
+        public BusinessDataProvider? Provider { get; set; }
+
         /// <summary>
         /// 接收人设置
         /// </summary>

ds-wms-service/DS.WMS.Core/TaskInteraction/Interface/IOrder.cs

@@ -1,10 +0,0 @@
-namespace DS.WMS.Core.TaskInteraction.Interface
-{
-    /// <summary>
-    /// 订单定义
-    /// </summary>
-    public interface IOrder
-    {
-
-    }
-}