From 995a8f115a28ed28ae9d6f31c80dde23f4b7fa24 Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Sat, 12 Jul 2025 18:52:08 +0800
Subject: [PATCH] 1111

---
 .../MyCode.Project.ScheduleTask/App.config    |  6 +-
 .../MyCode.Project.ScheduleTask/JobConfig.xml |  6 +-
 .../Jobs/AddOrderJob.cs                       | 27 ++++++++
 .../MyCode.Project.ScheduleTask/JobsHelp.cs   | 14 ++--
 .../MyCode.Project.ScheduleTask.csproj        |  2 +-
 .../IServices/IWMSService.cs                  |  7 +-
 .../Implementation/JackYunService.cs          | 64 +------------------
 .../Implementation/WMSService.cs              | 25 ++++++--
 .../MyCode.Project.Services/ServiceBase.cs    | 12 +++-
 9 files changed, 80 insertions(+), 83 deletions(-)
 create mode 100644 Reportapi/MyCode.Project.ScheduleTask/Jobs/AddOrderJob.cs

diff --git a/Reportapi/MyCode.Project.ScheduleTask/App.config b/Reportapi/MyCode.Project.ScheduleTask/App.config
index 1967597..226c3f0 100644
--- a/Reportapi/MyCode.Project.ScheduleTask/App.config
+++ b/Reportapi/MyCode.Project.ScheduleTask/App.config
@@ -16,6 +16,8 @@
 
 	  <add name="WMSConn" connectionString="Data Source=192.168.221.155; Initial Catalog=ESB_DTC; User ID=app_k3;Password=Postman2025k3; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2" providerName="System.Data.SqlClient" />
 	  <add name="YunTongConn" connectionString="Data Source=192.168.116.209; Initial Catalog=K3ZMFS_0905; User ID=app_jindie;Password=Ac661978!; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient" />
+	  <!--<add name="WMSConn" connectionString="Data Source=127.0.0.1; Initial Catalog=sdf; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=WMS" providerName="System.Data.SqlClient" />
+	  <add name="YunTongConn" connectionString="Data Source=127.0.0.1; Initial Catalog=YunTong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient" />-->
 
   </connectionStrings>
   <appSettings>
@@ -24,7 +26,7 @@
     <!--当前环境,1:生产环境 0：开发环境-->
     <add key="Env" value="0" />
     <!--因公司IP时常变化，先用13跳转-->
-    <add key="RedisAddress" value="19VhOco9ayRaH41syZnWYn2S46x3FcKIjYKgr6K3L/tu7vmlJvhB0CKrIBfMVl1Y" />
+    <add key="RedisAddress" value="" />
     <!--缓存前缀-->
     <add key="CachePrefix" value="lxm-report:dev:" />
     <!--jwtkey-->
@@ -45,7 +47,7 @@
 
     <!--生产环境D:\publish\lxm-report-api\App_File\-->
     <!--服务器文件保存的路径，这里调度用，如果是webapi则不需要用这个-->
-    <add key="AppFilePath" value="D:\publish\LxmReportApi\api\App_File\" />
+    <add key="AppFilePath" value="D:\publish\api\App_File\" />
     <!--<add key="AppFilePath" value="D:\App_File\" />-->
 
     <!--Socket的URL，13生产服务器配置：ws://172.18.166.162:8282/-->
