From 3baaae83fd7687d11233444bd80445214c8c17b6 Mon Sep 17 00:00:00 2001 From: yuyubo <1870149533@qq.com> Date: Tue, 18 Nov 2025 11:02:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=93=E5=8D=95=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyCode.Project.Repositories/JackOrdersItemRepository.cs | 2 +- .../MyCode.Project.Services/Implementation/JackYunService.cs | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Reportapi/MyCode.Project.Repositories/JackOrdersItemRepository.cs b/Reportapi/MyCode.Project.Repositories/JackOrdersItemRepository.cs index c11fd25..5717ea4 100644 --- a/Reportapi/MyCode.Project.Repositories/JackOrdersItemRepository.cs +++ b/Reportapi/MyCode.Project.Repositories/JackOrdersItemRepository.cs @@ -35,7 +35,7 @@ namespace MyCode.Project.Repositories FROM [JackOrders] a WITH (NOLOCK) LEFT JOIN [dbo].[JackOrdersItem] b WITH (NOLOCK) ON a.id = b.JackOrdersId -WHERE a.status = 0 and TradeType in (1,7) and sellCount <> 0 +WHERE a.status = 0 and TradeType in (1,5,7) and sellCount <> 0 GROUP BY [shopCode],[shopName], [shopId], [warehouseName], [warehouseCode], [status], CONVERT(NVARCHAR(30),[consignTime],23) ,[goodsNo], [goodsId], [barcode] ,[warehouseId], [TradeType],Unit"; var list = this.SelectList(sql); return list; diff --git a/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs b/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs index 7c0c13a..f3baf31 100644 --- a/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs +++ b/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs @@ -95,15 +95,16 @@ namespace MyCode.Project.Services.Implementation TradeTypeList.Add(1); TradeTypeList.Add(7); TradeTypeList.Add(8); + TradeTypeList.Add(5); List trades = new List(); TradeTypeList.ForEach(ty => { requestBizData.TradeType = ty; string lggl = JsonHelper.ToJson(requestBizData); - LogHelper.Info(lggl); + LogHelper.Info("TradeType:==" + ty.ToString() + " " + lggl); JackyunResponse response = Call(EnumAttribute.GetAttribute(ApiEnum.TRADEFULLINFOGET).Value, "1.0", requestBizData); string ll = JsonHelper.ToJson(response); - LogHelper.Info(ll); + LogHelper.Info("TradeType:=="+ ty.ToString() + " "+ll); if (response.code == "200") {