From 4dbf884692a40733ec3bc129ca88adb7f9e342fb Mon Sep 17 00:00:00 2001 From: Administrator Date: Wed, 26 Jan 2022 13:57:52 +0800 Subject: [PATCH 1/3] =?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 --- .../Report/UnInvoiceSettledDetailDiffExportService.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs index 26159d1d..1c03117d 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs @@ -190,9 +190,7 @@ namespace SettleAccount.Job.Services .Append(report1List, "按物料价格差异明细表") .SeparateBySheet() .Append(report2List.ToList(), "差异汇总验证表") - - .ExportAppendDataAsByteArray(); - + .ExportAppendDataAsByteArray(); result.ShouldNotBeNull(); _fileContainer.SaveAsync(_filename, result.Result, true); From b8b58a9da729e58369730c886219a21faea290b9 Mon Sep 17 00:00:00 2001 From: Administrator Date: Wed, 26 Jan 2022 14:47:54 +0800 Subject: [PATCH 2/3] =?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/WMSSharePart90AppService.cs | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) 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 9836266f..1c88919d 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs @@ -496,6 +496,33 @@ namespace Win.Sfs.SettleAccount.Entities.WMS return ApplicationConsts.SuccessStr; } + public async Task CheckIsOutPut(List p_list) + { + if (p_list.Count() > 0) + { + var entity= p_list.FirstOrDefault(); + var day = entity.OrderBillNum.Right(3); + int _count = 0; + if (day == "D60") + { + _count= _wmsRepository.Count(p => p.Version == entity.Version && p.OrderBillNum.Contains("D30") && p.State!=2); + } + if (day == "D90") + { + _count = _wmsRepository.Count(p => p.Version == entity.Version && p.State != 2 && (p.OrderBillNum.Contains("D60") || p.OrderBillNum.Contains("D30"))); + } + if (_count > 0) + { + return false; + } + } + return true; + + } + + + + } } From 66c912895aacb7b65297020eb4276b670f5e8a2b Mon Sep 17 00:00:00 2001 From: Administrator Date: Wed, 26 Jan 2022 15:12:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/WMS/WMSSharePart90AppService.cs | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) 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 1c88919d..7de0cad4 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs @@ -496,7 +496,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS return ApplicationConsts.SuccessStr; } - public async Task CheckIsOutPut(List p_list) + private async Task CheckIsOutPut(List p_list) { if (p_list.Count() > 0) { @@ -520,8 +520,21 @@ namespace Win.Sfs.SettleAccount.Entities.WMS } + public async Task> GetBillList(string version) + { + var _list=_wmsRepository.Where(p => p.Version == version && p.State != 2 + && (p.OrderBillNum.Contains("D60") + || p.OrderBillNum.Contains("D30") + || p.OrderBillNum.Contains("D90"))).Select(p=>p.OrderBillNum).Distinct().ToList(); + return _list; + + } + + + + + - }