diff --git a/Reportapi/MyCode.Project.ScheduleTask/JobConfig.xml b/Reportapi/MyCode.Project.ScheduleTask/JobConfig.xml
index b8ee207..110b563 100644
--- a/Reportapi/MyCode.Project.ScheduleTask/JobConfig.xml
+++ b/Reportapi/MyCode.Project.ScheduleTask/JobConfig.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Jobs>
-  <job name="AnsyDataQueueJob"  desc="定时同步数据执行的调度"  enabled="true"  type="MyCode.Project.ScheduleTask.Jobs.AnsyDataQueueJob,MyCode.Project.ScheduleTask"  CronExpression="*/5 * * * * ?" runonce="false" />
-  
-</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"/>
+ </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" />
diff --git a/Reportapi/MyCode.Project.ScheduleTask/Jobs/AddOrderJob.cs b/Reportapi/MyCode.Project.ScheduleTask/Jobs/AddOrderJob.cs
new file mode 100644
index 0000000..578ecd0
--- /dev/null
+++ b/Reportapi/MyCode.Project.ScheduleTask/Jobs/AddOrderJob.cs
@@ -0,0 +1,27 @@
+using MyCode.Project.Services;
+using Quartz;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MyCode.Project.ScheduleTask.Jobs
+{
+    [DisallowConcurrentExecution]
+    public class AddOrderJob : IJob
+    {
+
+        private IWMSService _wMSService;
+        public AddOrderJob(IWMSService wMSService)
+        {
+            _wMSService = wMSService;
+        }
+
+
+        public void Execute(IJobExecutionContext context)
+        {
+            _wMSService.AddTask();
+        }
+    }
+}
diff --git a/Reportapi/MyCode.Project.ScheduleTask/JobsHelp.cs b/Reportapi/MyCode.Project.ScheduleTask/JobsHelp.cs
index 1349c88..6596e71 100644
--- a/Reportapi/MyCode.Project.ScheduleTask/JobsHelp.cs
+++ b/Reportapi/MyCode.Project.ScheduleTask/JobsHelp.cs
@@ -30,15 +30,15 @@ namespace MyCode.Project.ScheduleTask
             IUnityContainer container = UnityHelper.GetUnityContainer();
 
             container.RegisterType<MyCodeSqlSugarClient>(new PerThreadLifetimeManager());
+            container.RegisterType<WMSSqlSugarClient>(new PerThreadLifetimeManager());
+			//注册缓存对象
+			container.RegisterType<IMyCodeCacheService, RedisCache>();
 
-            //注册缓存对象
-            container.RegisterType<IMyCodeCacheService, RedisCache>(new InjectionConstructor(SystemConfig.RedisAddress, SystemConfig.CachePrefix));
+			//提前初始化一次
+			//new RedisCache(SystemConfig.RedisAddress, SystemConfig.CachePrefix);
+			//new DingDingHelper(SystemConfig.DingDingApiUrl,SystemConfig.Env);
 
-            //提前初始化一次
-            new RedisCache(SystemConfig.RedisAddress, SystemConfig.CachePrefix);
-            new DingDingHelper(SystemConfig.DingDingApiUrl,SystemConfig.Env);
-
-            container.AddNewExtension<QuartzUnityExtension>();
+			container.AddNewExtension<QuartzUnityExtension>();
 
             ConfigFile = _ConfigFile;
 			List<jobinfo> list = new List<jobinfo>();
diff --git a/Reportapi/MyCode.Project.ScheduleTask/MyCode.Project.ScheduleTask.csproj b/Reportapi/MyCode.Project.ScheduleTask/MyCode.Project.ScheduleTask.csproj
index 99dff04..024e308 100644
--- a/Reportapi/MyCode.Project.ScheduleTask/MyCode.Project.ScheduleTask.csproj
+++ b/Reportapi/MyCode.Project.ScheduleTask/MyCode.Project.ScheduleTask.csproj
@@ -93,7 +93,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="JobsHelp.cs" />
-    <Compile Include="Jobs\AnsyDataQueueJob.cs" />
+    <Compile Include="Jobs\AddOrderJob.cs" />
     <Compile Include="Jobs\EveryJob.cs" />
     <Compile Include="Jobs\QueueJob.cs" />
     <Compile Include="Jobs\WebSocketJob.cs" />
