From 143fd88cf38e9fe339502ea1b9c4a86237512142 Mon Sep 17 00:00:00 2001 From: zhaoxinyu <89237069@qq.com> Date: Tue, 30 Jul 2024 17:00:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SettleAccountHttpApiHostModule.cs | 2 +- .../BQ/Syncs/GenerateJisInvoiceService.cs | 2 -- .../Entities/BQ/VmiAppService.cs | 18 ++++-------------- .../Entities/BQ/SHIP_REC_SUM.cs | 1 + .../SettleAccount.Domain/EnumBusinessType.cs | 3 --- 5 files changed, 6 insertions(+), 20 deletions(-) diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccountHttpApiHostModule.cs b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccountHttpApiHostModule.cs index 5f8b4a5c..f0b9b321 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccountHttpApiHostModule.cs +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccountHttpApiHostModule.cs @@ -78,7 +78,7 @@ namespace Win.Sfs.SettleAccount var configuration = context.Services.GetConfiguration(); //文件上传大小限制 - ConfigureBodyLengthLimit(context); + ConfigureBodyLengthLimit(context); //配置多租户 ConfigureMultiTenancy(); //配置认证 diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/GenerateJisInvoiceService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/GenerateJisInvoiceService.cs index 480304e3..b57f8024 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/GenerateJisInvoiceService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/GenerateJisInvoiceService.cs @@ -1172,8 +1172,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs itm.CreationTime = DateTime.Now; } _dbcontext.BulkInsert(detailext); - - } _dbcontext.BulkInsert(invlist); _dbcontext.BulkInsert(groupList); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs index d2a57a51..9e082e3e 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs @@ -1581,16 +1581,16 @@ namespace Win.Sfs.SettleAccount.Entities.BQ "isnull([150],0) RETQty,\n" + "isnull([200],0) CANQty,\n" + "isnull([800],0) NOTQty,\n" + - "case when ISNULL([10],0)+isnull([20],0)+isnull([100],0)+ISNULL([150],0)-ISNULL([200],0)=0 then ISNULL([100],0)\n" + + "case when ISNULL([10],0)+isnull([20],0)+isnull([100],0)+ISNULL([150],0)-ISNULL([200],0)=0 then ISNULL([10],0)+isnull([20],0)+isnull([100],0)+ISNULL([150],0)-ISNULL([200],0)\n" + "when ISNULL([10], 0) + isnull([20], 0) + isnull([100], 0) + ISNULL([150], 0) - ISNULL([200], 0) = ISNULL([10], 0) + isnull([20], 0) + isnull([100], 0) + ISNULL([150], 0) then 0\n"+ "ELSE 0 END SE_SA_CAN_QTY,\n" + - "case when ISNULL([10],0)+isnull([20],0)+isnull([100],0)+ISNULL([150],0)-ISNULL([800],0)=0 then ISNULL([100],0)\n" + + "case when ISNULL([10],0)+isnull([20],0)+isnull([100],0)+ISNULL([150],0)-ISNULL([800],0)=0 then ISNULL([10],0)+isnull([20],0)+isnull([100],0)+ISNULL([150],0)\n" + "when ISNULL([10], 0) + isnull([20], 0) + isnull([100], 0) + ISNULL([150], 0) - ISNULL([800], 0) = ISNULL([10], 0) + isnull([20], 0) + isnull([100], 0) + ISNULL([150], 0) then 0\n"+ "ELSE 0 END SE_SA_NOT_QTY,\n" + "case when ISNULL([10],0)+isnull([20],0)+isnull([100],0)+ISNULL([150],0)-ISNULL([200],0)-ISNULL([800],0)>0 then ISNULL([100],0)\n" + "ElSE 0 END SE_SA_DIFF_QTY,\n" + - "case when ISNULL([10],0)+isnull([20],0)+isnull([100],0)+ISNULL([150],0)-ISNULL([200],0)-ISNULL([800],0)=isnull([100],0)+ISNULL([150],0) then \n" + - "ISNULL([10],0)+isnull([20],0)+isnull([100],0)+ISNULL([150],0)-ISNULL([200],0)-ISNULL([800],0)\n" + + "case when ISNULL([10],0)+isnull([20],0)+isnull([100],0)+ISNULL([150],0)-ISNULL([200],0)-ISNULL([800],0)=ISNULL([10],0)+isnull([20],0)+isnull([100],0)+ISNULL([150],0) then \n" + + "ISNULL([10],0)+isnull([20],0)+isnull([100],0)+ISNULL([150],0)\n" + "ElSE 0 END ONLY_SE_QTY,\n" + "case when ISNULL([10],0)+isnull([20],0)+isnull([100],0)+ISNULL([150],0)-ISNULL([200],0)-ISNULL([800],0)=-ISNULL([200],0)-ISNULL([800],0) then \n" + "ISNULL([200],0)+ISNULL([800],0) \n" + @@ -1780,14 +1780,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ public async Task GetReceiveShipSum(RequestDto input) { - - var sebegin= input.Filters.Any(p => p.Column == "sebegin")? input.Filters.FirstOrDefault(p => p.Column == "sebegin").Value : ""; var seend = input.Filters.Any(p => p.Column == "seend")? input.Filters.FirstOrDefault(p => p.Column == "seend").Value : ""; var sabegin = input.Filters.Any(p => p.Column == "sabegin")? input.Filters.FirstOrDefault(p => p.Column == "sabegin").Value : ""; var saend = input.Filters.Any(p => p.Column == "saend")? input.Filters.FirstOrDefault(p => p.Column == "saend").Value : ""; var parcode = input.Filters.Any(p => p.Column == "partCode")? input.Filters.FirstOrDefault(p => p.Column == "partCode").Value : ""; - List list = new List(); list.Add(EnumBusinessType.JisBBAC); list.Add(EnumBusinessType.JisHBPO); @@ -1820,14 +1817,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ { entities = entities.Where(p => p.PartCode == parcode).ToList(); } - - - await _recRepository.DbContext.BulkInsertAsync(entities).ConfigureAwait(false); - - - - IExporter _csv = new CsvExporter(); IExporter _excel = new ExcelExporter(); byte[] result = null; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/SHIP_REC_SUM.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/SHIP_REC_SUM.cs index 01bde88b..216f14e9 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/SHIP_REC_SUM.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/SHIP_REC_SUM.cs @@ -29,6 +29,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ [Display(Name = "不可结数量")] public string NOTQty { set; get; } [Display(Name = "有发有结有价格数量")] + public string SE_SA_CAN_QTY { set; get; } [Display(Name = "有发有结无价格数量")] public string SE_SA_NOT_QTY { set; get; } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/EnumBusinessType.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/EnumBusinessType.cs index a86c2d07..ff5c9828 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/EnumBusinessType.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/EnumBusinessType.cs @@ -27,9 +27,6 @@ namespace Win.Sfs.SettleAccount /// [Display(Name = "直供件BBAC")] ZhiGongJianBBAC = 3, - - - /// /// 直供件HBPO ///