From 32f9785ea0fa408e37284b3d6d8ad0a0621f84bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Tue, 14 Nov 2023 10:45:21 +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/BQ/INVOICE_SERVICE.cs | 4 ++++ .../BQ/Syncs/PendingDeductionService.cs | 23 ++++++++++--------- .../Entities/BQ/Managers/INV_MNG.cs | 11 +++++---- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs index 6688484a..731a8a80 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs @@ -367,6 +367,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ var dtos = ObjectMapper.Map, List>(entitys); foreach (var itm in dtos) { + if(DateTime.Parse(itm.CreationTime) == DateTime.MinValue) + { + itm.CreationTime = string.Empty; + } itm.TaxAmtDiff = itm.TaxAmt + itm.TaxDiff; } return new PagedResultDto(totalCount, dtos); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs index 754c71fe..00859bed 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs @@ -197,7 +197,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs // return pageCount; //} [UnitOfWork(false)] - public void Sync(List p_ls, EnumDeliverBjBmpBillType bussinessType, string p_email, bool flag = true) where T : PD_BASE, new() + public void Sync(List p_ls, EnumDeliverBjBmpBillType bussinessType, string p_email, bool flag = true) + where T : PD_BASE, new() { var query = from itm in p_ls select new VmiLog() @@ -236,16 +237,16 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs // 执行批量数据操作 if (ls != null && ls.Count > 0) { - var messagelist = new List(); - foreach (var item in ls) - { - var message = new VmiMessage - { - Message = System.Text.Json.JsonSerializer.Serialize(item), - }; - messagelist.Add(message); - } - _dbcontext.BulkInsert(messagelist); + //var messagelist = new List(); + //foreach (var item in ls) + //{ + // var message = new VmiMessage + // { + // Message = System.Text.Json.JsonSerializer.Serialize(item), + // }; + // messagelist.Add(message); + //} + // _dbcontext.BulkInsert(messagelist); _dbcontext.BulkInsert(ls, new BulkConfig() { }); var billList = p_ls.Select(p => p.BillNum).Distinct().ToList();//同步数据的发票号 var pdList = _dbcontext.Set().Where(p => billList.Contains(p.BillNum)).ToList();//扣减单内容 diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs index fe40ef52..eb003c42 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs @@ -123,7 +123,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers return false; } - return false; + // return false; } @@ -1180,6 +1180,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers realAmt: readAmt ); invbill.ClientCode = clientCode; + invbill.CreationTime = DateTime.MinValue; invbill.Site = dtos.FirstOrDefault().Site; invlist.Add(invbill); } @@ -1481,7 +1482,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers } invbill.ClientCode = clientCode; invbill.Site = dtos.FirstOrDefault().Site; - invbill.CreationTime = DateTime.Now; + invbill.CreationTime =DateTime.MinValue; invlist.Add(invbill); i++; } @@ -1828,7 +1829,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers realAmt: realAmt ); invbill.Site = dtos.FirstOrDefault().Site; - invbill.CreationTime = DateTime.Now; + invbill.CreationTime = DateTime.MinValue; invlist.Add(invbill); } await _repository.DbContext.BulkInsertAsync(invlist).ConfigureAwait(false); @@ -2045,7 +2046,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers ); invbill.Site = dtos.FirstOrDefault().Site; invbill.ClientCode = clientCode; - invbill.CreationTime = DateTime.Now; + invbill.CreationTime = DateTime.MinValue; invlist.Add(invbill); } await _repository.DbContext.BulkInsertAsync(invlist).ConfigureAwait(false); @@ -2371,7 +2372,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers realAmt: realAmt ); invbill.Site = "1049"; - invbill.CreationTime = DateTime.Now; + invbill.CreationTime = DateTime.MinValue; invbill.ClientCode = "C001"; invlist.Add(invbill); }