Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs

@@ -26,7 +26,7 @@ namespace Tnb.WarehouseMgr
     [Route("api/[area]/[controller]/[action]")]
     public class BaseWareHouseService : IOverideVisualDevService, IDynamicApiController, ITransient
     {
-        private static Dictionary<string, IWHStorageService> _stroageMap = new Dictionary<string, IWHStorageService>(StringComparer.OrdinalIgnoreCase);
+        private static Dictionary<string, IWHStorageService> _stroageMap = new(StringComparer.OrdinalIgnoreCase);
         public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
 
         static BaseWareHouseService()
@@ -62,7 +62,7 @@ namespace Tnb.WarehouseMgr
         [NonAction]
         protected Task<DataResult> ToApiResult()
         {
-            DataResult result = new(); ;
+            DataResult result = new();
             return Task.FromResult(result);
         }
 
@@ -73,9 +73,11 @@ namespace Tnb.WarehouseMgr
         [NonAction]
         protected Task<DataResult> ToApiResult(HttpStatusCode statusCode, object data)
         {
-            DataResult result = new();
+            DataResult result = new()
-            result.code = statusCode;
+            {
-            result.data = data;
+                code = statusCode,
+                data = data
+            };
             return Task.FromResult(result);
         }
 
@@ -86,10 +88,12 @@ namespace Tnb.WarehouseMgr
         /// </summary>
         /// <returns></returns>
         [NonAction]
-        protected Task<DataResult> ToApiResult( object data)
+        protected Task<DataResult> ToApiResult(object data)
         {
-            DataResult result = new();
+            DataResult result = new()
-            result.data = data;
+            {
+                data = data
+            };
             return Task.FromResult(result);
         }
         /// <summary>
@@ -99,9 +103,11 @@ namespace Tnb.WarehouseMgr
         [NonAction]
         protected Task<DataResult> ToApiResult(HttpStatusCode statusCode, string msg)
         {
-            DataResult result = new();
+            DataResult result = new()
-            result.code = statusCode;
+            {
-            result.msg = msg;
+                code = statusCode,
+                msg = msg
+            };
             return Task.FromResult(result);
         }
         /// <summary>
@@ -111,10 +117,12 @@ namespace Tnb.WarehouseMgr
         [NonAction]
         protected Task<DataResult> ToApiResult(HttpStatusCode statusCode, string msg, object data)
         {
-            DataResult result = new();
+            DataResult result = new()
-            result.code = statusCode;
+            {
-            result.msg = msg;
+                code = statusCode,
-            result.data = data;
+                msg = msg,
+                data = data
+            };
             return Task.FromResult(result);
         }
     }

WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs

@@ -491,12 +491,10 @@ namespace Tnb.WarehouseMgr
         {
             async Task _updateStatus<T>(ModifyPoliciesStatusInput input) where T : BaseEntity<string>, IUpdatePoliciesStatus, new()
             {
-                T obj = new()
+                T obj = new() { status = input.status };
-                {
-                    status = input.status
-                };
                 await _db.Updateable(obj).UpdateColumns(it => it.status).Where(it => input.ids.Contains(it.id)).ExecuteCommandAsync();
             }
+           
             switch (input.strategyType)
             {
                 case EnumInOutStockType.In: