diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/IInOutStockCode.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/Constraints/IInOutStockCode.cs similarity index 100% rename from WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/IInOutStockCode.cs rename to WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/Constraints/IInOutStockCode.cs diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/IInOutStockDetail.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/Constraints/IInOutStockDetail.cs similarity index 100% rename from WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/IInOutStockDetail.cs rename to WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/Constraints/IInOutStockDetail.cs diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/IUpdatePoliciesStatus.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/Constraints/IUpdatePoliciesStatus.cs similarity index 100% rename from WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/IUpdatePoliciesStatus.cs rename to WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/Constraints/IUpdatePoliciesStatus.cs diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/IWmsCarryEntity.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/Constraints/IWmsCarryEntity.cs similarity index 100% rename from WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/IWmsCarryEntity.cs rename to WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/Constraints/IWmsCarryEntity.cs diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/IWmsRoadEntity.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/Constraints/IWmsRoadEntity.cs similarity index 100% rename from WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/IWmsRoadEntity.cs rename to WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/Constraints/IWmsRoadEntity.cs diff --git a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs index 53bbc964..0afd2d19 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs +++ b/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 _stroageMap = new Dictionary(StringComparer.OrdinalIgnoreCase); + private static Dictionary _stroageMap = new(StringComparer.OrdinalIgnoreCase); public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc(); static BaseWareHouseService() @@ -62,7 +62,7 @@ namespace Tnb.WarehouseMgr [NonAction] protected Task ToApiResult() { - DataResult result = new(); ; + DataResult result = new(); return Task.FromResult(result); } @@ -73,9 +73,11 @@ namespace Tnb.WarehouseMgr [NonAction] protected Task ToApiResult(HttpStatusCode statusCode, object data) { - DataResult result = new(); - result.code = statusCode; - result.data = data; + DataResult result = new() + { + code = statusCode, + data = data + }; return Task.FromResult(result); } @@ -86,10 +88,12 @@ namespace Tnb.WarehouseMgr /// /// [NonAction] - protected Task ToApiResult( object data) + protected Task ToApiResult(object data) { - DataResult result = new(); - result.data = data; + DataResult result = new() + { + data = data + }; return Task.FromResult(result); } /// @@ -99,9 +103,11 @@ namespace Tnb.WarehouseMgr [NonAction] protected Task ToApiResult(HttpStatusCode statusCode, string msg) { - DataResult result = new(); - result.code = statusCode; - result.msg = msg; + DataResult result = new() + { + code = statusCode, + msg = msg + }; return Task.FromResult(result); } /// @@ -111,10 +117,12 @@ namespace Tnb.WarehouseMgr [NonAction] protected Task ToApiResult(HttpStatusCode statusCode, string msg, object data) { - DataResult result = new(); - result.code = statusCode; - result.msg = msg; - result.data = data; + DataResult result = new() + { + code = statusCode, + msg = msg, + data = data + }; return Task.FromResult(result); } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index 914cfc48..cb4b50e4 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -491,12 +491,10 @@ namespace Tnb.WarehouseMgr { async Task _updateStatus(ModifyPoliciesStatusInput input) where T : BaseEntity, IUpdatePoliciesStatus, new() { - T obj = new() - { - status = input.status - }; + T obj = new() { 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: