From 2f14ad3cc01d575bfde0850bae05fded8acb7af6 Mon Sep 17 00:00:00 2001 From: wangxinhui <wangxinhui@hnkhzn.com> Date: 星期日, 12 一月 2025 00:20:26 +0800 Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/WarehouseService.cs | 51 ++++++++++++++++++++++++++++++++------------------- 1 files changed, 32 insertions(+), 19 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/WarehouseService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/WarehouseService.cs" index b95398a..c0777b0 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/WarehouseService.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/WarehouseService.cs" @@ -10,36 +10,32 @@ using WIDESEA_IBasicService; using WIDESEA_Model.Models; using WIDESEA_Core.Helper; +using WIDESEA_Common.CommonEnum; +using WIDESEA_Core.Caches; namespace WIDESEA_BasicService { public partial class WarehouseService : ServiceBase<Dt_Warehouse, IWarehouseRepository>, IWarehouseService { - public WarehouseService(IWarehouseRepository BaseDal) : base(BaseDal) + private readonly ICacheService _cacheService; + private readonly IPalletTypeInfoRepository _palletTypeInfoRepository; + + public WarehouseService(IWarehouseRepository BaseDal,ICacheService cacheService, IPalletTypeInfoRepository palletTypeInfoRepository) : base(BaseDal) { + _cacheService = cacheService; + _palletTypeInfoRepository = palletTypeInfoRepository; } public IWarehouseRepository Repository => BaseDal; - public override WebResponseContent AddData(SaveModel saveModel) - { - Dt_Warehouse warehouse = saveModel.MainData.DicToModel<Dt_Warehouse>(); - return base.AddData(warehouse); - } - - public override WebResponseContent UpdateData(SaveModel saveModel) - { - return base.UpdateData(saveModel); - } - - public override WebResponseContent DeleteData(object[] keys) - { - return base.DeleteData(keys); - } - + /// <summary> + /// 鎵归噺鍚敤浠撳簱 + /// </summary> + /// <param name="keys">浠撳簱涓婚敭鏁扮粍</param> + /// <returns></returns> public WebResponseContent WarehouseEnableStatus(int[] keys) { - List<Dt_Warehouse> warehouses = Repository.QueryData(x => keys.Contains(x.Id)); + List<Dt_Warehouse> warehouses = Repository.QueryData(x => keys.Contains(x.WarehouseId)); warehouses.ForEach(x => { x.WarehouseStatus = EnableEnum.Enable.ObjToInt(); @@ -49,9 +45,14 @@ return WebResponseContent.Instance.OK(); } + /// <summary> + /// 鎵归噺绂佺敤浠撳簱 + /// </summary> + /// <param name="keys">浠撳簱涓婚敭鏁扮粍</param> + /// <returns></returns> public WebResponseContent WarehouseDisableStatus(int[] keys) { - List<Dt_Warehouse> warehouses = Repository.QueryData(x => keys.Contains(x.Id)); + List<Dt_Warehouse> warehouses = Repository.QueryData(x => keys.Contains(x.WarehouseId)); warehouses.ForEach(x => { x.WarehouseStatus = EnableEnum.Disable.ObjToInt(); @@ -61,14 +62,26 @@ return WebResponseContent.Instance.OK(); } + /// <summary> + /// 鍗曚釜鍚敤浠撳簱 + /// </summary> + /// <param name="key">浠撳簱涓婚敭</param> + /// <returns></returns> public WebResponseContent WarehouseEnableStatus(int key) { return WarehouseEnableStatus(new int[] { key }); } + /// <summary> + /// 鍗曚釜绂佺敤浠撳簱 + /// </summary> + /// <param name="key">浠撳簱涓婚敭</param> + /// <returns></returns> public WebResponseContent WarehouseDisableStatus(int key) { return WarehouseDisableStatus(new int[] { key }); } + + } } -- Gitblit v1.9.3