diff --git a/ds-wms-service/DS.Module.Core/Data/IdModel.cs b/ds-wms-service/DS.Module.Core/Data/IdModel.cs index c7bf8760..7de67f60 100644 --- a/ds-wms-service/DS.Module.Core/Data/IdModel.cs +++ b/ds-wms-service/DS.Module.Core/Data/IdModel.cs @@ -14,4 +14,5 @@ public class IdModel /// 主键ids /// public long[] Ids { get; set; } + } \ No newline at end of file diff --git a/ds-wms-service/DS.Module.CrawlerData/CrawlerDataService.cs b/ds-wms-service/DS.Module.CrawlerData/CrawlerDataService.cs index 0587e4bd..30ff4689 100644 --- a/ds-wms-service/DS.Module.CrawlerData/CrawlerDataService.cs +++ b/ds-wms-service/DS.Module.CrawlerData/CrawlerDataService.cs @@ -8,6 +8,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using DS.Module.SqlSugar; +using DS.Module.Core; namespace DS.Module.CrawlerData { @@ -29,5 +30,8 @@ namespace DS.Module.CrawlerData user = _serviceProvider.GetRequiredService(); saasService = _serviceProvider.GetRequiredService(); } + + + //public DataResult GetYardData(string url) { } } } diff --git a/ds-wms-service/DS.Module.CrawlerData/DS.Module.CrawlerData.csproj b/ds-wms-service/DS.Module.CrawlerData/DS.Module.CrawlerData.csproj index 506bc4e1..8d79ff0d 100644 --- a/ds-wms-service/DS.Module.CrawlerData/DS.Module.CrawlerData.csproj +++ b/ds-wms-service/DS.Module.CrawlerData/DS.Module.CrawlerData.csproj @@ -13,4 +13,8 @@ + + + + diff --git a/ds-wms-service/DS.WMS.Core/Fee/Interface/IFeeTemplateDetailService.cs b/ds-wms-service/DS.WMS.Core/Fee/Interface/IFeeTemplateDetailService.cs index 44e53600..8cb08087 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Interface/IFeeTemplateDetailService.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Interface/IFeeTemplateDetailService.cs @@ -1,4 +1,5 @@ using DS.Module.Core; +using DS.Module.Core.Data; using DS.WMS.Core.Fee.Dtos; using DS.WMS.Core.System.Dtos; @@ -37,7 +38,7 @@ public interface IFeeTemplateDetailService /// /// 批量删除 /// - /// + /// /// - public DataResult BatchDelFeeTemplateDetail(List Ids); + public DataResult BatchDelFeeTemplateDetail(IdModel req); } \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/Fee/Method/FeeTemplateDetailService.cs b/ds-wms-service/DS.WMS.Core/Fee/Method/FeeTemplateDetailService.cs index ebb17d1c..cb424992 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Method/FeeTemplateDetailService.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Method/FeeTemplateDetailService.cs @@ -11,6 +11,7 @@ using Mapster; using DS.Module.Core.Extensions; using Masuit.Tools.Strings; using DS.WMS.Core.Op.Entity; +using DS.Module.Core.Data; namespace DS.WMS.Core.Fee.Method { @@ -118,12 +119,12 @@ namespace DS.WMS.Core.Fee.Method /// /// 批量删除 /// - /// + /// /// - public DataResult BatchDelFeeTemplateDetail(List Ids) + public DataResult BatchDelFeeTemplateDetail(IdModel req) { var tenantDb = saasService.GetBizDbScopeById(user.TenantId); - var list = tenantDb.Queryable().Where(x => Ids.Contains(x.Id)).ToList(); + var list = tenantDb.Queryable().Where(x => req.Ids.Contains(x.Id)).ToList(); ; if (list.Count>0) { diff --git a/ds-wms-service/DS.WMS.Core/Op/Interface/IOpCtnService.cs b/ds-wms-service/DS.WMS.Core/Op/Interface/IOpCtnService.cs index ced62aab..a79ed0f4 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Interface/IOpCtnService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Interface/IOpCtnService.cs @@ -1,4 +1,5 @@ using DS.Module.Core; +using DS.Module.Core.Data; using DS.WMS.Core.Info.Dtos; using DS.WMS.Core.Op.Dtos; using System; @@ -45,8 +46,8 @@ namespace DS.WMS.Core.Op.Interface /// /// 批量删除 /// - /// + /// /// - public DataResult BatchDelOpCtn(List Ids); + public DataResult BatchDelOpCtn(IdModel req); } } diff --git a/ds-wms-service/DS.WMS.Core/Op/Interface/ISeaExportService.cs b/ds-wms-service/DS.WMS.Core/Op/Interface/ISeaExportService.cs index 1db4ea10..27ba4e93 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Interface/ISeaExportService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Interface/ISeaExportService.cs @@ -1,4 +1,5 @@ using DS.Module.Core; +using DS.Module.Core.Data; using DS.WMS.Core.Op.Dtos; namespace DS.WMS.Core.Op.Interface; @@ -44,9 +45,9 @@ public interface ISeaExportService /// /// 业务单据删除 /// - /// 业务Ids + /// 业务Ids /// - public DataResult SeaExportBatchDel(List Ids); + public DataResult SeaExportBatchDel(IdModel req); /// /// 业务锁定 diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/OpCtnService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/OpCtnService.cs index 8dd3301b..3351651a 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/OpCtnService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/OpCtnService.cs @@ -1,4 +1,5 @@ using DS.Module.Core; +using DS.Module.Core.Data; using DS.Module.Core.Extensions; using DS.Module.SqlSugar; using DS.Module.UserModule; @@ -108,12 +109,12 @@ namespace DS.WMS.Core.Op.Method /// /// 批量删除 /// - /// + /// /// - public DataResult BatchDelOpCtn(List Ids) + public DataResult BatchDelOpCtn(IdModel req) { var tenantDb = saasService.GetBizDbScopeById(user.TenantId); - var list = tenantDb.Queryable().Where(x => Ids.Contains(x.Id)).ToList(); + var list = tenantDb.Queryable().Where(x => req.Ids.Contains(x.Id)).ToList(); ; if (list.Count > 0) { diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs index 436c2709..85dee5a5 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs @@ -1,5 +1,6 @@ using AngleSharp.Dom; using DS.Module.Core; +using DS.Module.Core.Data; using DS.Module.Core.Extensions; using DS.Module.SqlSugar; using DS.Module.UserModule; @@ -318,39 +319,39 @@ public class SeaExportService : ISeaExportService /// /// 业务单据删除 /// - /// 业务Ids + /// 业务Ids /// - public DataResult SeaExportBatchDel(List Ids) + public DataResult SeaExportBatchDel(IdModel req) { var tenantDb = saasService.GetBizDbScopeById(user.TenantId); - if (Ids.Count == 0) + if (req.Ids.Length == 0) { return DataResult.Failed("海运出口批量操作未勾选!", MultiLanguageConst.SeaExportBatchOpNoSelect); } - if (tenantDb.Queryable().Where(x => Ids.Contains(x.Id)).Any().IsNull()) + if (tenantDb.Queryable().Where(x => req.Ids.Contains(x.Id)).Any().IsNull()) { return DataResult.Failed("不存在的海运出口信息!", MultiLanguageConst.SeaExportExist); } - if (tenantDb.Queryable().Where(x => Ids.Contains(x.Id) && x.IsBusinessLocking == true).Any()) + if (tenantDb.Queryable().Where(x => req.Ids.Contains(x.Id) && x.IsBusinessLocking == true).Any()) { return DataResult.Failed("海运出口信息业务已锁定!", MultiLanguageConst.SeaExportBusinessLock); } - if (tenantDb.Queryable().Where(x => Ids.Contains(x.Id) && x.IsFeeLocking == true).Any()) + if (tenantDb.Queryable().Where(x => req.Ids.Contains(x.Id) && x.IsFeeLocking == true).Any()) { return DataResult.Failed("海运出口信息费用已锁定!", MultiLanguageConst.SeaExportFeeLock); } - if (tenantDb.Queryable().Where(x => Ids.Contains(x.ParentId)).Any()) + if (tenantDb.Queryable().Where(x => req.Ids.Contains(x.ParentId)).Any()) { return DataResult.Failed("海运出口存在分票信息,不能删除!", MultiLanguageConst.SeaExportPartExist); } - if (tenantDb.Queryable().Where(x => Ids.Contains(x.BusinessId)).Any()) + if (tenantDb.Queryable().Where(x => req.Ids.Contains(x.BusinessId)).Any()) { return DataResult.Failed("海运出口存在费用信息,不能删除!", MultiLanguageConst.SeaExportFeeExist); } - var list = tenantDb.Queryable().Where(x => Ids.Contains(x.Id)).ToList(); + var list = tenantDb.Queryable().Where(x => req.Ids.Contains(x.Id)).ToList(); //tenantDb.Deleteable(list).IsLogic().ExecuteCommand("Deleted"); //tenantDb.Deleteable(list).IsLogic().ExecuteCommand("Deleted"); diff --git a/ds-wms-service/DS.WMS.FeeApi/Controllers/FeeTemplateDetailController.cs b/ds-wms-service/DS.WMS.FeeApi/Controllers/FeeTemplateDetailController.cs index 63c9dc69..750e0b91 100644 --- a/ds-wms-service/DS.WMS.FeeApi/Controllers/FeeTemplateDetailController.cs +++ b/ds-wms-service/DS.WMS.FeeApi/Controllers/FeeTemplateDetailController.cs @@ -1,10 +1,12 @@ using DS.Module.Core; +using DS.Module.Core.Data; using DS.WMS.Core.Code.Dtos; using DS.WMS.Core.Code.Interface; using DS.WMS.Core.Fee.Dtos; using DS.WMS.Core.Fee.Interface; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Org.BouncyCastle.Ocsp; namespace DS.WMS.FeeApi.Controllers { @@ -80,13 +82,13 @@ namespace DS.WMS.FeeApi.Controllers /// /// 批量删除 /// - /// + /// /// - [HttpGet] + [HttpPost] [Route("BatchDelFeeTemplateDetail")] - public DataResult BatchDelFeeTemplateDetail([FromQuery] List Ids) + public DataResult BatchDelFeeTemplateDetail([FromBody]IdModel req) { - var res = _invokeService.BatchDelFeeTemplateDetail(Ids); + var res = _invokeService.BatchDelFeeTemplateDetail(req); return res; } } diff --git a/ds-wms-service/DS.WMS.OpApi/Controllers/OpCtnController.cs b/ds-wms-service/DS.WMS.OpApi/Controllers/OpCtnController.cs index dc457e16..74fbc623 100644 --- a/ds-wms-service/DS.WMS.OpApi/Controllers/OpCtnController.cs +++ b/ds-wms-service/DS.WMS.OpApi/Controllers/OpCtnController.cs @@ -77,13 +77,13 @@ public class OpCtnController : ApiController /// /// 批量删除 /// - /// + /// /// - [HttpGet] + [HttpPost] [Route("BatchDelOpCtn")] - public DataResult BatchDelOpCtn([FromQuery] List Ids) + public DataResult BatchDelOpCtn([FromBody] IdModel req) { - var res = _invokeService.BatchDelOpCtn(Ids); + var res = _invokeService.BatchDelOpCtn(req); return res; } } \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.OpApi/Controllers/SeaExportController.cs b/ds-wms-service/DS.WMS.OpApi/Controllers/SeaExportController.cs index 551dd321..6c6ca037 100644 --- a/ds-wms-service/DS.WMS.OpApi/Controllers/SeaExportController.cs +++ b/ds-wms-service/DS.WMS.OpApi/Controllers/SeaExportController.cs @@ -1,4 +1,5 @@ using DS.Module.Core; +using DS.Module.Core.Data; using DS.WMS.Core.Info.Dtos; using DS.WMS.Core.Info.Interface; using DS.WMS.Core.Op.Dtos; @@ -92,13 +93,13 @@ public class SeaExportController : ApiController /// /// 业务单据批量删除 /// - /// + /// /// - [HttpGet] + [HttpPost] [Route("SeaExportBatchDel")] - public DataResult SeaExportBatchDel([FromQuery] List Ids) + public DataResult SeaExportBatchDel([FromBody] IdModel req) { - var res = _invokeService.SeaExportBatchDel(Ids); + var res = _invokeService.SeaExportBatchDel(req); return res; }