Commit cffc9f17 by lizefeng

优化实时库存的导出跟周转表的导出

parent 37764839
......@@ -356,7 +356,15 @@ where 1=1
}
else
{
total = _connection.QueryFirst<int>(countSql, parameters,commandTimeout:0);
if (limit > 1000)
{
total = 0;
}
else
{
total = _connection.QueryFirst<int>(countSql, parameters, commandTimeout: 0);
}
if (!string.IsNullOrEmpty(sort) && !string.IsNullOrEmpty(order))
{
......
......@@ -25,7 +25,7 @@ namespace AutoTurnOver.DB
/// <param name="order">排序类型</param>
/// <param name="sort">排序字段</param>
/// <returns></returns>
public static List<Models.dc_auto_turnover_Extend> List(Condition_AutoTurnOver m, int offset, int limit, ref int total, string order = "", string sort = "", bool isSum = false)
public static List<Models.dc_auto_turnover_list_dto> List(Condition_AutoTurnOver m, int offset, int limit, ref int total, string order = "", string sort = "", bool isSum = false)
{
try
{
......@@ -235,7 +235,7 @@ left join dc_base_tort as t8 on dat.bailun_sku = t8.bailun_sku
var obj = _connection.Query<Models.dc_auto_turnover_Extend>(sql, parameters, commandTimeout: 0);
var obj = _connection.Query<Models.dc_auto_turnover_list_dto>(sql, parameters, commandTimeout: 0);
return obj.AsList();
}
......
......@@ -406,4 +406,307 @@ namespace AutoTurnOver.Models
public string has_tort { get; set; }
}
public class dc_auto_turnover_list_dto
{
public int id { get; set; }
/// <summary>
/// 建议单单号
/// </summary>
public string purchase_advice_id { get; set; }
/// <summary>
/// SKU
/// </summary>
public string bailun_sku { get; set; }
/// <summary>
/// 仓库编码
/// </summary>
public string warehouse_code { get; set; }
/// <summary>
/// 建议采购数
/// </summary>
public int quantity_init_advise { get; set; }
/// <summary>
/// 最小订单数量
/// </summary>
public int quantity_minimum_order { get; set; }
/// <summary>
/// 跟MOQ对比后最终的的自动采购建议
/// </summary>
public int quantity_final_advise { get; set; }
/// <summary>
/// 仓库名称
/// </summary>
public string warehouse_name { get; set; }
/// <summary>
/// 活动促销数量
/// </summary>
public int quantity_promotion { get; set; }
/// <summary>
/// 实际库存数量
/// </summary>
public int quantity_inventory { get; set; }
/// <summary>
/// 调拨在途
/// </summary>
public int quantity_transfer { get; set; }
/// <summary>
/// 采购在途
/// </summary>
public int quantity_purchase { get; set; }
/// <summary>
/// 周转天数
/// </summary>
public int turnover_days { get; set; }
/// <summary>
/// 安全库存
/// </summary>
public decimal quantity_safe_inventory { get; set; }
/// <summary>
/// 备注
/// </summary>
public string remark { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime gmt_create { get; set; }
/// <summary>
/// 更新时间
/// </summary>
public DateTime gmt_modified { get; set; }
/// <summary>
/// 正常为0, 缺货为1
/// </summary>
public int status { get; set; }
/// <summary>
/// 缺货数量
/// </summary>
public int quantity_out_stock { get; set; }
/// <summary>
/// sku标题
/// </summary>
public string sku_title { get; set; }
/// <summary>
/// 记录时间
/// </summary>
public DateTime record_time { get; set; }
/// <summary>
/// 与dc_auto_config_promotion的id关联,以逗号分隔
/// </summary>
public string promotions { get; set; }
/// <summary>
/// 供应商交期
/// </summary>
public int supplier_delivery { get; set; }
/// <summary>
/// 调拨交运时长
/// </summary>
public int transfer_delivery { get; set; }
/// <summary>
/// 质检入库时长
/// </summary>
public int inspection_delivery { get; set; }
/// <summary>
/// 未来7天日均
/// </summary>
public int forecast_sevenday_sales { get; set; }
/// <summary>
/// 未来14天日均
/// </summary>
public int forecast_fourteenday_sales { get; set; }
/// <summary>
/// 默认供应商的平均预期天数
/// </summary>
public decimal average_overdue { get; set; }
/// <summary>
/// 调拨打包天数
/// </summary>
public decimal transfer_bale_delivery { get; set; }
/// <summary>
/// 海外仓入库天数
/// </summary>
public decimal abroad_inbound_delivery { get; set; }
/// <summary>
/// 补充销量
/// </summary>
public decimal supplementary_sales { get; set; }
/// <summary>
/// 本次采购到货到货前
/// </summary>
public decimal turnover_sales { get; set; }
/// <summary>
/// 周转期内总入库
/// </summary>
public decimal turnover_inbound { get; set; }
/// <summary>
/// 过去7日销量(日均)
/// </summary>
public decimal history_sevenday_sales { get; set; }
/// <summary>
/// 过去14日日均销量
/// </summary>
public decimal history_fourteenday_sales { get; set; }
/// <summary>
/// 过去30天日均销量
/// </summary>
public decimal history_thirtyday_sales { get; set; }
/// <summary>
/// 调拨头程天数(用户配置)
/// </summary>
public int? transfer_config_delivery { get; set; }
/// <summary>
/// 调拨打包天数(用户配置)
/// </summary>
public int? transfer_bale_config_delivery { get; set; }
/// <summary>
/// 海外仓入库天数(用户配置)
/// </summary>
public int? abroad_inbound_config_delivery { get; set; }
/// <summary>
/// 初始建议数
/// </summary>
public int quantity_begin_advise { get; set; }
public int original_quantity_init_advise { get; set; }
public int is_modify_quantity_init_advise { get; set; }
/// <summary>
/// 付款时间
/// </summary>
public int payment_before_delivery { get; set; }
/// <summary>
/// 备货天数
/// </summary>
public int stock_up_days { get; set; }
public int stock_up_days_final
{
get
{
if (stock_up_days >= 1)
{
return stock_up_days - 1;
}
else
{
return 0;
}
}
}
public decimal history_sevenday_sales_ebay { get; set; }
public decimal history_fourteenday_sales_ebay { get; set; }
public decimal history_thirtyday_sales_ebay { get; set; }
/// <summary>
///昨日销量
/// </summary>
public int oneday_sales { get; set; }
/// <summary>
/// 预测明日销量
/// </summary>
public int forecast_oneday_sales2 { get; set; }
/// <summary>
/// 商品内部编码
/// </summary>
public string product_inner_code { get; set; }
public string suppliers_name { get; set; }
/// <summary>
/// 商品编码
/// </summary>
public string product_code { get; set; }
/// <summary>
/// 百伦分类
/// </summary>
public string bailun_category_name { get; set; }
/// <summary>
/// 是否停止监控
/// </summary>
public int monitor_status { get; set; }
public string supplier_name { get; set; }
public string buyer_name { get; set; }
/// <summary>
/// 交期异常
/// </summary>
public int? delivery_days_error { get; set; }
/// <summary>
/// 重量
/// </summary>
public decimal? weight { get; set; }
/// <summary>
/// 单价
/// </summary>
public decimal? unit_price { get; set; }
/// <summary>
/// 实时库存
/// </summary>
public decimal? usable_stock { get; set; }
/// <summary>
/// 已发货数
/// </summary>
public decimal? shipped_stock { get; set; }
/// <summary>
/// 供应链链接
/// </summary>
public string suppliers_link { get; set; }
public DateTime? develop_time { get; set; }
public string has_tort { get; set; }
}
}
......@@ -20,7 +20,7 @@ namespace AutoTurnOver.Services
/// <param name = "order" > 排序类型 </ param >
/// <param name="sort">排序字段</param>
/// <returns></returns>
public List<dc_auto_turnover_Extend> List(Condition_AutoTurnOver m,int offset, int limit, ref int total,string order="",string sort="",bool isSum = false)
public List<dc_auto_turnover_list_dto> List(Condition_AutoTurnOver m,int offset, int limit, ref int total,string order="",string sort="",bool isSum = false)
{
if (!string.IsNullOrWhiteSpace(m.categoryIds))
{
......
......@@ -122,7 +122,7 @@ namespace AutoTurnOver.Controllers
var total = 0;
var fileName = AppContext.BaseDirectory + $@"Result\RealtimeStock\{user.UserAccount}实时库存.csv";
int page = 1;
int rows = 10000;
int rows = 50000;
while (true)
{
......
......@@ -84,7 +84,7 @@ namespace AutoTurnOver.Controllers
var service = new Services.SkuAutoTurnServices();
var list = service.List(m, offset, limit, ref total, order, sort, true);
return new JsonResult(list == null || list.Count <= 0 ? new dc_auto_turnover_Extend() : list[0]);
return new JsonResult(list == null || list.Count <= 0 ? new dc_auto_turnover_list_dto() : list[0]);
}
/// <summary>
......@@ -123,7 +123,7 @@ namespace AutoTurnOver.Controllers
int page = 1;
int rows = 10000;
int rows = 50000;
while (true)
{
var list = service.List(m, (page-1)* rows, rows, ref total, order, sort);
......
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