From 5678fe446af56ede074c13b856d95a6cac01d962 Mon Sep 17 00:00:00 2001 From: Administrator Date: Tue, 5 Jul 2022 14:51:14 +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/WMSJitAppService.cs | 6 ++++-- .../Report/SettledPartAndErpPartPriceDiffRepository.cs | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) 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 bb0c50f9..81c5750b 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs @@ -153,7 +153,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts var _ls1 = _lst.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList(); - var outPutDetail = await _wmsRepository.Where(p => p.Version == version && p.State!=4).ToListAsync(); + var outPutDetail = await _wmsRepository.Where(p => p.Version == version && p.State!=4).Select(p=>new {MaterialCode=p.MaterialCode,KennCode=p.KennCode,ChassisNumber=p.ChassisNumber,BillNum=p.BillNum ,Qty=p.Qty}) + .ToListAsync(); var error = from itm1 in outPutDetail @@ -437,7 +438,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts _lst.AddRange(_lsCopy.ToArray()); } var _ls1 = _lst.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList(); - var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.State != 4 ).ToListAsync(); + var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.State != 4 ).Select(p => new { MaterialCode = p.MaterialCode, KennCode = p.KennCode, ChassisNumber = p.ChassisNumber, BillNum = p.BillNum, Qty = p.Qty }) + .ToListAsync(); var error = from itm1 in outPutDetail join itm2 in _ls1 on diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettledPartAndErpPartPriceDiffRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettledPartAndErpPartPriceDiffRepository.cs index d2028025..41e11874 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettledPartAndErpPartPriceDiffRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettledPartAndErpPartPriceDiffRepository.cs @@ -97,7 +97,7 @@ namespace Win.Sfs.SettleAccount.Repository.Report { string sqlString = - "select\n" + +"select\n" + "a.ErpMaterialCode,\n" + "isnull(d.materialCode,\n" + "SettleMaterialCode) MaterialCode,\n" + @@ -138,7 +138,6 @@ namespace Win.Sfs.SettleAccount.Repository.Report "where\n" + "b.MaterialCode is null\n"; string _sql = string.Format(sqlString, version, customcode); - var _query = DbConnection.Query(_sql, null, null, true, 1200, null); //var _query = _db.Query(); return _query.ToList();