diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json index 18cbf47d..122445cd 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json @@ -74,13 +74,22 @@ } }, - "AuthServer": { - "Authority": "http://dev.ccwin-in.com:16082", + //"Authority": "http://dev.ccwin-in.com:10580", + "Authority": "http://localhost:44378", "ClientId": "basic-web", "ClientSecret": "1q2w3e*" }, + + + + //"AuthServer": { + // "Authority": "http://dev.ccwin-in.com:16082", + // "ClientId": "basic-web", + // "ClientSecret": "1q2w3e*" + //}, + "Redis": { "Configuration": "127.0.0.1" }, diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs index 5f2bfd46..666c9ea4 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs @@ -178,7 +178,6 @@ namespace Win.Sfs.SettleAccount.Bases bj.LU = itm.LU; bj.PartCode = itm.PartCode; bj.PRICE = itm.PRICE; - bj.InvGroupNum = itm.InvGroupNum; bj.DeliveryNumber = itm.ExtraProperties["DeliveryIndexNumber"].ToSqlValue(); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs index 3c537c2d..10dc17f9 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs @@ -190,7 +190,7 @@ namespace Win.Sfs.SettleAccount.Bases } } await _repository.DbContext.BulkUpdateAsync(ls); - + var _taskid = await p_service.ExportEnqueueAsync($"{first.BusinessType.ToString()}待扣减任务", ExportExtentsion.Excel, DateTime.Now.ToString("yyyyMM"), string.Empty, CurrentUser, typeof(PendingDeductionService), customConditionList, (rs) => { }); 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 43628ecf..12433f66 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 @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; @@ -189,9 +189,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ else if (invs.FirstOrDefault().BusinessType == EnumBusinessType.BeiJian) { var B = await _wRepository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, input.SkipCount).ConfigureAwait(false); - B.OrderBy(p => p.LineCode); - List BMap = new List(); foreach (var itm in B) { @@ -201,7 +199,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ bj.PRICE = itm.PRICE; bj.InvbillNum = itm.InvbillNum; bj.InvGroupNum = itm.InvGroupNum; - bj.DeliveryNumber =itm.ExtraProperties["DeliveryIndexNumber"].ToSqlValue(); + bj.DeliveryIndexNumber =itm.ExtraProperties["DeliveryIndexNumber"].ToSqlValue(); bj.Qty = itm.Qty; bj.PRICE = itm.PRICE; bj.Amt = Math.Round(itm.PRICE * itm.Qty, 2); @@ -209,6 +207,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ bj.VendorCode = itm.ExtraProperties["VendorCode"].ToSqlValue();//供应商代码 bj.VendorName = itm.ExtraProperties["VendorName"].ToSqlValue();//供应商名称 bj.DeliveryNumber = itm.ExtraProperties["DeliveryNumber"].ToSqlValue();//交货号; + bj.BeginDate=itm.BeginDate; + bj.EndDate = itm.EndDate; //bj.DeliveryNumber = itm.GetProperty("DeliveryNumber", "");//交货号 //bj.InvbillNum = itm.GetProperty("InvoiceNumber", "");//发票号 @@ -223,32 +223,32 @@ namespace Win.Sfs.SettleAccount.Entities.BQ //var BMap = ObjectMapper.Map, List>(B); var bjquery = from itm in BMap - join itm1 in invs on itm.InvbillNum equals itm1.InvbillNum - join itm2 in materialList on itm.LU equals itm2.SettleMaterialCode into temp - from tm in temp.DefaultIfEmpty() - select - new INVOICE_WAIT_DETAIL_BJ_DTO() - { - PartDesc = tm == null ? string.Empty : itm.PartDesc, - InvDate = itm1.CreationTime, - RealInvbillNum = string.IsNullOrEmpty(itm1.RealnvBillNum) ? string.Empty : itm1.RealnvBillNum, - //Version = itm.Version, - InvbillNum = itm.InvbillNum, - InvGroupNum = itm.InvGroupNum, - LU = itm.LU, - PartCode = itm.PartCode, - PRICE = itm.PRICE, - Qty = itm.Qty, - Amt = itm.Amt, - DeliveryNumber = itm.DeliveryNumber , - VendorCode = itm.VendorCode , - VendorName = itm.VendorName , - // PurchaseOrderNumber = itm.PurchaseOrderNumber, - DeliveryIndexNumber =itm.DeliveryIndexNumber , - Extend1 = itm.Extend1, - BeginDate = itm.BeginDate, - EndDate = itm.EndDate, - }; + join itm1 in invs on itm.InvbillNum equals itm1.InvbillNum + join itm2 in materialList on itm.LU equals itm2.SettleMaterialCode into temp + from tm in temp.DefaultIfEmpty() + select + new INVOICE_WAIT_DETAIL_BJ_DTO() + { + PartDesc = tm == null ? string.Empty : itm.PartDesc, + InvDate = itm1.CreationTime, + RealInvbillNum = string.IsNullOrEmpty(itm1.RealnvBillNum) ? string.Empty : itm1.RealnvBillNum, + //Version = itm.Version, + InvbillNum = itm.InvbillNum, + InvGroupNum = itm.InvGroupNum, + LU = itm.LU, + PartCode = itm.PartCode, + PRICE = itm.PRICE, + Qty = itm.Qty, + Amt = itm.Amt, + DeliveryNumber = itm.DeliveryNumber, + VendorCode = itm.VendorCode, + VendorName = itm.VendorName, + // PurchaseOrderNumber = itm.PurchaseOrderNumber, + DeliveryIndexNumber = itm.DeliveryIndexNumber, + Extend1 = itm.Extend1, + BeginDate = itm.BeginDate, + EndDate = itm.EndDate, + }; entity.INVOICE_WAIT_DETAIL_BJ = bjquery.ToList(); } else 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 c43acf41..2b7731ce 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 @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using EFCore.BulkExtensions; @@ -151,6 +151,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs } Sync(detailist, EnumDeliverBjBmpBillType.JIT直供件, email, isout == "out" ? true : false); } + + + return id.ToString(); } //public List GetPagedData(List dataList, int pageNumber, int pageSize) 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 2d33cc93..3428bb99 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 @@ -1403,7 +1403,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers ); string site = dtos.Where(p => !string.IsNullOrEmpty(p.Site)).FirstOrDefault().Site; string clientCode = string.Empty; - switch (site) { case "1040": @@ -1434,7 +1433,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers await _repository.DbContext.BulkInsertAsync(invlist).ConfigureAwait(false); await _repository.DbContext.BulkInsertAsync(groupList).ConfigureAwait(false); await _repository.DbContext.BulkInsertAsync(detailList).ConfigureAwait(false); - if (adjlist.Count > 0) { await _repository.DbContext.BulkUpdateAsync(adjlist).ConfigureAwait(false); @@ -1673,7 +1671,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers { detailList.AddRange(_entityDetailList); } - if (p_first == true) { var notsettle = _nothbpoRepository.Where(p => p.SettleBillNum == p_InvGroupNum);//一次开票时查找不可结数据，追加需求 @@ -2206,10 +2203,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers groupList.AddRange(mapList); } List _entityDetailList = new List(); - foreach (var detail in query.ToList()) { - var entity = new INVOICE_WAIT_DETAIL( guid: GuidGenerator.Create(), version: p_version, @@ -2225,14 +2220,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers beginDate: detail.BeginDate, endDate: detail.EndDate, partcode: detail.PartCode); - entity.LineCode = detail.LineCode; - entity.SetProperty("DeliveryNumber", detail.DeliveryIndexNumber);//交货号 - entity.SetProperty("VendorCode", detail.VendorCode);//供应商代码 - entity.SetProperty("VendorName", detail.VendorName);//供应商名称 - entity.SetProperty("PurchaseOrderNumber", "");//采购订单号 - entity.SetProperty("DeliveryIndexNumber", "");//交付索引号 - entity.SetProperty("PartName", "");//零件名称 - + entity.LineCode = detail.LineCode; + entity.SetProperty("DeliveryNumber", detail.DeliveryNumber);//交货号 + entity.SetProperty("VendorCode", detail.VendorCode);//供应商代码 + entity.SetProperty("VendorName", detail.VendorName);//供应商名称 + entity.SetProperty("PurchaseOrderNumber", "");//采购订单号 + entity.SetProperty("DeliveryIndexNumber", detail.DeliveryIndexNumber);//交付索引号 + entity.SetProperty("PartName", detail.PartName);//零件名称 _entityDetailList.Add(entity); } if (_entityDetailList.Count > 0)