diff --git a/Reportapi/MyCode.Project.Services/IServices/IWMSService.cs b/Reportapi/MyCode.Project.Services/IServices/IWMSService.cs
index 890c6dd..56dc424 100644
--- a/Reportapi/MyCode.Project.Services/IServices/IWMSService.cs
+++ b/Reportapi/MyCode.Project.Services/IServices/IWMSService.cs
@@ -14,6 +14,11 @@ namespace MyCode.Project.Services
         /// <param name="trades"></param>
 
         void SetWMSOrder(List<WMStoJackyunInventoryMovementView1> trades);
-        List<WMStoJackyunInventoryMovementView1> GetList(DateTime now);
+        List<WMStoJackyunInventoryMovementView1> GetList(object now);
+
+        /// <summary>
+        /// 添加抓单的调度
+        /// </summary>
+        void AddTask();
     }
 }
diff --git a/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs b/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs
index 3f766b1..b03e950 100644
--- a/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs
+++ b/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs
@@ -38,69 +38,7 @@ namespace MyCode.Project.Services.Implementation
             }
 
             return JsonHelper.ToObject<JackyunResponse>(strResponse);
-        }
-
-
-        #region 订单查询
-
-        /// <summary>
-        /// 订单查询
-        /// </summary>
-      
-        public string testTradeFullInfoGet()
-        {
-            int total = 1;
-            OrderTradeFullInfoGetRequestBizData requestBizData = new OrderTradeFullInfoGetRequestBizData();
-            string value = "2025-06-15 00:00:00";// DateTime.Now.Date.AddDays(-5).ToString("yyyy-MM-dd HH:mm:ss") ;
-            string value1 = "2025-06-20 00:00:00";//DateTime.Now.Date.ToString("yyyy-MM-dd HH:mm:ss");
-            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);
-            requestBizData.TradeNo = "";
-            requestBizData.HasTotal = total;
-            requestBizData.PageSize = 200;
-            requestBizData.PageIndex = 0;
-            requestBizData.Fields = "TradeType,goodsDetail.barcode,tradeNo,orderNo,shopName,companyName,warehouseName,logisticName,mainPostid,goodsDetail.goodsNo,flagNames,columnExt,sourceAfterNo,goodsDetail.outerId,pickUpCode,expense.expenseFee,expense.expenseItemName,billDate,goodsPlatDiscountFee,goodsDetail.shareOrderDiscountFee,goodsDetail.shareOrderPlatDiscountFee,customizeGoodsColumn9,goodsDetail.goodsId,goodsDetail.sellCount,goodsDetail.needProcessCount,goodsDetail.baseUnitSellCount,goodsDetail.assessmentCost,goodsDetail.compassSourceContentTypem,sourceTradeNo,shopId,warehouseId,scrollId";
-            requestBizData.StartCreated = "";//  DateTime.ParseExact(value, "yyyy -MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None);
-            requestBizData.EndCreated = "";//  DateTime.ParseExact(value1, "yyyy -MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None);
-            requestBizData.StartAuditTime = "";// DateTime.ParseExact(value, "yyyy-MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None);
-            requestBizData.EndAuditTime = "";// DateTime.ParseExact(value1, "yyyy -MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None);
-            requestBizData.StartConsignTime = value;// value;// DateTime.ParseExact(value, "yyyy-MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None);
-            requestBizData.EndConsignTime = value1;// value1;// DateTime.ParseExact(value1, "yyyy-MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None);
-            //requestBizData.TradeStatus = 1010;
-            //requestBizData.TradeType = 1;
-            requestBizData.SourceTradeNos = "";
-            requestBizData.ShopIds = null;// new long[] { 378761130654261100, 378761130654261100 };
-            string lggl = JsonHelper.ToJson(requestBizData);
-            LogHelper.Info(lggl);
-            JackyunResponse response = Call(EnumAttribute.GetAttribute(ApiEnum.TRADEFULLINFOGET).Value, "1.0", requestBizData);
-            string ll = JsonHelper.ToJson(response);
-            LogHelper.Info(ll);
-            List<TradesItem> trades = new List<TradesItem>();
-            if (response.code == "200")
-            {
-                var orderjson= JsonHelper.ToJson(response.result);
-                var list1 = JsonHelper.ToObject<TradeFullinfogetResp>(orderjson);
-                int pageIndex = 1;               
-                while (list1.data.trades !=null && list1.data.trades.Count>0)
-                {
-                  
-                    trades.AddRange(list1.data.trades);
-                    requestBizData.PageIndex = pageIndex;
-                    pageIndex++;
-                    response = Call(EnumAttribute.GetAttribute(ApiEnum.TRADEFULLINFOGET).Value, "1.0", requestBizData);
-                    if (response.code == "200")
-                    {
-                        orderjson = JsonHelper.ToJson(response.result);
-                        list1 = JsonHelper.ToObject<TradeFullinfogetResp>(orderjson);
-                    }
-                }
-            }
-           
-            return ll;
-        }
-
-        #endregion
+        } 
 
         #region 订单查询
         /// <summary>
