From 84dff68b8e1a764a0b7743a4594edf78325c0fe4 Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 11 Feb 2022 10:46:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/WMS/WmsHQKBOutputAppService.cs | 24 +++++++++---------- ...nvoiceSettledDetailDiffDapperRepository.cs | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) 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 ebf449ed..bfeebf8b 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs @@ -293,18 +293,18 @@ namespace Win.Sfs.SettleAccount.Entities.WMS { _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync(); } - _ls = _ls.Where(p => p.SockQty < p.OutputQty || p.Qty < p.OutputQty).ToList(); - var checkList = new List(); - - foreach (var itm in _ls) - { - checkList.Add(new ErrorExportDto() { Message = string.Format("物料号:{0}出库数量大于结算数量或寄售库存数量!",itm.SapMaterialCode) }); - } - if (checkList.Count > 0) - { - - return await ExportErrorReportAsync(checkList,"校验失败.xlsx"); - } + //_ls = _ls.Where(p => p.SockQty < p.OutputQty || p.Qty < p.OutputQty).ToList(); + //var checkList = new List(); + + //foreach (var itm in _ls) + //{ + // checkList.Add(new ErrorExportDto() { Message = string.Format("物料号:{0}出库数量大于结算数量或寄售库存数量!",itm.SapMaterialCode) }); + //} + //if (checkList.Count > 0) + //{ + + // return await ExportErrorReportAsync(checkList,"校验失败.xlsx"); + //} if (_ls.Count() > 0) { diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDetailDiffDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDetailDiffDapperRepository.cs index 94caaf85..2f734afb 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDetailDiffDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDetailDiffDapperRepository.cs @@ -62,7 +62,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report string tablestr = (_count == 0) ? " ( SELECT * FROM Set_Settle b WHERE b.Version = '{0}' ) b\n" : - " (SELECT count(1) lincount FROM [Set_Settle_RAM] WITH(SNAPSHOT) where Version = '{0}') b \n"; + " (SELECT * FROM [Set_Settle_RAM] WITH(SNAPSHOT) where Version = '{0}') b \n";