From de8447becebd472c382f0fec34faab7bdad6c29f Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Mon, 28 Jul 2025 17:28:21 +0800
Subject: [PATCH] 111

---
 .../MyCode.Project.ScheduleTask/JobConfig.xml |  4 +--
 .../Implementation/JackYunService.cs          | 10 +++++--
 .../Implementation/JackYunTaskService.cs      |  5 ++--
 .../Implementation/WMSService.cs              |  2 +-
 .../Controllers/TestController.cs             | 28 +++++++++----------
 5 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/Reportapi/MyCode.Project.ScheduleTask/JobConfig.xml b/Reportapi/MyCode.Project.ScheduleTask/JobConfig.xml
index 110b563..242f042 100644
--- a/Reportapi/MyCode.Project.ScheduleTask/JobConfig.xml
+++ b/Reportapi/MyCode.Project.ScheduleTask/JobConfig.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Jobs>
 	<job name="EveryTimeJob"  desc="定时执行的调度"  enabled="true"  type="MyCode.Project.ScheduleTask.Jobs.EveryJob,MyCode.Project.ScheduleTask" CronExpression="*/10 * * * * ?" runonce="false"/>
-	<job name="AddOrderJob"  desc="添加抓单的调度"  enabled="true"  type="MyCode.Project.ScheduleTask.Jobs.AddOrderJob,MyCode.Project.ScheduleTask" CronExpression="*/10 * * * * ?" runonce="false"/>
+	<job name="AddOrderJob"  desc="添加抓单的调度"  enabled="true"  type="MyCode.Project.ScheduleTask.Jobs.AddOrderJob,MyCode.Project.ScheduleTask" CronExpression="0 0 3 * * ?" runonce="false"/>
  </Jobs>
 <!--
   <job name="CalOrderMoreThan500Job"  desc="计算消费超过500"  enabled="true"  type="MyCode.Project.ScheduleTask.Jobs.CalOrderMoreThan500Job,MyCode.Project.ScheduleTask" CronExpression="*/10 * * * * ?" runonce="false" />
-  <job name="AnsyLxmBaseDataJob" desc="同步流行美基础资料任务" enabled="true" type="MyCode.Project.ScheduleTask.Jobs.AnsyLxmBaseDataJob,MyCode.Project.ScheduleTask" CronExpression="0 0 1 * * ?" runonce="false" />
   <job name="AnsyLxmDataJob"  desc="自动同步MSSQL到MYSQL"  enabled="true"  type="MyCode.Project.ScheduleTask.Jobs.AnsyLxmDataJob,MyCode.Project.ScheduleTask" CronExpression="*/20 * * * * ?" runonce="false" />
   <job name="QueueJob"  desc="定时执行的调度"  enabled="true"  type="MyCode.Project.ScheduleTask.Jobs.QueueJob,MyCode.Project.ScheduleTask"  CronExpression="*/1 * * * * ?" runonce="false" />
-  <job name="AnsyLxmHasGiftJob"  desc="补充赠品到LxmSheetMore"  enabled="true"  type="MyCode.Project.ScheduleTask.Jobs.AnsyLxmHasGiftJob,MyCode.Project.ScheduleTask" CronExpression="*/50 * * * * ?" runonce="false" />
   <job name="AnsyLxmServiceOrderJob"  desc="同步服务次数"  enabled="true"  type="MyCode.Project.ScheduleTask.Jobs.AnsyLxmServiceOrderJob,MyCode.Project.ScheduleTask" CronExpression="*/5 * * * * ?" runonce="false" />
   <job name="AnsyLxmUseDaysJob"  desc="自动同步使用天数MSSQL到MYSQL"  enabled="true"  type="MyCode.Project.ScheduleTask.Jobs.AnsyLxmUseDaysJob,MyCode.Project.ScheduleTask" CronExpression="*/30 * * * * ?" runonce="false" />
   <job name="WebSocketJob" desc="WebSocket任务" enabled="true" type="MyCode.Project.ScheduleTask.Jobs.WebSocketJob,MyCode.Project.ScheduleTask" CronExpression="*/1 * * * * ?" runonce="true" />
diff --git a/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs b/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs
index 733e26f..39f4c64 100644
--- a/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs
+++ b/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs
@@ -19,7 +19,7 @@ namespace MyCode.Project.Services.Implementation
             _yTKJTShopParameterRepository = yTKJTShopParameterRepository;
         }
 
-        DateTime startTime = DateTime.Parse("2025-06-01");
+        DateTime startTime = DateTime.Parse("2025-08-01");
         /// <summary>
         /// 请求开放平台服务
         /// </summary>
@@ -57,8 +57,7 @@ namespace MyCode.Project.Services.Implementation
         /// <exception cref="BaseException"></exception>
         public List<TradesItem> testTradeFullInfoGet(DateTime now)
         {
-            if (now < startTime)
-                now = startTime;
+          
             int total = 1;
             var shopConfigs = _yTKJTShopParameterRepository.Queryable().Where(t => t.FDOCUMENTSTATUS == "C").ToList();
 
@@ -67,6 +66,11 @@ namespace MyCode.Project.Services.Implementation
             //string value1 = "2025-06-20 00:00:00";//DateTime.Now.Date.ToString("yyyy-MM-dd HH:mm:ss");
             string value = now.Date.AddDays(-7).ToString("yyyy-MM-dd");
             string value1 = now.Date.ToString("yyyy-MM-dd");
+            if (now.Date.AddDays(-7) < startTime)
+            {
+                value = startTime.ToString("yyyy-MM-dd");
+            }
+
             requestBizData.StartModified = "";// DateTime.ParseExact(value, "yyyy-MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None);
 
             requestBizData.EndModified = "";  //DateTime.ParseExact(value1, "yyyy-MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None);
diff --git a/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs b/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs
index b0fe1d5..2f5f5c4 100644
--- a/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs
+++ b/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs
@@ -114,7 +114,8 @@ namespace MyCode.Project.Services.Implementation
             List<PushKingDeeOrder> pushKingDeeOrders = new List<PushKingDeeOrder>();
             list.ForEach(sheet =>
             {
-                if (pushKingDeeOrders.Where(t => t.ShopId == sheet.ShopId && t.WarehouseId == sheet.WarehouseId).Count() > 0)
+                if (pushKingDeeOrders.Where(t => t.ShopId == sheet.ShopId && t.WarehouseId == sheet.WarehouseId 
+                && t.ConsignTime.Value.ToString("yyyy-MM-dd")==sheet.ConsignTime).Count() > 0)
                 {
                     return;
                 }
@@ -125,7 +126,7 @@ namespace MyCode.Project.Services.Implementation
                 pushKingDeeOrder.UpdateTime = DateTime.Now;
                 pushKingDeeOrders.Add(pushKingDeeOrder);
 
-                var tempList = list.Where(t => t.ShopId == sheet.ShopId && t.WarehouseId == sheet.WarehouseId).ToList();
+                var tempList = list.Where(t => t.ShopId == sheet.ShopId && t.WarehouseId == sheet.WarehouseId && sheet.ConsignTime  == t.ConsignTime).ToList();
                 tempList.ForEach(item =>
                 {
                     PushKingDeeOrderItem pushKingDeeOrderItem = new PushKingDeeOrderItem();
diff --git a/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs b/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs
index 3a94ee1..8427477 100644
--- a/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs
+++ b/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs
@@ -22,7 +22,7 @@ namespace MyCode.Project.Services.Implementation
     {
 
 
-        DateTime startTime = DateTime.Parse("2025-06-01");
+        DateTime startTime = DateTime.Parse("2025-08-01");
 
         private IWMStoJackyunInventoryMovementView2Repository _wMStoJackyunInventoryMovementView3Repository;
         private IRepository _repository;
diff --git a/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs b/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs
index d83dee8..6c6d28c 100644
--- a/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs
+++ b/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs
@@ -34,9 +34,9 @@ namespace MyCode.Project.WebApi.Controllers
         /// </summary>
         [HttpGet]
         [AllowAnonymous]
-        public void TaskSendKingdeeSaleOrderById(string id)
+        public string TaskSendKingdeeSaleOrderById(string id)
         {
-            _orderPushService.PushOrderToKingDee(id);
+          return  _orderPushService.PushOrderToKingDee(id);
         }
 
 
@@ -58,24 +58,24 @@ namespace MyCode.Project.WebApi.Controllers
         /// <summary>
         ///  抓WMS订单
         /// </summary>
-        //[HttpGet]
-        //[AllowAnonymous]
-        //public List<WMStoJackyunInventoryMovementView1> GetList(DateTime now)
-        //{
-        //    return _wMSService.GetList(now);
-        //}
+        [HttpGet]
+        [AllowAnonymous]
+        public List<WMStoJackyunInventoryMovementView1> GetList(DateTime now)
+        {
+            return _wMSService.GetList(now);
+        }
         #endregion
 
         #region 合并吉客云订单到新表
         /// <summary>
         /// 合并吉客云订单到新表
         /// </summary>
-        //[HttpGet]
-        //[AllowAnonymous]
-        //public string GetAndMergeJackYunOrder(string now)
-        //{
-        //    return _jackYunTaskService.GetAndMergeJackYunOrder(now);
-        //}
+        [HttpGet]
+        [AllowAnonymous]
+        public string GetAndMergeJackYunOrder(string now)
+        {
+            return _jackYunTaskService.GetAndMergeJackYunOrder(now);
+        }
         #endregion