From cabfca3f2ff676dccf2c203e4c13313386112ac8 Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 8 Apr 2022 15:37:48 +0800 Subject: [PATCH 1/2] =?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/TaskListDto.cs | 6 +-- .../Report/WmsOutputSumDapperRepository.cs | 44 +++++++++---------- .../Services/Report/UnSettledSumService.cs | 5 +-- 3 files changed, 25 insertions(+), 30 deletions(-) diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/TaskListDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/TaskListDto.cs index 8e9e5d04..0f8b954b 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/TaskListDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/TaskListDto.cs @@ -202,7 +202,7 @@ namespace Win.Sfs.SettleAccount.Entities [ExporterHeader(DisplayName = "BillNum", IsIgnore = true)] public string BillNum { set; get; } [ImporterHeader(Name = "状态", IsIgnore = true)] - [ExporterHeader(DisplayName = "状态", IsIgnore = true)] + [ExporterHeader(DisplayName = "状态")] public int State { set; get; } [ImporterHeader(Name = "开票单价")] [ExporterHeader(DisplayName = "开票单价")] @@ -211,9 +211,7 @@ namespace Win.Sfs.SettleAccount.Entities [ImporterHeader(Name = "开票金额")] [ExporterHeader(DisplayName = "开票金额")] public decimal Amt { set; get; } - - - } + /// diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs index 74c1c02b..43109b34 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs @@ -375,7 +375,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " FROM\n" + " Set_WmsJitOutPutDetial \n" + " WHERE\n" + -" VERSION = '{0} AND STATE<>4' \n" + +" VERSION = '{0}' AND STATE<>4 \n" + " GROUP BY\n" + " BillNum,\n" + " MaterialCode,\n" + @@ -395,7 +395,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " FROM\n" + " Set_WmsKanbanOutPutDetial \n" + " WHERE\n" + -" VERSION = '{0} AND STATE<>4' \n" + +" VERSION = '{0}' AND STATE<>4 \n" + " GROUP BY\n" + " BillNum,\n" + " MaterialCode,\n" + @@ -415,7 +415,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " FROM\n" + " Set_WmsWithOutKanbanOutPutDetial \n" + " WHERE\n" + -" VERSION = '{0} AND STATE<>4' \n" + +" VERSION = '{0}' AND STATE<>4 \n" + " GROUP BY\n" + " BillNum,\n" + " SapMaterialCode,\n" + @@ -435,7 +435,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " FROM\n" + " Set_WmsSharePartOutPutDetial \n" + " WHERE\n" + -" VERSION = '{0} AND STATE<>4' \n" + +" VERSION = '{0}' AND STATE<>4 \n" + " GROUP BY\n" + " BillNum,\n" + " MaterialCode,\n" + @@ -455,7 +455,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " FROM\n" + " Set_WmsSharePart90OutPutDetial \n" + " WHERE\n" + -" VERSION = '{0} AND STATE<>4' \n" + +" VERSION = '{0}' AND STATE<>4 \n" + " GROUP BY\n" + " BillNum,\n" + " MaterialCode,\n" + @@ -475,7 +475,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " FROM\n" + " Set_WmsHQHKanbanOutPutDetial \n" + " WHERE\n" + -" VERSION = '{0} AND STATE<>4' \n" + +" VERSION = '{0}' AND STATE<>4 \n" + " GROUP BY\n" + " BillNum,\n" + " MaterialCode,\n" + @@ -496,7 +496,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " Set_WmsHQWithOutKanbanOutPutDetial \n" + " WHERE\n" + " IsBack = 0 \n" + -" AND VERSION = '{0} AND STATE<>4' \n" + +" AND VERSION = '{0}' AND STATE<>4 \n" + " AND Extend = '100113' \n" + " GROUP BY\n" + " BillNum,\n" + @@ -519,7 +519,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " Set_WmsHQWithOutKanbanOutPutDetial \n" + " WHERE\n" + " IsBack = 1 \n" + -" AND VERSION = '{0} AND STATE<>4' \n" + +" AND VERSION = '{0}' AND STATE<>4 \n" + " AND Extend = '100113' \n" + " GROUP BY\n" + " BillNum,\n" + @@ -542,7 +542,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " Set_WmsHQWithOutKanbanOutPutDetial \n" + " WHERE\n" + " IsBack = 0 \n" + -" AND VERSION = '{0} AND STATE<>4' \n" + +" AND VERSION = '{0}' AND STATE<>4 \n" + " AND Extend = '100053' \n" + " GROUP BY\n" + " BillNum,\n" + @@ -565,7 +565,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " Set_WmsHQWithOutKanbanOutPutDetial \n" + " WHERE\n" + " IsBack = 1 \n" + -" AND VERSION = '{0} AND STATE<>4' \n" + +" AND VERSION = '{0}' AND STATE<>4 \n" + " AND Extend = '100053' \n" + " GROUP BY\n" + " BillNum,\n" + @@ -589,7 +589,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " Set_WmsOneTimeSaleOutPutDetial\n" + " WHERE\n" + " \n" + -" VERSION = '{0} AND STATE<>4' \n" + +" VERSION = '{0}' AND STATE<>4 \n" + " GROUP BY\n" + " BillNum,\n" + " SapMaterialCode,\n" + @@ -635,7 +635,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " FROM\n" + " Set_WmsJitOutPutDetial \n" + " WHERE\n" + -" VERSION = '{0} AND STATE<>4' \n" + +" VERSION = '{0}' AND STATE<>4 \n" + " AND State = 2 \n" + " GROUP BY\n" + " BillNum,\n" + @@ -656,7 +656,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " FROM\n" + " Set_WmsKanbanOutPutDetial \n" + " WHERE\n" + -" VERSION = '{0} AND STATE<>4' \n" + +" VERSION = '{0}' AND STATE<>4 \n" + " AND State = 2 \n" + " GROUP BY\n" + " BillNum,\n" + @@ -677,7 +677,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " FROM\n" + " Set_WmsWithOutKanbanOutPutDetial \n" + " WHERE\n" + -" VERSION = '{0} AND STATE<>4' \n" + +" VERSION = '{0}' AND STATE<>4 \n" + " AND State = 2 \n" + " GROUP BY\n" + " BillNum,\n" + @@ -698,7 +698,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " FROM\n" + " Set_WmsSharePartOutPutDetial \n" + " WHERE\n" + -" VERSION = '{0} AND STATE<>4' \n" + +" VERSION = '{0}' AND STATE<>4 \n" + " AND State = 2 \n" + " GROUP BY\n" + " BillNum,\n" + @@ -719,7 +719,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " FROM\n" + " Set_WmsSharePart90OutPutDetial \n" + " WHERE\n" + -" VERSION = '{0} AND STATE<>4' \n" + +" VERSION = '{0}' AND STATE<>4 \n" + " AND State = 2 \n" + " GROUP BY\n" + " BillNum,\n" + @@ -740,7 +740,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " FROM\n" + " Set_WmsHQHKanbanOutPutDetial \n" + " WHERE\n" + -" VERSION = '{0} AND STATE<>4' \n" + +" VERSION = '{0}' AND STATE<>4 \n" + " AND State = 2 \n" + " GROUP BY\n" + " BillNum,\n" + @@ -762,7 +762,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " Set_WmsHQWithOutKanbanOutPutDetial \n" + " WHERE\n" + " IsBack = 0 \n" + -" AND VERSION = '{0} AND STATE<>4' \n" + +" AND VERSION = '{0}' AND STATE<>4 \n" + " AND State = 2 \n" + " AND Extend = '100113' \n" + " GROUP BY\n" + @@ -786,7 +786,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " Set_WmsHQWithOutKanbanOutPutDetial \n" + " WHERE\n" + " IsBack = 1 \n" + -" AND VERSION = '{0} AND STATE<>4' \n" + +" AND VERSION = '{0}' AND STATE<>4 \n" + " AND State = 2 \n" + " AND Extend = '100113' \n" + " GROUP BY\n" + @@ -810,7 +810,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " Set_WmsHQWithOutKanbanOutPutDetial \n" + " WHERE\n" + " IsBack = 0 \n" + -" AND VERSION = '{0} AND STATE<>4' \n" + +" AND VERSION = '{0}' AND STATE<>4 \n" + " AND State = 2 \n" + " AND Extend = '100053' \n" + " GROUP BY\n" + @@ -834,7 +834,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " Set_WmsHQWithOutKanbanOutPutDetial \n" + " WHERE\n" + " IsBack = 1 \n" + -" AND VERSION = '{0} AND STATE<>4' \n" + +" AND VERSION = '{0}' AND STATE<>4 \n" + " AND State = 2 \n" + " AND Extend = '100053' \n" + " GROUP BY\n" + @@ -859,7 +859,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " Set_WmsOneTimeSaleOutPutDetial\n" + " WHERE\n" + " \n" + -" VERSION = '{0} AND STATE<>4' \n" + +" VERSION = '{0}' AND STATE<>4 \n" + " AND State = 2 \n" + " GROUP BY\n" + " BillNum,\n" + diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs index d3dd9de6..2359831c 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs @@ -241,7 +241,7 @@ namespace SettleAccount.Job.Services.Report var _filename = exportName.FirstOrDefault(); var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value; var materialCode = p_list.Where(p => p.Name == "MaterialCode").FirstOrDefault().Value; - var kanban = p_list.Where(p => p.Name == "Kanban").FirstOrDefault().Value; + //var kanban = p_list.Where(p => p.Name == "Kanban").FirstOrDefault().Value; var begin = p_list.Where(p => p.Name == "Begin").FirstOrDefault().Value; var end = p_list.Where(p => p.Name == "End").FirstOrDefault().Value; var materialGroup = p_list.Where(p => p.Name == "MaterialGroup").FirstOrDefault().Value; @@ -303,9 +303,6 @@ namespace SettleAccount.Job.Services.Report 库位 = tm == null ? "" : tm.LocCode, 本月减少 = tm == null ? "" : tm.OutQty.ToString(), 本月增加 = tm == null ? "" : tm.InQty.ToString(), - - - }; From 1515f4ffd92f7998feb9372972a2958a99d6119c Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 8 Apr 2022 16:12:46 +0800 Subject: [PATCH 2/2] =?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/WMS/WMSHQHKanbanAppService.cs | 1 + .../Entities/WMS/WMSHQHSharePartAppService.cs | 1 + .../SettleAccount.Application/Entities/WMS/WMSJitAppService.cs | 2 +- .../Entities/WMS/WMSKanbanAppService.cs | 1 + .../Entities/WMS/WMSKanbanExtendAppService.cs | 1 + .../Entities/WMS/WMSSharePart90AppService.cs | 1 + .../Entities/WMS/WMSSharePartAppService.cs | 1 + .../Entities/WMS/WmsHQCarAppService.cs | 1 + .../Entities/WMS/WmsHQKBOutputAppService.cs | 1 + .../Entities/WMS/WmsOneTimeSaleOutputAppService.cs | 1 + 10 files changed, 10 insertions(+), 1 deletion(-) 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 fb452056..048cac65 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs @@ -376,6 +376,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts /// [HttpPost] [Route("WmsHQHKanbanOutPut-Cancel")] + [UnitOfWork(false)] public async Task WmsHQHKanbanOutPutCancel(WmsJitRequestDto input) { if (input.Guids != null && input.Guids.Count() > 0) 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 11a9c49e..4fb05505 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs @@ -444,6 +444,7 @@ into temp1 /// [HttpPost] [Route("WmsSharePartOutPut-Cancel")] + [UnitOfWork(false)] public async Task WmsSharePartOutPutCancel(WmsJitRequestDto input) { if (input.Guids != null && input.Guids.Count() > 0) 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 156cf5a7..716ab540 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs @@ -329,7 +329,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts [HttpPost] [Route("WmsJitOutPutCancel")] [DisableRequestSizeLimit] - + [UnitOfWork(false)] public async Task WmsJitCancel(List ids) { var _joblist = await _job.Where(p => ids.Contains(p.Id) && p.FileName == "已确认").ToListAsync(); 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 e6f5aa67..c3cc8b90 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs @@ -429,6 +429,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts /// [HttpPost] [Route("WmsKanbanOutPut-Cancel")] + [UnitOfWork(false)] public async Task WmsKanbanOutPutCancel(WmsJitRequestDto input) { if (input.Guids != null && input.Guids.Count() > 0) 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 c6568ba1..077f4793 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs @@ -367,6 +367,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS /// [HttpPost] [Route("WmsKanbanOutPut-Cancel")] + [UnitOfWork(false)] public async Task WmsKanbanOutPutCancel(WmsJitRequestDto input) { if (input.Guids != null && input.Guids.Count() > 0) 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 d99da11b..2d80abdf 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs @@ -408,6 +408,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS /// [HttpPost] [Route("WmsSharePartOutPut-Cancel")] + [UnitOfWork(false)] public async Task WmsSharePartOutPutCancel(WmsJitRequestDto input) { if (input.Guids != null && input.Guids.Count() > 0) 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 d85b82da..52f6714b 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs @@ -569,6 +569,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts /// [HttpPost] [Route("WmsSharePartOutPut-Cancel")] + [UnitOfWork(false)] public async Task WmsSharePartOutPutCancel(WmsJitRequestDto input) { //没有有采购单据号的单子 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 d06b8188..b8301153 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs @@ -378,6 +378,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS /// [HttpPost] [Route("WmsSharePartOutPut-Cancel")] + [UnitOfWork(false)] public async Task WmsSharePartOutPutCancel(WmsJitRequestDto input) { if (input.Guids != null && input.Guids.Count() > 0) 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 bb702d03..1270b870 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs @@ -399,6 +399,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS /// [HttpPost] [Route("WmsKanbanOutPut-Cancel")] + [UnitOfWork(false)] public async Task WmsKanbanOutPutCancel(WmsJitRequestDto input) { if (input.Guids != null && input.Guids.Count() > 0) diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOneTimeSaleOutputAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOneTimeSaleOutputAppService.cs index 3079fb60..13790ecd 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOneTimeSaleOutputAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOneTimeSaleOutputAppService.cs @@ -331,6 +331,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS /// [HttpPost] [Route("WmsKanbanOutPut-Cancel")] + [UnitOfWork(false)] public async Task WmsKanbanOutPutCancel(WmsJitRequestDto input) { if (input.Guids != null && input.Guids.Count() > 0)