Commit b7807d84 by 泽锋 李

aims 1、调拨揽收间早于打包时间核实 ( 销售抄错了 )

aims 2、调拨单运输方式核实(后台查了的确是空运),这里入库时间读的是 亚马逊后台的  received 时间
aims 3、aims新增一个默认调拨方式显示、平均票数海运空运比例、平均调拨数量海运空运比例
aims 4、aims 把历史实际销量显示出来  
aims 5、aims历史实际销量显示过去30天,现在只是显示7天
aims 6、排查部分sku历史平均值某日数据缺失问题(2月7号的bug,记录任务失败导致的全部数据都没有记录到。业务逻辑正常)
aims 7、停止监控也得计算周转相关的各项数据
aims 8、周转天数计算明细,加一个 下单天数。付款天数先货后款的也要显示一个0出来
aims 9、采购建议列表,新增一个距今多少工作日、是否逾期
parent 1d59400f
...@@ -1884,9 +1884,9 @@ where 1=1 "; ...@@ -1884,9 +1884,9 @@ where 1=1 ";
sql += " and t4.`no` =@order_no "; sql += " and t4.`no` =@order_no ";
parameters.Add("order_no", m.order_no); parameters.Add("order_no", m.order_no);
} }
if (m.is_delete>-1) if (m.is_delete>-2)
{ {
sql += " and t1.`is_delete` =@is_delete "; sql += " and t1.`status` =@is_delete ";
parameters.Add("is_delete", m.is_delete); parameters.Add("is_delete", m.is_delete);
} }
......
...@@ -287,6 +287,10 @@ namespace AutoTurnOver.Models ...@@ -287,6 +287,10 @@ namespace AutoTurnOver.Models
/// 销量公式 /// 销量公式
/// </summary> /// </summary>
public string fixed_dc_auto_sales_forecast_title { get; set; } public string fixed_dc_auto_sales_forecast_title { get; set; }
/// <summary>
/// 状态
/// </summary>
public int status { get; set; }
} }
...@@ -330,9 +334,42 @@ namespace AutoTurnOver.Models ...@@ -330,9 +334,42 @@ namespace AutoTurnOver.Models
public int? sendtype { get; set; } public int? sendtype { get; set; }
} }
public class dc_auto_purchase_advise_detailed_dto : dc_auto_purchase_advise_detailed public class dc_auto_purchase_advise_detailed_dto : dc_auto_purchase_advise_detailed
{ {
/// <summary> /// <summary>
/// 计算工作日
/// </summary>
/// <param name="date"></param>
/// <returns></returns>
public static int WorkingDays(DateTime date, DateTime date2)
{
var this_date = date;
var count = 0;
while ((date2-this_date).TotalHours>=24)
{
if (this_date.DayOfWeek != DayOfWeek.Sunday)
{
count++;
}
this_date = this_date.AddDays(1);
}
return count;
}
/// <summary>
/// 工作日
/// </summary>
public int working_days { get {
return WorkingDays(create_time,DateTime.Now);
} }
public bool has_overdue { get
{
return working_days > 1 && ispush == 0 && status == 0;
} }
/// <summary>
/// 转仓来源仓 /// 转仓来源仓
/// </summary> /// </summary>
public string hq_type { get; set; } public string hq_type { get; set; }
......
...@@ -303,5 +303,7 @@ namespace AutoTurnOver.Utility ...@@ -303,5 +303,7 @@ namespace AutoTurnOver.Utility
{ {
return Math.Round(val, 1); return Math.Round(val, 1);
} }
} }
} }
...@@ -178,6 +178,12 @@ namespace AutoTurnOver.Controllers ...@@ -178,6 +178,12 @@ namespace AutoTurnOver.Controllers
nowDateStock = (int)result[5].ToObj<List<decimal>>()[7], // 今天的预测库存 nowDateStock = (int)result[5].ToObj<List<decimal>>()[7], // 今天的预测库存
turnoverDatepurchase = turnoverDatepurchase // 累计预计到货 turnoverDatepurchase = turnoverDatepurchase // 累计预计到货
}; };
// 查询是否有默认渠道
var dc_base_head_transport_config_data = connectionHelper._connection.QuerySingleOrDefault<dc_base_head_transport_config>(" select * from dc_base_head_transport_config where bailun_sku=@bailun_sku and warehouse_code=@warehouse_code and is_delete=0 ", new
{
bailun_sku = turnoverData.bailun_sku,
warehouse_code = turnoverData.warehouse_code
}) ?? new dc_base_head_transport_config { };
return new JsonResult(new return new JsonResult(new
{ {
forecast_history_data = forecast_history_sales, forecast_history_data = forecast_history_sales,
...@@ -190,7 +196,8 @@ namespace AutoTurnOver.Controllers ...@@ -190,7 +196,8 @@ namespace AutoTurnOver.Controllers
names, names,
averageTargets, averageTargets,
averageTargetWarehouse, averageTargetWarehouse,
buyFormula buyFormula,
dc_base_head_transport_config_data
} }
); );
} }
......
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