离线下载优化

AutoTurnOver.DB/dc_task_download_dao.cs

@@ -2,6 +2,7 @@
 using Bailun.ServiceFabric;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
 using System.Text;
@@ -29,17 +30,22 @@ namespace AutoTurnOver.DB
             {
                 foreach (PropertyInfo item in properts)
                 {
-                    var obj = item.GetValue(par);
-                    if(obj!=null && !string.IsNullOrWhiteSpace(obj.ToString()))
+                    var descriptionData = ((DescriptionAttribute)Attribute.GetCustomAttribute(item, typeof(DescriptionAttribute)));
+                    if(descriptionData!=null && !string.IsNullOrWhiteSpace(descriptionData.Description))
                     {
-                        parList.Add($"{item.Name}={obj.ToString()}");
+                        var obj = item.GetValue(par);
+                        if (obj != null && !string.IsNullOrWhiteSpace(obj.ToString()))
+                        {
+                            parList.Add($"[{descriptionData.Description}]={obj.ToString()}");
+                        }
                     }
+                    
                 }
             }
 
             if(parList!=null&& parList.Count >= 1)
             {
-                data.parameter_show = string.Join("&", parList);
+                data.parameter_show = string.Join(",", parList);
             }
             else
             {

AutoTurnOver.Models/dc_auto_turnover.cs

 using AutoTurnOver.Models.ApiDto;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Text;
 using static AutoTurnOver.Models.dc_base_stock_dto;
 
@@ -286,53 +287,72 @@ namespace AutoTurnOver.Models
 
     public class Condition_AutoTurnOver
     {
+        [Description("sku标签")]
         public string sku_label { get; set; }
+
+        [Description("待调拨数量（最小）")]
         public int? not_trans_count_min { get; set; }
+        [Description("待调拨数量（最大）")]
         public int? not_trans_count_max { get; set; }
+
+        [Description("sku")]
         public string bailun_sku { get; set; }
 
+        [Description("采购员")]
         public string buyer_name { get; set; }
 
+        [Description("供应商")]
         public string supplier_name { get; set; }
+
+        [Description("是否侵权")]
         public int? has_tort { get; set; }
 
         /// <summary>
         /// 仓库编码
         /// </summary>
+        [Description("仓库编码")]
         public string warehouse_code { get; set; }
 
         /// <summary>
         /// 是否缺货
         /// </summary>
+        [Description("是否缺货")]
         public int? out_of_stock { get; set; }
 
         /// <summary>
         /// 是否冗余
         /// </summary>
+        [Description("是否冗余")]
         public int? redundancy { get; set; }
 
+        [Description("仓库类型")]
         public string warehousetype { get; set; }
 
+        [Description("仓库国家")]
         public int? warehousearea { get; set; }
 
         /// <summary>
         /// 是否有配置缺失
         /// </summary>
+        [Description("是否有配置缺失")]
         public bool? hasDefectConfig { get; set; }
 
         /// <summary>
         /// 搜索关键词
         /// </summary>
+        [Description("搜索关键词")]
         public string key_words { get; set; }
 
         /// <summary>
         /// 商品编码
         /// </summary>
+        [Description("商品编码")]
         public int? searchType { get; set; }
 
         /// <summary>
         /// 是否建议下单
         /// </summary>
+        [Description("是否建议下单")]
         public bool? hasAadvise { get; set; }
 
         /// <summary>
@@ -340,23 +360,45 @@ namespace AutoTurnOver.Models
         /// 1= 停止监控
         /// 0 = 开启监控
         /// </summary>
+        [Description("监控状态")]
         public int? monitor_status { get; set; }
+
+        [Description("回货监控状态")]
         public int? returngoodspush_state { get; set; }
 
         /// <summary>
         ///百伦分类
         /// </summary>
+        [Description("百伦分类")]
         public string categoryIds { get; set; }
 
         public List<bailun_category_new_dto> categoryModels { get; set; }
+
+        [Description("实际库存（最小）")]
         public int? quantity_inventory_min { get; set; }
+
+        [Description("实际库存（最大）")]
         public int? quantity_inventory_max { get; set; }
+
+        [Description("缺货数量（最小）")]
         public int? quantity_out_stock_min { get; set; }
+
+        [Description("缺货数量（最大）")]
         public int? quantity_out_stock_max { get; set; }
+
+        [Description("昨日销量（最小）")]
         public int? oneday_sales_min { get; set; }
+
+        [Description("昨日销量（最大）")]
         public int? oneday_sales_max { get; set; }
+
+        [Description("日均类型")]
         public int? avg_type { get; set; }
+
+        [Description("日均（最小）")]
         public int? avg_sales_min { get; set; }
+
+        [Description("日均（最大）")]
         public int? avg_sales_max { get; set; }
     }
 

AutoTurnOver.Models/dc_base_stock.cs

 using AutoTurnOver.Models.ApiDto;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Text;
 
 namespace AutoTurnOver.Models
@@ -375,26 +376,50 @@ namespace AutoTurnOver.Models
 
     public class dc_base_stock_search_dto
     {
+        [Description("监控状态")]
         public int? monitor_status { get; set; }
         public bool isSum { get; set; }
         public bool is_warehouse_sum { get; set; }
+
+        [Description("搜索类型")]
         public int? searchType { get; set; }
+
+        [Description("搜索关键词")]
         public string key_words { get; set; }
+
+        [Description("仓库编码")]
         public string warehousecode { get; set; }
+
+        [Description("采购员")]
         public string buyer_name { get; set; }
+
+        [Description("供应商")]
         public string supplier_name { get; set; }
         public int offset { get; set; }
         public int limit { get; set; }
         public string order { get; set; }
         public string sort { get; set; }
+
+        [Description("仓库类型")]
         public string warehousetype { get; set; }
+
+        [Description("仓库国家")]
         public int? warehousearea { get; set; }
-        public int? has_tort { get; set; } = null; 
+        public int? has_tort { get; set; } = null;
+
+        [Description("分类")]
         public string categoryIds { get; set; } = null;
-        public DateTime? start_date { get; set; } = null; 
-        public DateTime? end_date { get; set; } = null; 
-        public DateTime? f_start_date { get; set; } = null; 
-        public DateTime? f_end_date { get; set; } = null; 
+
+        [Description("入库时间（起）")]
+        public DateTime? start_date { get; set; } = null;
+        [Description("入库时间（止）")]
+        public DateTime? end_date { get; set; } = null;
+        [Description("首次入库时间（起）")]
+        public DateTime? f_start_date { get; set; } = null;
+        [Description("首次入库时间（止）")]
+        public DateTime? f_end_date { get; set; } = null;
+
+        [Description("产品类型")]
         public int? product_type { get; set; } = null;
     }
 }