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] 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
         /// 
         /// </summary>
         public string mainPostid { get; set; }
-        /// <summary>
-        /// 组合装子件列表
-        /// </summary>
-        public List<string> tradeOrderAssemblyGoodsDtoList { get; set; }
+        ///// <summary>
+        ///// 组合装子件列表
+        ///// </summary>
+        //public List<object> tradeOrderAssemblyGoodsDtoList { get; set; }
         /// <summary>
         /// 珠海市臻美服饰有限公司
         /// </summary>
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 保存一个订单对象
         /// <summary>
         /// 保存一个订单对象
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 @@
 
   <!--微信支付证书的根目录，这里暂时是给调度系统使用-->
 
-  <connectionStrings>
-
-	 
-	  <!--<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=sa;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=yuntong; User ID=sa;Password=1; 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=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient" />
+  <connectionStrings> 
+	  <add name="WMSConn"
+	   connectionString="Data Source=172.100.1.140; Initial Catalog=BMK; User ID=sa;Password=HBT!erp2023; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2"
+	   providerName="System.Data.SqlClient"/>
+	  <add name="YunTongConn" connectionString="Data Source=172.100.1.140; Initial Catalog=BMK; User ID=sa;Password=HBT!erp2023; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient" />
 
   </connectionStrings>
   <appSettings>
 
-
+	  <!-- WMSUri地址 -->
+	  <add key="WMSUri" value="http://172.16.40.15:9000"/>
 	  <!-- 当前使用的 账套ID(即数据中心id) -->
-
 	  <!-- 第三方系统登录授权的账套ID（即open.kingdee.com网站的第三方系统登录授权中的数据中心标识）-->
-
 	  <!-- 在第三方系统登录授权页面点击“生成测试链接”按钮后即可查看   -->
-
-	  <add key="X-KDApi-AcctID" value="66d918bdc00906" />
-
+	  <add key="X-KDApi-AcctID" value="65229a397eb2e2" />
 	  <!-- 第三方系统登录授权的 集成用户名称  -->
-
 	  <!-- 补丁版本为PT-146894 [7.7.0.202111]及后续的版本，则为指定用户登录列表中任一用户  -->
-
 	  <!-- 若第三方系统登录授权已勾选“允许全部用户登录”，则无以上限制  -->
-
-	  <add key="X-KDApi-UserName" value="黄志荣" />
-
+	  <add key="X-KDApi-UserName" value="demo" />
 	  <!-- 第三方系统登录授权的 应用ID  -->
-
-	  <add key="X-KDApi-AppID" value="400925_wYdO4+jLQMDf091IQYTB48WNRjSaXKLu" />
-
+	  <add key="X-KDApi-AppID" value="325373_Q7eD7+GKTkCWRUzEQ/XD1+ytTK692smv" />
 	  <!-- 第三方系统登录授权的 应用密钥  -->
-
-	  <add key="X-KDApi-AppSec" value="41dfa53b0e634b72b01e303d14fa6e35" />
-
+	  <add key="X-KDApi-AppSec" value="e0258153efb04c2a911a4ac20639e31a" />
 	  <!-- 账套语系，默认2052  -->
-
 	  <add key="X-KDApi-LCID" value="2052" />
-
 	  <!-- 组织编码，启用多组织时配置对应的组织编码才有效  -->
-
 	  <!--<add key="X-KDApi-OrgNum" value="*****"/>-->
-
-
-
 	  <!-- 服务Url地址(私有云和公有云都须配置金蝶云星空产品地址，K3Cloud/结尾)-->
-
-	  <add key="X-KDApi-ServerUrl" value="http://192.168.116.83/k3Cloud/" />
-
-
+	  <add key="X-KDApi-ServerUrl" value="http://127.0.0.1/k3Cloud/" />
 	  
 	  <!--解决swagger出错问题-->
     <add key="aspnet:UseHostHeaderForRequestUrl" value="true" />
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 @@
 <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="0 0 3 * * ?" runonce="false"/>
-	<job name="AddWMSOrderJob"  desc="添加抓单的调度"  enabled="true"  type="MyCode.Project.ScheduleTask.Jobs.AddWMSOrderJob,MyCode.Project.ScheduleTask" CronExpression="0 */15 * * * ?" runonce="false"/>
+	
  </Jobs>
 <!--
   <job name="CalOrderMoreThan500Job"  desc="计算消费超过500"  enabled="true"  type="MyCode.Project.ScheduleTask.Jobs.CalOrderMoreThan500Job,MyCode.Project.ScheduleTask" CronExpression="*/10 * * * * ?" runonce="false" />
diff --git a/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs b/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs
index 959f362..7c0c13a 100644
--- a/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs
+++ b/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs
@@ -21,7 +21,7 @@ namespace MyCode.Project.Services.Implementation
             _yTKJTShopParameterRepository = yTKJTShopParameterRepository;
         }
 
-        DateTime startTime = DateTime.Parse("2025-10-01");
+        DateTime startTime = DateTime.Parse("2025-11-01");
         /// <summary>
         /// 请求开放平台服务
         /// </summary>
diff --git a/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs b/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs
index 904c716..4e66c72 100644
--- a/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs
+++ b/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs
@@ -185,7 +185,7 @@ namespace MyCode.Project.Services.Implementation
             }
             pushKingDeeOrders.ForEach(t =>
             {
-                //_workProcessService.Add<IOrderPushService>(this.MerchantId, "PushOrderToKingDee", "推送订单到云星空或者WMS", t.Id, 1);
+                _workProcessService.Add<ISalesOutboundService>(this.MerchantId, "PushSalesOutboundToKingDee", "推送销售出库单到金蝶云星空", t.Id, 1);
                 Thread.Sleep(300);
             });
 
@@ -325,7 +325,7 @@ namespace MyCode.Project.Services.Implementation
             }
             pushKingDeeOrders.ForEach(t =>
             {
-                _workProcessService.Add<IOrderPushService>(this.MerchantId, "PushOrderToKingDee", "推送退货订单到云星空或者WMS", t.Id, 1);
+                _workProcessService.Add<ISalesReturnService>(this.MerchantId, "PushSalesReturnToKingDee", "推送销售退货单到金蝶云星空", t.Id, 1);
                 Thread.Sleep(300);
             });
 
diff --git a/Reportapi/MyCode.Project.Services/Implementation/SalesOutboundService.cs b/Reportapi/MyCode.Project.Services/Implementation/SalesOutboundService.cs
index 815b5d7..3c8eeae 100644
--- a/Reportapi/MyCode.Project.Services/Implementation/SalesOutboundService.cs
+++ b/Reportapi/MyCode.Project.Services/Implementation/SalesOutboundService.cs
@@ -266,7 +266,7 @@ namespace MyCode.Project.Services.Implementation
                 {
                     FNUMBER = BILL_TYPE_CODE
                 },
-                FBillNo = orderHead.Sheet > 0 ? orderHead.Sheet.ToString() : "",
+                FBillNo = GenerateBillNo(orderHead.Sheet, orderHead.ConsignTime.Value),
                 FDate = dateStr,
                 FSaleOrgId = new FSaleOrgId()
                 {
@@ -301,7 +301,7 @@ namespace MyCode.Project.Services.Implementation
                     FNumber = customerId
                 },
                 FOwnerTypeIdHead = OWNER_TYPE,
-                
+
                 FOwnerIdHead = new FOwnerIdHead()
                 {
                     FOrgId = orgId
@@ -334,7 +334,24 @@ namespace MyCode.Project.Services.Implementation
                 },
                 FEntity = entryList
             };
-        } 
+        }
+
+        /**
+         * JKXC+年月日+自增ID（三位）--销售出库单
+JKXT+年月日+自增ID（三位）--销售退货单
+JKCR+年月日+自增ID（三位）--采购入库单
+JKCT+年月日+自增ID（三位）--采购退货单
+        **/
+        private string GenerateBillNo(int Sheet, DateTime date)
+        {
+            string prefix = "JKXC" + date.ToString("yyyyMMdd");
+            string numberPart = (Sheet > 0 ? Sheet.ToString() : "").PadLeft(3, '0');
+            numberPart = numberPart.Length > 3 ? numberPart.Substring(numberPart.Length - 3) : numberPart;
+            // 组合并确保只取最后3位数字
+            string combined = prefix + numberPart;
+            return combined;
+
+        }
     }
 }
 
