Commit fefbff55 by 泽锋 李

销量配置,分类支持多选

parent 4fd980d4
......@@ -37,6 +37,7 @@ namespace AutoGeneratePurchaseAdvise
//PurchaseAdviseServices.AutoPushBuySys(4);
//purchase_advise.ReplaceLogistics(DateTime.Now, "935619301", "MMDUKFBA");
//PurchaseAdviseServices.Generate(DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd 00:00:00")));
//report.PurchaseWeekBackUp();
}
catch (Exception ex)
{
......
......@@ -1616,7 +1616,7 @@ and start_date<=@end_date and end_date>=@start_date
}
}
var obj = _connection.Page<dc_auto_sales_forecast_config_dto>(sql, m);
var obj = _connection.Page<dc_auto_sales_forecast_config_dto>(sql, m, parameters);
return obj;
......
......@@ -49,6 +49,10 @@ namespace AutoTurnOver.Models
/// 销量数据来源平台
/// </summary>
public string data_source_platform { get; set; }
public decimal? first_order_days_min { get; set; }
public decimal? first_order_days_max { get; set; }
public decimal? orders_avg_min { get; set; }
public decimal? orders_avg_max { get; set; }
}
public class dc_auto_sales_forecast_stage_config
......
......@@ -763,7 +763,7 @@ namespace AutoTurnOver.Controllers
[HttpGet]
[BrowseLog("Bailun_aims", "访问【百伦自动周转系统】->【配置】->【销量预测配置】->【搜索】页面", 0)]
public JsonResult SalesForecastConfigList(int limit, int offset, string order, string sort, string warehousecode, string warehousetype, int? warehousearea, string bailun_sku)
public JsonResult SalesForecastConfigList(int limit, int offset, string order, string sort, string warehousecode, string warehousetype, int? warehousearea, string bailun_sku,int? is_delete)
{
var m = new dc_auto_sales_forecast_config_search_dto
{
......@@ -772,7 +772,8 @@ namespace AutoTurnOver.Controllers
warehousearea = warehousearea,
bailun_sku = bailun_sku,
page = (offset / limit) + 1,
rows = limit
rows = limit,
is_delete = is_delete
};
var total = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment