Merge branch 'BaoMaKu' of http://8.130.121.29:3000/Develop/YunTongJackYunTask into BaoMaKu

2025-11-10 10:28:19 +08:00
parent 3977f35abe bce409ee14
commit a8c6c37db1
11 changed files with 523 additions and 459 deletions
--- a/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs
+++ b/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs
@@ -284,6 +284,20 @@ namespace MyCode.Project.WebApi.Controllers
            _jackYunTaskService.GetStorageGoodsDocOutV2(now);
        }
        #endregion
+
+
+        #region 合并吉客云采购订单到新表
+        /// <summary>
+        /// 合并吉客云采购订单到新表
+        /// </summary>
+        [HttpGet]
+        [AllowAnonymous]
+        public string GetAndMergePushGoodsDocInOrder(string now)
+        {
+            return _jackYunTaskService.GetAndMergePushGoodsDocInOrder(now);
+        }
+        #endregion
+
    }

 }