利润最大化分析，把周转表的筛选全部同步过来

AutoTurnOver.Services/SkuAutoTurnServices.cs

@@ -689,9 +689,13 @@ namespace AutoTurnOver.Services
             return DB.dc_auto_turnover.TransferProfitList(bailun_sku, warehouse_code);
         }
 
-        public List<dc_report_profit_analysis> ProfitAnalysis(dc_base_stock_search_dto search_data, ref int total)
+        public List<dc_report_profit_analysis> ProfitAnalysis(Condition_AutoTurnOver m, int offset, int limit, ref int total, string order = "", string sort = "")
         {
-            return DB.dc_auto_turnover.ProfitAnalysis(search_data, ref total);
+            if (!string.IsNullOrWhiteSpace(m.categoryIds))
+            {
+                m.categoryModels = ApiServices.GetNewClientNodesByIds(m.categoryIds.Split(',').Select(s => int.Parse(s)).ToList());
+            }
+            return DB.dc_auto_turnover.ProfitAnalysis(m, offset, limit, ref total, order, sort);
         }
         public void BatchPushPurchaseAdvise(string ids, UserData user)
         {
@@ -699,7 +703,7 @@ namespace AutoTurnOver.Services
         }
 
 
-        public string ProfitAnalysisExport(dc_base_stock_search_dto search_data)
+        public string ProfitAnalysisExport(Condition_AutoTurnOver m)
         {
             try
             {
@@ -711,9 +715,9 @@ namespace AutoTurnOver.Services
                 while (true)
                 {
                     int total = 0;
-                    search_data.offset = (page - 1) * rows;
-                    search_data.limit = rows;
-                    var list = ProfitAnalysis(search_data, ref total);
+                    var offset = (page - 1) * rows;
+                    var limit = rows;
+                    var list = ProfitAnalysis(m,offset,limit, ref total,"","");
 
                     if (list == null || list.Count <= 0) break;
 

AutoTurnOver.Services/TaskDownloadServices.cs

@@ -145,7 +145,7 @@ namespace AutoTurnOver.Services
         public async Task<string> DownloadProfitAnalysis(string par_json, dc_task_download download_data)
         {
 
-            dc_base_stock_search_dto search_data = par_json.ToObject<dc_base_stock_search_dto>();
+            Condition_AutoTurnOver search_data = par_json.ToObject<Condition_AutoTurnOver>();
             Console.WriteLine("DownloadStock - 开始生成文件");
             var memory = new SkuAutoTurnServices().ProfitAnalysisExport(search_data);
             Console.WriteLine("DownloadStock - 开始生成上传文件");

AutoTurnOver/Controllers/SkuAutoTurnController.cs

@@ -67,14 +67,14 @@ namespace AutoTurnOver.Controllers
         /// <param name="limit"></param>
         /// <returns></returns>
         [BrowseLog("Bailun_aims", "访问【百伦自动周转系统】->【自动下单管理】->【利润最大化分析】->【搜索】页面", 0)]
-        public JsonResult ProfitAnalysis([FromQuery]dc_base_stock_search_dto search_data)
+        public JsonResult ProfitAnalysis([FromQuery] Condition_AutoTurnOver m, [FromQuery] int offset, [FromQuery] int limit, [FromQuery] string order, [FromQuery] string sort)
         {
 
             try
             {
                 var services = new SkuAutoTurnServices();
                 var total = 0;
-                var list = services.ProfitAnalysis(search_data, ref total);
+                var list = services.ProfitAnalysis(m, offset, limit, ref total, order, sort);
 
                 return new JsonResult(new
                 {