From b484ce5490b09bb17f6d9940e52c05764613c5a2 Mon Sep 17 00:00:00 2001 From: yuyubo <1870149533@qq.com> Date: Mon, 17 Nov 2025 14:36:57 +0800 Subject: [PATCH 1/2] 12 --- .../KingDee/SaveModel/SalesReturnModel.cs | 2 + .../JackYun/TradeFullinfogetResp.cs | 8 ++-- .../Implementation/KingDeeService.cs | 1 - .../MyCode.Project.ScheduleTask/App.config | 47 +++++-------------- .../MyCode.Project.ScheduleTask/JobConfig.xml | 2 +- .../Implementation/JackYunService.cs | 2 +- .../Implementation/JackYunTaskService.cs | 4 +- .../Implementation/SalesOutboundService.cs | 23 +++++++-- .../Implementation/SalesReturnService.cs | 15 +++++- .../Implementation/WMSService.cs | 3 +- Reportapi/MyCode.Project.WebApi/Web.config | 44 ++++++++--------- 11 files changed, 80 insertions(+), 71 deletions(-) diff --git a/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/SalesReturnModel.cs b/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/SalesReturnModel.cs index a1f216a..5c0fa41 100644 --- a/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/SalesReturnModel.cs +++ b/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/SalesReturnModel.cs @@ -6,6 +6,8 @@ namespace MyCode.Project.Domain.Message.Request.KingDee.SaveModel public class SalesReturnModel { public int? FID { get; set; } + + public string FBillNo { get; set; } public FBillTypeID FBillTypeID { get; set; } public string FDate { get; set; } public FSaleOrgId FSaleOrgId { get; set; } diff --git a/Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs b/Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs index 9d3f385..1a85cb7 100644 --- a/Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs +++ b/Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs @@ -143,10 +143,10 @@ namespace MyCode.Project.Infrastructure.JackYun /// /// public string mainPostid { get; set; } - /// - /// 组合装子件列表 - /// - public List tradeOrderAssemblyGoodsDtoList { get; set; } + ///// + ///// 组合装子件列表 + ///// + //public List tradeOrderAssemblyGoodsDtoList { get; set; } /// /// 珠海市臻美服饰有限公司 /// diff --git a/Reportapi/MyCode.Project.OutSideService/Implementation/KingDeeService.cs b/Reportapi/MyCode.Project.OutSideService/Implementation/KingDeeService.cs index 8d54fe3..c0ea25f 100644 --- a/Reportapi/MyCode.Project.OutSideService/Implementation/KingDeeService.cs +++ b/Reportapi/MyCode.Project.OutSideService/Implementation/KingDeeService.cs @@ -83,7 +83,6 @@ namespace MyCode.Project.OutSideService.Implementation - #region 保存一个订单对象 /// /// 保存一个订单对象 diff --git a/Reportapi/MyCode.Project.ScheduleTask/App.config b/Reportapi/MyCode.Project.ScheduleTask/App.config index e41e089..91ef700 100644 --- a/Reportapi/MyCode.Project.ScheduleTask/App.config +++ b/Reportapi/MyCode.Project.ScheduleTask/App.config @@ -12,58 +12,35 @@ - - - - - - - + + + - + + - - - - - + - - - - - + - - - + - - - + - - - - - - - - - - + diff --git a/Reportapi/MyCode.Project.ScheduleTask/JobConfig.xml b/Reportapi/MyCode.Project.ScheduleTask/JobConfig.xml index 81d3afb..8250a10 100644 --- a/Reportapi/MyCode.Project.ScheduleTask/JobConfig.xml +++ b/Reportapi/MyCode.Project.ScheduleTask/JobConfig.xml @@ -2,7 +2,7 @@ - + - + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + 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 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=93=E5=8D=95?= =?UTF-8?q?=E7=B1=BB=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") {