From ec109960795c5bc08420320bf9d95e2f7f69cda1 Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 8 Aug 2025 10:21:37 +0800 Subject: [PATCH] 0 --- Models/K3Request/ReportDataParam.cs | 4 ++-- ScheduleService/SaleOrderReceiveAmount.cs | 25 ++++++++++++++++------- Services/SaleOrderService.cs | 14 +++++++------ Utils/LogUtil.cs | 4 ++-- 4 files changed, 30 insertions(+), 17 deletions(-) diff --git a/Models/K3Request/ReportDataParam.cs b/Models/K3Request/ReportDataParam.cs index 64b39ce..ac3eb11 100644 --- a/Models/K3Request/ReportDataParam.cs +++ b/Models/K3Request/ReportDataParam.cs @@ -23,8 +23,8 @@ namespace GZ_LTHPilot_ORDER.Models.K3Request public class Model { public string FSaleOrgList { get; set; } - public DateTime FSoFromDate { get; set; } - public DateTime FSoToDate { get; set; } + public string FSoFromDate { get; set; } + public string FSoToDate { get; set; } public string FSaleOFrom { get; set; } public string FSaleOTo { get; set; } diff --git a/ScheduleService/SaleOrderReceiveAmount.cs b/ScheduleService/SaleOrderReceiveAmount.cs index ffc7fb5..7ce2be8 100644 --- a/ScheduleService/SaleOrderReceiveAmount.cs +++ b/ScheduleService/SaleOrderReceiveAmount.cs @@ -1,4 +1,5 @@ using DocumentFormat.OpenXml.Bibliography; +using Gatedge.Enpower.BOS.PlugIn.Utils; using GZ_LTHPilot_ORDER.Models.VO; using GZ_LTHPilot_ORDER.Service; using GZ_LTHPilot_ORDER.Services; @@ -10,6 +11,7 @@ using Kingdee.BOS.ServiceHelper; using Kingdee.BOS.Util; using Kingdee.BOS.WebApi.FormService; using Kingdee.K3.FIN.App.Core.Match.Object; +using Newtonsoft.Json; using NPOI.SS.Formula.Functions; using System; using System.Collections.Generic; @@ -27,12 +29,21 @@ namespace GZ_LTHPilot_ORDER.ScheduleService int Cycle = 12; public void Run(Context ctx, Schedule schedule) { - TempTableService tempTableService = new TempTableService(ctx); - OrgService orgService = new OrgService(ctx); - SaleOrderService saleOrderService = new SaleOrderService(ctx); + var ctxString = JsonConvert.SerializeObject(ctx); + Context newCtx = DataCenterService.GetDataCenterContextByID(ctx.DBId); + newCtx.UserId = 131409; //服务操作用户暂时记为Administrator + newCtx.UserName = "ERP6"; + newCtx.ServiceType = WebType.WebSite; + newCtx.CurrentOrganizationInfo.ID = 1; + + LogUtil.Log("UserContext", ctxString); + + TempTableService tempTableService = new TempTableService(newCtx); + OrgService orgService = new OrgService(newCtx); + SaleOrderService saleOrderService = new SaleOrderService(newCtx); var orgList = orgService.GetOrgList(); var tableName = tempTableService.CreateTempTable(); - CreateTempTable(ctx, tableName); + CreateTempTable(newCtx, tableName); var advanceAays = GetAdvanceAays(schedule); var planStartDate = DateTime.Now; Dictionary orgDict = new Dictionary(); @@ -55,14 +66,14 @@ namespace GZ_LTHPilot_ORDER.ScheduleService var receiveAmountList = saleOrderService.GetSaleOrderReceiveAmountByDate(saleOrgIds, startDate, endDate); if (receiveAmountList.Count > 0) { - InsertDataToTempTable(ctx, tableName, orgDict, receiveAmountList); + InsertDataToTempTable(newCtx, tableName, orgDict, receiveAmountList); } startDate = startDate.AddMonths(Cycle); endDate = startDate.AddMonths(Cycle); } - - UpdateSaleOrderReceiveAmount(ctx, tableName); + + UpdateSaleOrderReceiveAmount(newCtx, tableName); tempTableService.DropTempTable(tableName); } diff --git a/Services/SaleOrderService.cs b/Services/SaleOrderService.cs index cad858b..aee4dbe 100644 --- a/Services/SaleOrderService.cs +++ b/Services/SaleOrderService.cs @@ -137,8 +137,8 @@ WHERE Model = new Model() { FSaleOrgList = orgId, - FSoFromDate = date.AddDays(-30), - FSoToDate = date.AddDays(30), + FSoFromDate = date.AddDays(-30).ToString("yyyy-MM-dd HH:mm:ss"), + FSoToDate = date.AddDays(30).ToString("yyyy-MM-dd HH:mm:ss"), FSaleOFrom = billNo, FSaleOTo = billNo, FFormCloseStatus = "ALL", @@ -154,7 +154,8 @@ WHERE FIncludedFree = true } }; - var paramString = JsonConvert.SerializeObject(param); + var jsonSetting = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }; + var paramString = JsonConvert.SerializeObject(param, Formatting.Indented, jsonSetting); var resultDict = WebApiServiceCall.GetSysReportData(this.ctx, "SAL_DetailReport", paramString); var resultString = JsonConvert.SerializeObject(resultDict); var result = JsonConvert.DeserializeObject>(resultString); @@ -202,8 +203,8 @@ WHERE Model = new Model() { FSaleOrgList = orgId, - FSoFromDate = startDate, - FSoToDate = endDate, + FSoFromDate = startDate.ToString("yyyy-MM-dd HH:mm:ss"), + FSoToDate = endDate.ToString("yyyy-MM-dd HH:mm:ss"), FFormCloseStatus = "ALL", FFormStatus = "ALL", FPriceFrom = "SALORDERBILL", @@ -217,7 +218,8 @@ WHERE FIncludedFree = true } }; - var paramString = JsonConvert.SerializeObject(param); + var jsonSetting = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }; + var paramString = JsonConvert.SerializeObject(param, Formatting.Indented, jsonSetting); LogUtil.Log("paramString", paramString); var resultDict = WebApiServiceCall.GetSysReportData(this.ctx, "SAL_DetailReport", paramString); var resultString = JsonConvert.SerializeObject(resultDict); diff --git a/Utils/LogUtil.cs b/Utils/LogUtil.cs index 125563e..fa2ea13 100644 --- a/Utils/LogUtil.cs +++ b/Utils/LogUtil.cs @@ -32,8 +32,8 @@ namespace Gatedge.Enpower.BOS.PlugIn.Utils { var dateTime = DateTime.Now; var fileName = "\\KD_Gatedge_" + dateTime.ToString("yyyy-MM-dd_HH-mm-ss") + ".log"; - return "\\" + string.Empty; - //return fileName; + //return "\\" + string.Empty; + return fileName; }