From 1e3c19642a323163fcd831c5832cbcf2bfbe067e Mon Sep 17 00:00:00 2001 From: Administrator Date: Tue, 15 Feb 2022 10:56:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/TaskJobs/JobAppService.cs | 2 +- .../Entities/WMS/WMSHQFKanbanAppService.cs | 24 +++++ .../WMS/WMSHQFSharePartAppService .cs | 23 +++++ .../Entities/WMS/WMSHQHKanbanAppService.cs | 29 +++++- .../Entities/WMS/WMSHQHSharePartAppService.cs | 19 ++++ .../Entities/WMS/WMSJitAppService.cs | 22 +++++ .../Entities/WMS/WMSKanbanAppService.cs | 18 ++++ .../Entities/WMS/WMSKanbanExtendAppService.cs | 21 +++++ .../Entities/WMS/WMSSharePart90AppService.cs | 18 ++++ .../Entities/WMS/WMSSharePartAppService.cs | 18 ++++ .../Entities/WMS/WmsHQCarAppService.cs | 23 +++++ .../Entities/WMS/WmsHQKBOutputAppService.cs | 18 ++++ .../Entities/WMS/WmsHQMKanbanAppService.cs | 19 ++++ .../Entities/WMS/WmsHQMSharePartAppService.cs | 24 +++++ .../SettleAccount.Application.xml | 91 +++++++++++++++++++ 15 files changed, 364 insertions(+), 5 deletions(-) diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/TaskJobs/JobAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/TaskJobs/JobAppService.cs index b499fa55..2caf084e 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/TaskJobs/JobAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/TaskJobs/JobAppService.cs @@ -120,7 +120,7 @@ namespace Win.Sfs.SettleAccount.Entities.TaskJobs - [HttpPost] + [HttpGet] [Route("updateRemark")] diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs index 89cfa36e..6a8734d5 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs @@ -133,6 +133,30 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts return new PagedResultDto(totalCount, entities); } + /// + /// 准时化出库主表 + /// + /// + /// + [HttpGet] + [Route("UpdateRemark")] + + public async Task UpdateRemark(Guid id, string remark) + { + var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id); + if (entity != null) + { + entity.Remark = remark; + await _wmsVersionRepository.UpdateAsync(entity); + + } + return true; + } + + + + + /// /// 准时化出库明细 /// diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs index c1cfc15c..dddc6bee 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs @@ -195,6 +195,29 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts return true; } + /// + ///更新备注 + /// + /// + /// + [HttpGet] + [Route("UpdateRemark")] + + public async Task UpdateRemark(Guid id, string remark) + { + var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id); + if (entity != null) + { + entity.Remark = remark; + await _wmsVersionRepository.UpdateAsync(entity); + + } + return true; + } + + + + /// /// 选择任务,生成出库单,只包含已确认的单据 /// diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs index 3c0cb6ce..55679d6e 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs @@ -171,6 +171,27 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts return true; } + /// + ///更新备注 + /// + /// + /// + [HttpGet] + [Route("UpdateRemark")] + + public async Task UpdateRemark(Guid id, string remark) + { + var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id); + if (entity != null) + { + entity.Remark = remark; + await _wmsVersionRepository.UpdateAsync(entity); + + } + return true; + } + + ///// ///// 选择任务,生成出库单,只包含已确认的单据 @@ -204,12 +225,12 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts // _lst.Add(_entity); // } - + // } - + // var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.Kanban==string.Empty).ToListAsync(); - + // await _wmsRepository.GetDbContext().BulkInsertAsync(_lst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); // int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum); // if (_count == 0) @@ -225,7 +246,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts // await _job.UpdateAsync(job); // } // } - + // return ApplicationConsts.SuccessStr; ; //} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs index 2240e10c..32c824f2 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs @@ -130,6 +130,25 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts return new PagedResultDto(totalCount, entities); } + /// + ///更新备注 + /// + /// + /// + [HttpGet] + [Route("UpdateRemark")] + + public async Task UpdateRemark(Guid id, string remark) + { + var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id); + if (entity != null) + { + entity.Remark = remark; + await _wmsVersionRepository.UpdateAsync(entity); + + } + return true; + } /// /// 准时化出库明细 diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs index 09bf549f..1d64d8a7 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs @@ -341,6 +341,28 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts return true; } + + /// + ///更新备注 + /// + /// + /// + [HttpGet] + [Route("UpdateRemark")] + + public async Task UpdateRemark(Guid id, string remark) + { + var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id); + if (entity != null) + { + entity.Remark = remark; + await _wmsVersionRepository.UpdateAsync(entity); + + } + return true; + } + + /// /// 选择任务,生成出库单,只包含已确认的单据 /// diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs index 938bba97..04946399 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs @@ -494,7 +494,25 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts } + /// + ///更新备注 + /// + /// + /// + [HttpGet] + [Route("UpdateRemark")] + + public async Task UpdateRemark(Guid id, string remark) + { + var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id); + if (entity != null) + { + entity.Remark = remark; + await _wmsVersionRepository.UpdateAsync(entity); + } + return true; + } // 物料 物料组 物料描述 物料号 开始日期 结束日期 单位 出库数量 结算数量 寄售库存数量 diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs index 6f0b32aa..42530ab6 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs @@ -212,6 +212,27 @@ namespace Win.Sfs.SettleAccount.Entities.WMS return true; } + /// + ///更新备注 + /// + /// + /// + [HttpGet] + [Route("UpdateRemark")] + + public async Task UpdateRemark(Guid id, string remark) + { + var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id); + if (entity != null) + { + entity.Remark = remark; + await _wmsVersionRepository.UpdateAsync(entity); + + } + return true; + } + + /// /// 选择任务,生成出库单,只包含已确认的单据 diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs index 0e07d3ff..60abb997 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs @@ -83,7 +83,25 @@ namespace Win.Sfs.SettleAccount.Entities.WMS input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); } + /// + ///更新备注 + /// + /// + /// + [HttpGet] + [Route("UpdateRemark")] + + public async Task UpdateRemark(Guid id, string remark) + { + var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id); + if (entity != null) + { + entity.Remark = remark; + await _wmsVersionRepository.UpdateAsync(entity); + } + return true; + } private async Task GetCountAsync(WmsSharePartOutPutRequestDto input) { return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs index f5f333de..d0642581 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs @@ -131,7 +131,25 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts return new PagedResultDto(totalCount, entities); } + /// + ///更新备注 + /// + /// + /// + [HttpGet] + [Route("UpdateRemark")] + + public async Task UpdateRemark(Guid id, string remark) + { + var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id); + if (entity != null) + { + entity.Remark = remark; + await _wmsVersionRepository.UpdateAsync(entity); + } + return true; + } /// /// 准时化出库明细 /// diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs index bcca16c2..fbfc7070 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs @@ -87,6 +87,29 @@ namespace Win.Sfs.SettleAccount.Entities.WMS return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); } + /// + ///准时化更新备注 + /// + /// + /// + [HttpGet] + [Route("UpdateRemark")] + + public async Task UpdateRemark(Guid id, string remark) + { + var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id); + if (entity != null) + { + entity.Remark = remark; + await _wmsVersionRepository.UpdateAsync(entity); + + } + return true; + } + + + + /// /// 准时化出库主表 /// diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs index 8425e8dc..9527fb78 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs @@ -181,7 +181,25 @@ namespace Win.Sfs.SettleAccount.Entities.WMS return new PagedResultDto(totalCount, entities); } + /// + ///更新备注 + /// + /// + /// + [HttpGet] + [Route("UpdateRemark")] + + public async Task UpdateRemark(Guid id, string remark) + { + var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id); + if (entity != null) + { + entity.Remark = remark; + await _wmsVersionRepository.UpdateAsync(entity); + } + return true; + } /// diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs index 29f23a59..4e4e3b2f 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs @@ -240,6 +240,25 @@ namespace Win.Sfs.SettleAccount.Entities.WMS return ApplicationConsts.SuccessStr; ; } /// + ///更新备注 + /// + /// + /// + [HttpGet] + [Route("UpdateRemark")] + + public async Task UpdateRemark(Guid id, string remark) + { + var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id); + if (entity != null) + { + entity.Remark = remark; + await _wmsVersionRepository.UpdateAsync(entity); + + } + return true; + } + /// /// 出库界面功能,核准出库功能 /// /// diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs index d5662d63..f65d2df7 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs @@ -427,6 +427,30 @@ namespace Win.Sfs.SettleAccount.Entities.WMS return true; } + /// + ///更新备注 + /// + /// + /// + [HttpGet] + [Route("UpdateRemark")] + + public async Task UpdateRemark(Guid id, string remark) + { + var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id); + if (entity != null) + { + entity.Remark = remark; + await _wmsVersionRepository.UpdateAsync(entity); + + } + return true; + } + + + + + [HttpPost] [Route("ExcelImport")] [DisableRequestSizeLimit] diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml index 6f7a7b76..2b7173cc 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml @@ -1790,6 +1790,13 @@ + + + 准时化出库主表 + + + + 准时化出库明细 @@ -1872,6 +1879,13 @@ 上传的文件(前端已经限制只能上传一个附件) + + + 更新备注 + + + + 选择任务,生成出库单,只包含已确认的单据 @@ -1947,6 +1961,13 @@ 上传的文件(前端已经限制只能上传一个附件) + + + 更新备注 + + + + 选择任务,生成出库单,只包含已确认的单据 @@ -2001,6 +2022,13 @@ + + + 更新备注 + + + + 准时化出库明细 @@ -2104,6 +2132,13 @@ 上传的文件(前端已经限制只能上传一个附件) + + + 更新备注 + + + + 选择任务,生成出库单,只包含已确认的单据 @@ -2204,6 +2239,13 @@ + + + 更新备注 + + + + wms出库 @@ -2226,6 +2268,13 @@ + + + 更新备注 + + + + 准时化出库明细 @@ -2846,6 +2895,13 @@ + + + 准时化更新备注 + + + + 准时化出库主表 @@ -2928,6 +2984,13 @@ + + + 更新备注 + + + + 任务明细标记已确认 @@ -3011,6 +3074,13 @@ + + + 更新备注 + + + + 出库界面功能,核准出库功能 @@ -3110,6 +3180,13 @@ + + + 更新备注 + + + + 大众看板-出库 @@ -3146,6 +3223,13 @@ 上传的文件(前端已经限制只能上传一个附件) + + + 更新备注 + + + + 选择任务,生成出库单,只包含已确认的单据 @@ -3193,6 +3277,13 @@ + + + 更新备注 + + + + 准时化出库主表