From 5c0021946c88596aecaf32ed1d4168ddb14fdee0 Mon Sep 17 00:00:00 2001 From: Administrator Date: Thu, 13 Jan 2022 09:53:09 +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/WMSHQFKanbanAppService.cs | 19 +++++++++---------- .../WMS/WMSHQFSharePartAppService .cs | 4 ++-- .../Entities/WMS/WMSHQHKanbanAppService.cs | 4 ++-- .../Entities/WMS/WMSHQHSharePartAppService.cs | 4 ++-- .../Entities/WMS/WMSJitAppService.cs | 4 ++-- .../Entities/WMS/WMSKanbanAppService.cs | 4 ++-- .../Entities/WMS/WMSSharePartAppService.cs | 4 ++-- .../Entities/WMS/WmsHQMKanbanAppService.cs | 4 ++-- .../Entities/WMS/WmsHQMSharePartAppService.cs | 4 ++-- 9 files changed, 25 insertions(+), 26 deletions(-) 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 5cb2a675..d2231235 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs @@ -203,12 +203,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) @@ -224,7 +224,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts // await _job.UpdateAsync(job); // } // } - + // return ApplicationConsts.SuccessStr; ; //} @@ -253,18 +253,18 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts var _list = _excelHelper.ExcelToList(); foreach (var itm in _list) { - itm.SetData(GuidGenerator.Create(),string.Empty,!string.IsNullOrEmpty(itm.WmsBillNum)? itm.WmsBillNum:string.Empty,input.Version,GuidGenerator.Create()); + itm.SetData(GuidGenerator.Create(), string.Empty, !string.IsNullOrEmpty(itm.WmsBillNum) ? itm.WmsBillNum : string.Empty, input.Version, GuidGenerator.Create()); } _lst.AddRange(_list.ToArray()); } - + var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version).ToListAsync(); var error = from itm1 in outPutDetail join itm2 in _lst on - new { itm1.MaterialCode, itm1.Kanban,itm1.PoLine } + new { itm1.MaterialCode, itm1.Kanban, itm1.PoLine } equals - new { itm2.MaterialCode, itm2.Kanban,itm2.PoLine } + new { itm2.MaterialCode, itm2.Kanban, itm2.PoLine } select itm1; var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); if (errList.Count() == 0) @@ -318,7 +318,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts { _billNum = string.Empty; } - return ApplicationConsts.SuccessStr; ; + return ApplicationConsts.SuccessStr; ; } /// /// 出库界面功能，核准出库功能 @@ -379,7 +379,6 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( sql ); - } 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 7eae053b..9955c8ff 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs @@ -297,7 +297,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts "SELECT 'Return Value' = @return_value"; await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum,input.AccountDate)); + string.Format(sql, input.BillNum,input.AccountDate.ToShortDateString())); } } @@ -330,7 +330,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts " @accountdate = N'{2}'\n" + "SELECT 'Return Value' = @return_value"; - sql = string.Format(sql, str, input.BillNum, input.AccountDate); + sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString()); await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( sql 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 3c2899db..f030eafd 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs @@ -338,7 +338,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts " @date = N'{1}'\n" + "SELECT 'Return Value' = @return_value"; await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum, input.AccountDate) + string.Format(sql, input.BillNum, input.AccountDate.ToShortDateString()) ); @@ -374,7 +374,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts " @accountdate = N'{2}'\n" + "SELECT 'Return Value' = @return_value"; - sql = string.Format(sql, str, input.BillNum, input.AccountDate); + sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString()); await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( sql 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 f38184b2..63a83ebb 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs @@ -320,7 +320,7 @@ into temp1 " @date = N'{1}',\n"+ "SELECT 'Return Value' = @return_value"; await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum,input.AccountDate)); + string.Format(sql, input.BillNum,input.AccountDate.ToShortDateString())); } } @@ -353,7 +353,7 @@ into temp1 " @accountdate = N'{2}'\n" + "SELECT 'Return Value' = @return_value"; - sql = string.Format(sql, str, input.BillNum, input.AccountDate); + sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString()); await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( sql 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 04e7ba18..883f4515 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs @@ -415,7 +415,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts " @date = N'{1}'\n"+ "SELECT 'Return Value' = @return_value"; await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql,input.BillNum,input.AccountDate) + string.Format(sql,input.BillNum,input.AccountDate.ToShortDateString()) ); @@ -452,7 +452,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts " @accountdate = N'{2}'\n" + "SELECT 'Return Value' = @return_value"; - sql= string.Format(sql, str, input.BillNum, input.AccountDate); + sql= string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString()); await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( sql 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 90cf82d8..c740d0e6 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs @@ -394,7 +394,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts " @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.ToShortDateString())); } } @@ -428,7 +428,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts " @accountdate = N'{2}'\n" + "SELECT 'Return Value' = @return_value"; - sql = string.Format(sql, str, input.BillNum, input.AccountDate); + sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString()); await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( sql 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 00bfbcd1..4d12f682 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs @@ -318,7 +318,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts " @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.ToShortDateString())); } } @@ -352,7 +352,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts " @accountdate = N'{2}'\n" + "SELECT 'Return Value' = @return_value"; - sql = string.Format(sql, str, input.BillNum, input.AccountDate); + sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString()); await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( sql 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 5806d328..e25cbe58 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs @@ -256,7 +256,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS " @date = N'{1}'\n" + "SELECT 'Return Value' = @return_value"; await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum, input.AccountDate) + string.Format(sql, input.BillNum, input.AccountDate.ToShortDateString()) ); @@ -292,7 +292,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS " @accountdate = N'{2}'\n" + "SELECT 'Return Value' = @return_value"; - sql = string.Format(sql, str, input.BillNum, input.AccountDate); + sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString()); await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( sql 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 58518e6d..f5ca3113 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs @@ -301,7 +301,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS " @date = N'{1}',\n" + "SELECT 'Return Value' = @return_value"; await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum,input.AccountDate)); + string.Format(sql, input.BillNum,input.AccountDate.ToShortDateString())); } } @@ -334,7 +334,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS " @accountdate = N'{2}'\n" + "SELECT 'Return Value' = @return_value"; - sql = string.Format(sql, str, input.BillNum, input.AccountDate); + sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString()); await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( sql