diff --git a/Reportapi/MyCode.Project.Services/Implementation/SalesReturnService.cs b/Reportapi/MyCode.Project.Services/Implementation/SalesReturnService.cs
index ab4ea71..3869f62 100644
--- a/Reportapi/MyCode.Project.Services/Implementation/SalesReturnService.cs
+++ b/Reportapi/MyCode.Project.Services/Implementation/SalesReturnService.cs
@@ -237,7 +237,8 @@ namespace MyCode.Project.Services.Implementation
                 {
                     FNUMBER = BILL_TYPE_CODE
                 },
-                FDate = dateStr,               
+                FDate = dateStr,      
+                FBillNo= GenerateBillNo(orderHead.Sheet, orderHead.ConsignTime.Value),
                 FSaleOrgId = new FSaleOrgId()
                 {
                     FOrgId = orgId
@@ -246,6 +247,7 @@ namespace MyCode.Project.Services.Implementation
                 {
                     FCustId = customerId
                 },
+                
                 //FSaledeptid = new FSaledeptid()
                 //{
                 //    FNumber = "02"
@@ -301,6 +303,17 @@ namespace MyCode.Project.Services.Implementation
                 FEntity = entryList
             };
         }
+
+        private string GenerateBillNo(int Sheet,DateTime date)
+        {
+            string prefix = "JKXT" + date.ToString("yyyyMMdd");
+            string numberPart = (Sheet > 0 ? Sheet.ToString() : "").PadLeft(3, '0');
+            numberPart = numberPart.Length > 3 ? numberPart.Substring(numberPart.Length - 3) : numberPart;
+            // 组合并确保只取最后3位数字
+            string combined = prefix + numberPart;
+            return combined;
+
+        }
     }
 }
 
diff --git a/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs b/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs
index 41052ca..4dd0758 100644
--- a/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs
+++ b/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs
@@ -42,9 +42,10 @@ namespace MyCode.Project.Services.Implementation
         public void AddTask()
         {
             DateTime now = DateTime.Now.Date;
-            _workProcessService.Add<IWMSService>(this.MerchantId, "GetList", "抓取WMS订单到本地数据库", now.AddDays(-3).ToString("yyyy-MM-dd"), 1);
             _workProcessService.Add<IJackYunTaskService>(this.MerchantId, "TaskGetJackYunOrder", "调度运行抓吉客云销售订单", now.ToString("yyyy-MM-dd"), 1);
             _workProcessService.Add<IJackYunTaskService>(this.MerchantId, "TaskGetReturnChangeList", "调度运行抓吉客云退货订单", now.ToString("yyyy-MM-dd"), 1);
+            //_workProcessService.Add<IJackYunTaskService>(this.MerchantId, "GetPurchaseInboundData", "调度运行吉客云采购入库", now.ToString("yyyy-MM-dd"), 1);
+            //_workProcessService.Add<IJackYunTaskService>(this.MerchantId, "GetStorageGoodsDocOutV2", "获取吉客云采购退货出库单", now.ToString("yyyy-MM-dd"), 1);
         }
         #endregion
 
diff --git a/Reportapi/MyCode.Project.WebApi/Web.config b/Reportapi/MyCode.Project.WebApi/Web.config
index cbd417f..721f760 100644
--- a/Reportapi/MyCode.Project.WebApi/Web.config
+++ b/Reportapi/MyCode.Project.WebApi/Web.config
@@ -22,34 +22,34 @@
   </system.webServer>
   <connectionStrings>
     <!-- 数据库测试-->
-  	  <add name="WMSConn" connectionString="Data Source=58.252.252.77,30003; Initial Catalog=yuntong; User ID=sa;Password=123; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2" providerName="System.Data.SqlClient" />
+  	  <add name="WMSConn" connectionString="Data Source=58.252.252.77,30003; Initial Catalog=yuntong; User ID=yuntong;Password=123; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2" providerName="System.Data.SqlClient" />
 
