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

ds-wms-service/DS.Module.RedisModule/IRedisService.cs

@@ -80,5 +80,10 @@ namespace DS.Module.RedisModule
         /// </summary>
         /// <param name="key"></param>
         void DeleteLike(string key);
+
+        /// <summary>
+        /// 释放Redis链接
+        /// </summary>
+        void Dispose();
     }
 }

ds-wms-service/DS.Module.RedisModule/RedisService.cs

@@ -263,7 +263,13 @@ namespace DS.Module.RedisModule
 
             csRedis.Eval(luaScript, lockKey, new[] { lockValue });
         }
-
+        /// <summary>
+        /// 释放Redis链接
+        /// </summary>
+        public void Dispose()
+        {
+            csRedis.Dispose();
+        }
     }
 }
 

ds-wms-service/DS.Module.SqlSugar/SqlSugarDiffUtil.cs

@@ -70,9 +70,14 @@ public static class SqlSugarDiffUtil
     private static readonly  List<string> IgnoreColumns = new List<string>()
     {
         "CreateTime",
+        "CreateUserName",
         "CreateBy",
         "UpdateTime",
+        "UpdateUserName",
         "UpdateBy",
+        "DeleteTime",
+        "DeleteUserName",
+        "DeleteBy",
     };
 }
 

ds-wms-service/DS.WMS.Core/Op/Entity/OpBusinessLog.cs

@@ -0,0 +1,58 @@
+using DS.Module.Core.Data;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DS.WMS.Core.Op.Entity
+{
+    /// <summary>
+    /// 业务日志
+    /// </summary>
+    [SqlSugar.SugarTable("op_business_log", "业务日志")]
+    public class OpBusinessLog : BaseModel<long>
+    { 
+        /// <summary>
+        /// 业务id
+        /// </summary>
+        [SugarColumn(ColumnDescription = "业务id")]
+        public long? BusinessId { get; set; }
+        /// <summary>
+        /// 操作方式：新增(Create)、更新(Update)、删除(Delete) 
+        /// </summary>
+
+        [SugarColumn(ColumnDescription = "操作方式：新增(Create)、更新(Update)、删除(Delete) ",IsNullable = false,Length =20)]
+        public string OperateType { get; set; }
+        /// <summary>
+        /// 旧值
+        /// </summary>
+        [SugarColumn(ColumnDescription = "旧值", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)]
+        public string OldValue { get; set; }
+        /// <summary>
+        /// 新值
+        /// </summary>
+        [SugarColumn(ColumnDescription = "新值", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)]
+        public string NewValue { get; set; } 
+        /// <summary>
+        /// 差异数据
+        /// </summary>
+        [SugarColumn(ColumnDescription = "差异数据", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)]
+        public string DiffData { get; set; }
+
+        /// <summary>
+        /// 业务来源代码 
+        /// </summary>
+
+        [SugarColumn(ColumnDescription = "业务来源代码", IsNullable = true, Length = 100)]
+        public string SourceCode { get; set; }
+        /// <summary>
+        /// 业务来源 
+        /// </summary>
+
+        [SugarColumn(ColumnDescription = "业务来源", IsNullable = false, Length = 100)]
+        public string SourceName { get; set; }
+
+    }
+}