From d246e73afcae3d00a1e41d8722c7788c1373e916 Mon Sep 17 00:00:00 2001 From: Administrator Date: Tue, 11 Jan 2022 16:55:52 +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/WMS/WMSHQFSharePartAppService .cs | 3 ++- .../Entities/WMS/WMSHQHSharePartAppService.cs | 12 +++++------- .../Entities/WMS/WMSJitAppService.cs | 2 +- .../Entities/WMS/WMSKanbanAppService.cs | 1 + .../Entities/WMS/WMSSharePartAppService.cs | 1 + .../Entities/WMS/WmsHQMSharePartAppService.cs | 3 ++- 6 files changed, 12 insertions(+), 10 deletions(-) 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 ddd01beb..97369aa8 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs @@ -295,9 +295,10 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts "EXEC @return_value = [dbo].[p_wms_output]\n" + " @billnum = N'{0}',\n" + " @type = 4\n" + + " @date = N'{1}',\n" + "SELECT 'Return Value' = @return_value"; await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum)); + string.Format(sql, input.BillNum,input.AccountDate)); } } 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 0bd7daa9..5223b322 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs @@ -137,23 +137,20 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts /// [HttpPost] [Route("WmsSharePartDetailList")] + [UnitOfWork(false)] //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] virtual public async Task> GetListAsync(WmsSharePartOutPutDetialRequestDto input) { var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true); - var totalCount = await GetCountAsync(input); var stockList = _wmsDapper.GetSalesStock(); - - - var query= from itm in entities join itm1 in stockList on itm.MaterialCode equals itm1.SapCode into temp1 from tm1 in temp1.DefaultIfEmpty() select new WmsHQHSharePartOutPutDetial( - itm.Id, + itm.Id, itm.WmsBillNum, itm.OrderBillNum, itm.MaterialCode, @@ -170,7 +167,7 @@ into temp1 itm.TaskId, itm.Remark, itm.Qty, - tm1.Qty + tm1==null?0:tm1.Qty ); @@ -315,9 +312,10 @@ into temp1 "EXEC @return_value = [dbo].[p_wms_output]\n" + " @billnum = N'{0}',\n" + " @type = 4\n" + + " @date = N'{1}',\n"+ "SELECT 'Return Value' = @return_value"; await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum)); + string.Format(sql, input.BillNum,input.AccountDate)); } } 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 5497abbd..da00e419 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs @@ -179,7 +179,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts } await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum); - if (_count == 0) + if (_count == 0 && _wmslst.Count()>0) { var _version = new WmsJitOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email); await _wmsVersionRepository.InsertAsync(_version, 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 bace842d..68cf5174 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs @@ -391,6 +391,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts "EXEC @return_value = [dbo].[p_wms_output]\n" + " @billnum = N'{0}',\n" + " @type = 1\n" + + " @date = N'{1}'\n" + "SELECT 'Return Value' = @return_value"; await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( string.Format(sql, input.BillNum)); 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 4053c24e..d247eac8 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs @@ -315,6 +315,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts "EXEC @return_value = [dbo].[p_wms_output]\n" + " @billnum = N'{0}',\n" + " @type = 2\n" + + " @date = N'{1}'\n" + "SELECT 'Return Value' = @return_value"; await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( string.Format(sql, input.BillNum)); 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 94cfd1d7..877c5f41 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs @@ -298,9 +298,10 @@ namespace Win.Sfs.SettleAccount.Entities.WMS "EXEC @return_value = [dbo].[p_wms_output]\n" + " @billnum = N'{0}',\n" + " @type = 4\n" + + " @date = N'{1}',\n" + "SELECT 'Return Value' = @return_value"; await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum)); + string.Format(sql, input.BillNum,input.AccountDate)); } }