-	  <add name="YunTongConn" connectionString="Data Source=58.252.252.77,30003; Initial Catalog=yuntong; User ID=sa;Password=123; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient" />
+	  <add name="YunTongConn" connectionString="Data Source=58.252.252.77,30003; Initial Catalog=yuntong; User ID=yuntong;Password=123; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient" />
 
 	    <!--测试MYSQL内网-->
     <!--<add name="MasterConn" connectionString="" providerName="MySql.Data.MySqlClient" />-->
   </connectionStrings>
   <appSettings>
-    <!-- WMSUri地址 -->
-    <add key="WMSUri" value="http://172.16.40.15:9000" />
-    <!-- 当前使用的 账套ID(即数据中心id) -->
-    <!-- 第三方系统登录授权的账套ID（即open.kingdee.com网站的第三方系统登录授权中的数据中心标识）-->
-    <!-- 在第三方系统登录授权页面点击“生成测试链接”按钮后即可查看   -->
-    <add key="X-KDApi-AcctID" value="654dcb96b00765" />
-    <!-- 第三方系统登录授权的 集成用户名称  -->
-    <!-- 补丁版本为PT-146894 [7.7.0.202111]及后续的版本，则为指定用户登录列表中任一用户  -->
-    <!-- 若第三方系统登录授权已勾选“允许全部用户登录”，则无以上限制  -->
-    <add key="X-KDApi-UserName" value="API" />
-    <!-- 第三方系统登录授权的 应用ID  -->
-    <add key="X-KDApi-AppID" value="401100_Te8pSzHvRuHfQ/TuWfXsSY8GQKR/QoMo" />
-    <!-- 第三方系统登录授权的 应用密钥  -->
-    <add key="X-KDApi-AppSec" value="74b800916ed64ff081734856c9301d13" />
-    <!-- 账套语系，默认2052  -->
-    <add key="X-KDApi-LCID" value="2052" />
-    <!-- 组织编码，启用多组织时配置对应的组织编码才有效  -->
-    <!--<add key="X-KDApi-OrgNum" value="*****"/>-->
-    <!-- 服务Url地址(私有云和公有云都须配置金蝶云星空产品地址，K3Cloud/结尾)-->
-    <add key="X-KDApi-ServerUrl" value="https://k3.yygsbb.com/k3Cloud/" />
+	  <!-- WMSUri地址 -->
+	  <add key="WMSUri" value="http://172.16.40.15:9000"/>
+	  <!-- 当前使用的 账套ID(即数据中心id) -->
+	  <!-- 第三方系统登录授权的账套ID（即open.kingdee.com网站的第三方系统登录授权中的数据中心标识）-->
+	  <!-- 在第三方系统登录授权页面点击“生成测试链接”按钮后即可查看   -->
+	  <add key="X-KDApi-AcctID" value="65229a397eb2e2" />
+	  <!-- 第三方系统登录授权的 集成用户名称  -->
+	  <!-- 补丁版本为PT-146894 [7.7.0.202111]及后续的版本，则为指定用户登录列表中任一用户  -->
+	  <!-- 若第三方系统登录授权已勾选“允许全部用户登录”，则无以上限制  -->
+	  <add key="X-KDApi-UserName" value="demo" />
+	  <!-- 第三方系统登录授权的 应用ID  -->
+	  <add key="X-KDApi-AppID" value="325373_Q7eD7+GKTkCWRUzEQ/XD1+ytTK692smv" />
+	  <!-- 第三方系统登录授权的 应用密钥  -->
+	  <add key="X-KDApi-AppSec" value="e0258153efb04c2a911a4ac20639e31a" />
+	  <!-- 账套语系，默认2052  -->
+	  <add key="X-KDApi-LCID" value="2052" />
+	  <!-- 组织编码，启用多组织时配置对应的组织编码才有效  -->
+	  <!--<add key="X-KDApi-OrgNum" value="*****"/>-->
+	  <!-- 服务Url地址(私有云和公有云都须配置金蝶云星空产品地址，K3Cloud/结尾)-->
+	  <add key="X-KDApi-ServerUrl" value="http://127.0.0.1/k3Cloud/" />
     <!--解决swagger出错问题-->
     <add key="aspnet:UseHostHeaderForRequestUrl" value="true" />
     <!--当前环境,1:生产环境 0：开发环境-->