From 0e99a2d8210cb6e46a8a7bb5b8988e5cf01f4d14 Mon Sep 17 00:00:00 2001 From: gwbvipvip Date: Mon, 18 Nov 2024 15:13:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=AF=BC=E5=87=BA=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E5=8F=AA=E6=98=BE=E7=A4=BA=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=EF=BC=8C=E5=AF=BC=E5=85=A5=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E9=BB=98=E8=AE=A4=E5=85=A8=E9=80=89=E8=A6=86?= =?UTF-8?q?=E7=9B=9620241118?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataBase/Services/GoodsService.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/BPA.SAAS.Manage.Application/DataBase/Services/GoodsService.cs b/BPA.SAAS.Manage.Application/DataBase/Services/GoodsService.cs index 9207ef6..103e5a9 100644 --- a/BPA.SAAS.Manage.Application/DataBase/Services/GoodsService.cs +++ b/BPA.SAAS.Manage.Application/DataBase/Services/GoodsService.cs @@ -2513,11 +2513,11 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services if (File.Exists(zipFolder)) File.Delete(zipFolder); await DownloadRemoteFile(recode.TemplatePath, tempFolder, recodeName); - var dic = new Dictionary { { "groupId", App.User.FindFirst(ClaimConst.GroupId)?.Value } }; - var url = App.Configuration["baseurl"] + $"api/store/getbyIdstorelist_alm?id={deviceInfo.StopId}"; - var stopInfo = JsonConvert.DeserializeObject>(HttpHelper.HttpGet(url, null, dic, "application/json")); - if (stopInfo?.data == null) - throw Oops.Oh("店铺不存在！"); + //var dic = new Dictionary { { "groupId", App.User.FindFirst(ClaimConst.GroupId)?.Value } }; + //var url = App.Configuration["baseurl"] + $"api/store/getbyIdstorelist_alm?id={deviceInfo.StopId}"; + //var stopInfo = JsonConvert.DeserializeObject>(HttpHelper.HttpGet(url, null, dic, "application/json")); + //if (stopInfo?.data == null) + // throw Oops.Oh("店铺不存在！"); var goodInfoList = new List(); if (exportDto.GoodsId.Any()) goodInfoList = await _db.Queryable().Where(t => exportDto.GoodsId.Contains(t.Id)).ToListAsync(); @@ -2653,7 +2653,7 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services UpdateGoodSheet(goodSheet); UpdateActionSheet(actionSheet); } - var filePath = Path.Combine(tempFolder, $"{goodInfo.Name}_{deviceInfo.DeviceName}_{stopInfo.data.Name}.xlsx"); + var filePath = Path.Combine(tempFolder, $"{goodInfo.Name}.xlsx"); using var stream = new FileStream(filePath, FileMode.Create, FileAccess.Write); workbook.Write(stream); }