From f05724df4901a05fcd819c61310e0124576945d6 Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Mon, 21 Jul 2025 15:07:31 +0800
Subject: [PATCH] 11

---
 .../Model/YTKJTShopParameter.cs               |  8 +++++++
 .../Implementation/JackYunService.cs          |  2 +-
 .../Controllers/TestController.cs             | 22 +++++++++----------
 Reportapi/MyCode.Project.WebApi/Web.config    |  2 +-
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs b/Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs
index 8e5de07..7f9dfa9 100644
--- a/Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs
+++ b/Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs
@@ -189,5 +189,13 @@ namespace MyCode.Project.Domain.Model
            [SugarColumn(ColumnName="F_WAREHOUSE_NAME")]
            public string FWAREHOUSENAME {get;set;}
 
+           /// <summary>
+           /// Desc:销售员ID
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           [SugarColumn(ColumnName="F_SALER")]
+           public long? FSALER {get;set;}
+
     }
 }
diff --git a/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs b/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs
index 5e0f7b8..ecc43d9 100644
--- a/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs
+++ b/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs
@@ -84,7 +84,7 @@ namespace MyCode.Project.Services.Implementation
             //requestBizData.TradeStatus = 1010;
             requestBizData.TradeType = 1;
             requestBizData.SourceTradeNos = "";
-            requestBizData.ShopIds = shopConfigs.Select(t => t.FSHOPCODE).ToList(); ;// new long[] { 378761130654261100, 378761130654261100 };
+            requestBizData.ShopIds = shopConfigs.Select(t => t.FSHOPCODE).ToList(); // new long[] { 378761130654261100, 378761130654261100 };
             List<int> TradeTypeList = new List<int>();
             TradeTypeList.Add(1);
             TradeTypeList.Add(7);
diff --git a/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs b/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs
index 8e003ae..4db7419 100644
--- a/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs
+++ b/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs
@@ -40,18 +40,18 @@ namespace MyCode.Project.WebApi.Controllers
         }
 
 
-        //#region 调度运行抓吉客云销售订单
+        #region 调度运行抓吉客云销售订单
 
-        ///// <summary>
-        ///// 调度运行抓吉客云销售订单
-        ///// </summary>
-        //[HttpGet]
-        //[AllowAnonymous]
-        //public void TaskGetJackYunOrder(string now)
-        //{
-        //    _jackYunTaskService.TaskGetJackYunOrder(now);
-        //}
-        //#endregion
+        /// <summary>
+        /// 调度运行抓吉客云销售订单
+        /// </summary>
+        [HttpGet]
+        [AllowAnonymous]
+        public void TaskGetJackYunOrder(string now)
+        {
+            _jackYunTaskService.TaskGetJackYunOrder(now);
+        }
+        #endregion
 
 
         #region 抓WMS订单
diff --git a/Reportapi/MyCode.Project.WebApi/Web.config b/Reportapi/MyCode.Project.WebApi/Web.config
index 20aeafc..f352b52 100644
--- a/Reportapi/MyCode.Project.WebApi/Web.config
+++ b/Reportapi/MyCode.Project.WebApi/Web.config
@@ -24,7 +24,7 @@
     <!-- 数据库测试-->
 
 	  <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=127.0.0.1; Initial Catalog=YunTong; User ID=sa;Password=123456; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" 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" />
 	  <!--测试MYSQL内网-->
     <!--<add name="MasterConn" connectionString="" providerName="MySql.Data.MySqlClient" />-->
   </connectionStrings>