From db3adb6cb3454cc2a6d08598f6391b064eb44e3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Wed, 20 Sep 2023 09:54:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SettleAccount.HttpApi.Host/appsettings.json | 13 +++++++++++-- .../SettleAccount.Application/Bases/BA_SERVICE.cs | 2 +- .../Entities/BQ/INVOICE_SERVICE.cs | 4 +++- .../Entities/BQ/Managers/INV_MNG.cs | 9 +++------ 4 files changed, 18 insertions(+), 10 deletions(-) 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 3f460f75..5f2bfd46 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 @@ -204,7 +204,7 @@ namespace Win.Sfs.SettleAccount.Bases PartDesc = tm == null ? string.Empty : itm.PartDesc, InvDate = itm1.CreationTime, RealInvbillNum = string.IsNullOrEmpty(itm1.RealnvBillNum) ? string.Empty : itm1.RealnvBillNum, - Version = itm.Version, + //Version = itm.Version, InvbillNum = itm.InvbillNum, InvGroupNum = itm.InvGroupNum, LU = itm.LU, 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 11c505e3..79b978b6 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 @@ -209,6 +209,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", "");//发票号 @@ -232,7 +234,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ PartDesc = tm == null ? string.Empty : itm.PartDesc, InvDate = itm1.CreationTime, RealInvbillNum = string.IsNullOrEmpty(itm1.RealnvBillNum) ? string.Empty : itm1.RealnvBillNum, - Version = itm.Version, + //Version = itm.Version, InvbillNum = itm.InvbillNum, InvGroupNum = itm.InvGroupNum, LU = itm.LU, 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..9747f1a6 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 @@ -2206,10 +2206,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, @@ -2226,13 +2224,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers endDate: detail.EndDate, partcode: detail.PartCode); entity.LineCode = detail.LineCode; - entity.SetProperty("DeliveryNumber", detail.DeliveryIndexNumber);//交货号 + entity.SetProperty("DeliveryNumber", detail.DeliveryNumber);//交货号 entity.SetProperty("VendorCode", detail.VendorCode);//供应商代码 entity.SetProperty("VendorName", detail.VendorName);//供应商名称 entity.SetProperty("PurchaseOrderNumber", "");//采购订单号 - entity.SetProperty("DeliveryIndexNumber", "");//交付索引号 - entity.SetProperty("PartName", "");//零件名称 - + entity.SetProperty("DeliveryIndexNumber", detail.DeliveryIndexNumber);//交付索引号 + entity.SetProperty("PartName", detail.PartName);//零件名称 _entityDetailList.Add(entity); } if (_entityDetailList.Count > 0)