From 8f9924e91884243dc186bead73bbb860af1b81ee Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 10 Jul 2023 13:34:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4Entity=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entity/{ => Constraints}/IInOutStockCode.cs | 0 .../Entity/{ => Constraints}/IInOutStockDetail.cs | 0 .../Entity/{ => Constraints}/IUpdatePoliciesStatus.cs | 0 .../Entity/{ => Constraints}/IWmsCarryEntity.cs | 0 .../Entity/{ => Constraints}/IWmsRoadEntity.cs | 0 WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs | 2 +- WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs | 5 +---- 7 files changed, 2 insertions(+), 5 deletions(-) rename WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/{ => Constraints}/IInOutStockCode.cs (100%) rename WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/{ => Constraints}/IInOutStockDetail.cs (100%) rename WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/{ => Constraints}/IUpdatePoliciesStatus.cs (100%) rename WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/{ => Constraints}/IWmsCarryEntity.cs (100%) rename WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/{ => Constraints}/IWmsRoadEntity.cs (100%) 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..ef7f9ec8 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs @@ -86,7 +86,7 @@ namespace Tnb.WarehouseMgr /// /// [NonAction] - protected Task ToApiResult( object data) + protected Task ToApiResult(object data) { DataResult result = new(); result.data = data; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index 914cfc48..4d6a2a3d 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -491,10 +491,7 @@ 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) From 0e058a0f650e74f0f26ce7583e696121c355b0a7 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 10 Jul 2023 13:37:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B6=88=E9=99=A4warning?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.WarehouseMgr/BaseWareHouseService.cs | 34 ++++++++++++------- .../Tnb.WarehouseMgr/WareHouseService.cs | 1 + 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs index ef7f9ec8..a02acc29 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs @@ -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); } @@ -88,8 +90,10 @@ namespace Tnb.WarehouseMgr [NonAction] 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 4d6a2a3d..cb4b50e4 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -494,6 +494,7 @@ namespace Tnb.WarehouseMgr 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: From ba03f549bcba13a1732d6948b25ef31d3c74157d Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 10 Jul 2023 13:41:19 +0800 Subject: [PATCH 3/3] 1 --- WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs index a02acc29..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()