diff --git a/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs b/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs
index 9e8422a..9adfa0a 100644
--- a/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs
+++ b/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs
@@ -19,20 +19,35 @@ namespace MyCode.Project.Services.Implementation
 {
     public class WMSService : ServiceBase , IWMSService
     {
+
+
         DateTime startTime = DateTime.Parse("2025-06-01");
 
         private IWMStoJackyunInventoryMovementView1Repository _wMStoJackyunInventoryMovementView3Repository;
-        private IRepository _repository; 
-
-        public WMSService(IWMStoJackyunInventoryMovementView1Repository wMStoJackyunInventoryMovementView3Repository, IRepository repository  )
+        private IRepository _repository;
+        private IWorkProcessService _workProcessService;
+        public WMSService(IWMStoJackyunInventoryMovementView1Repository wMStoJackyunInventoryMovementView3Repository, IRepository repository
+            , IWorkProcessService workProcessService)
         {
+            _workProcessService = workProcessService;
             _wMStoJackyunInventoryMovementView3Repository = wMStoJackyunInventoryMovementView3Repository;
             _repository = repository;
         }
 
-
-        public List<WMStoJackyunInventoryMovementView1> GetList(DateTime now)
+        #region AddTask(添加抓单的调度)
+        /// <summary>
+        /// 添加抓单的调度
+        /// </summary>
+        public void AddTask()
         {
+            DateTime now = DateTime.Now.Date;
+            _workProcessService.Add<IWMSService>(this.MerchantId, "GetList", "抓取WMS订单到本地数据库", now.ToString("yyyy-MM-dd"), 1);
+            _workProcessService.Add<IJackYunTaskService>(this.MerchantId, "TaskGetJackYunOrder", "调度运行抓吉客云销售订单", now.ToString("yyyy-MM-dd"), 1);
+        }
+        #endregion
+        public List<WMStoJackyunInventoryMovementView1> GetList(object now2)
+        {
+            DateTime now = DateTime.Parse(now2.ToString());
             if (now < startTime)
                 now = startTime;
             var list= _wMStoJackyunInventoryMovementView3Repository.GetList(now);
diff --git a/Reportapi/MyCode.Project.Services/ServiceBase.cs b/Reportapi/MyCode.Project.Services/ServiceBase.cs
index a028a57..e1148e7 100644
--- a/Reportapi/MyCode.Project.Services/ServiceBase.cs
+++ b/Reportapi/MyCode.Project.Services/ServiceBase.cs
@@ -14,6 +14,16 @@ namespace MyCode.Project.Services
     /// </summary>
     public abstract class ServiceBase
     {
- 
+        /// <summary>
+        /// 商家ID
+        /// </summary>
+        public Guid MerchantId
+        {
+            get
+            {
+
+                return Guid.Parse("00000000-0000-0000-0000-000000000009");
+            }
+        }
     }
 }
\ No newline at end of file