Skip to content

D
data-center-auto
Commit 3c26af9b by 泽锋 李
Options

fix

parent f9d7d7b0
Showing with 22 additions and 12 deletions
AutoTurnOver.DB/daily.cs
......@@ -1784,6 +1784,7 @@ from dc_base_transfer_info as t1
left join dc_base_transfer_info_skus as t2 on t1.dataid =t2.dataid
left join dc_base_warehouse as t3 on t1.targetwareno =t3.warehouse_code
left join dc_base_stock as t5 on t2.sku = t5.bailun_sku and t1.targetwareno = t5.warehouse_code
left join dc_lms_order_transfer_current_node as t8 on t1.dataid = t8.data_id and t2.sku = t8.sku
";
if ((categoryModels != null && categoryModels.Count >= 1) || !string.IsNullOrWhiteSpace(search_data.buyer_name) || search_data.product_type > 0)
{
......
AutoTurnOver.DB/dc_auto_turnover.cs
......@@ -1223,6 +1223,8 @@ from dc_auto_turnover_air where gmt_modified>=@btime and gmt_modified<=@etime
var result_air = GetModelAir(bailun_sku, warehouse_code);
var result_ocean = GetModelOcean(bailun_sku, warehouse_code);
var base_wa = _connection.QueryFirstOrDefault<string>(" select t2.`code` from dc_base_warehouse as t1 left join dc_base_country as t2 on t1.area_name = t2.`name` where warehouse_code=@warehouse_code ", new { warehouse_code });
var dc_mid_transit_data = _connection.QueryFirstOrDefault<int?>(" select quantity_transfer+quantity_purchase from dc_mid_transit as t1 where bailun_sku=@bailun_sku and warehouse_code=@warehouse_code ", new { bailun_sku, warehouse_code })??0;
var dc_stock_data = _connection.QueryFirstOrDefault<int?>(" select usable_stock from dc_base_stock as t1 where bailun_sku=@bailun_sku and warehouse_code=@warehouse_code ", new { bailun_sku, warehouse_code })??0;
var dc_base_sku_data = _connection.QueryFirstOrDefault<dc_base_sku>(" select * from dc_base_sku where bailun_sku=@bailun_sku ", new { bailun_sku });
......@@ -1276,16 +1278,17 @@ from dc_auto_turnover_air where gmt_modified>=@btime and gmt_modified<=@etime
datas.FirstOrDefault(s => s.name == "采购单价").days.Add(new transfer_profit_dto.day_dto
{
date = this_time,
val = modalData.unit_price
val = Math.Round( modalData.unit_price??0,1)
});
modalData.quantity_final_advise = (advised_details.Count - 1 < index ? 0 : advised_details[index]);
// 周转天数 * 加权日均
modalData.quantity_final_advise = (int)Math.Round(result.quantity_safe_inventory + (result.daily_weighted_sales * result.turnover_days));
datas.FirstOrDefault(s => s.name == "实际建议周转数").days.Add(new transfer_profit_dto.day_dto
{
date = this_time,
val = modalData.quantity_final_advise
val = modalData.turnover
});
modalData.quantity_final_advise_amount = Math.Round( (modalData.quantity_final_advise??0) * (modalData.unit_price??0),2);
modalData.quantity_final_advise_amount = Math.Round( (modalData.quantity_final_advise ?? 0) * (modalData.unit_price??0),2);
datas.FirstOrDefault(s => s.name == "实际建议周转金额").days.Add(new transfer_profit_dto.day_dto
{
date = this_time,
......@@ -1295,8 +1298,9 @@ from dc_auto_turnover_air where gmt_modified>=@btime and gmt_modified<=@etime
{
}
// 周转天数 * 加权日均
modalData.turnover = (int)Math.Round( result.quantity_safe_inventory + ( result.daily_weighted_sales * result.turnover_days ));
// 在库+在途
modalData.turnover = dc_mid_transit_data+dc_mid_transit_data;
datas.FirstOrDefault(s => s.name == "实际周转数").days.Add(new transfer_profit_dto.day_dto
{
date = this_time,
......@@ -1368,7 +1372,7 @@ from dc_auto_turnover_air where gmt_modified>=@btime and gmt_modified<=@etime
val = modalData.freight_price_ocean_difference_amount
});
modalData.quantity_final_ocean_difference_amount = modalData.turnover_amount - modalData.quantity_final_advise_ocean_amount;
modalData.quantity_final_ocean_difference_amount = modalData.quantity_final_advise_amount - modalData.quantity_final_advise_ocean_amount;
datas.FirstOrDefault(s => s.name == "实际-海运周转采购金额差值").days.Add(new transfer_profit_dto.day_dto
{
date = this_time,
......@@ -1378,7 +1382,7 @@ from dc_auto_turnover_air where gmt_modified>=@btime and gmt_modified<=@etime
datas.FirstOrDefault(s => s.name == "差值(海运)-实际周转采购金额占比").days.Add(new transfer_profit_dto.day_dto
{
date = this_time,
val = (modalData.turnover_amount ?? 0) <= 0 ? 0M : (Math.Round((modalData.quantity_final_ocean_difference_amount ?? 0) / modalData.turnover_amount.Value, 3))
val = (modalData.quantity_final_advise_amount ?? 0) <= 0 ? 0M : (Math.Round((modalData.quantity_final_ocean_difference_amount ?? 0) / modalData.quantity_final_advise_amount.Value, 3))
});
......@@ -1389,7 +1393,7 @@ from dc_auto_turnover_air where gmt_modified>=@btime and gmt_modified<=@etime
val = modalData.freight_price_air_difference_amount
});
modalData.quantity_final_air_difference_amount = modalData.turnover_amount - modalData.quantity_final_advise_air_amount;
modalData.quantity_final_air_difference_amount = modalData.quantity_final_advise_amount - modalData.quantity_final_advise_air_amount;
datas.FirstOrDefault(s => s.name == "实际-空运周转采购金额差值").days.Add(new transfer_profit_dto.day_dto
{
date = this_time,
......@@ -1399,7 +1403,7 @@ from dc_auto_turnover_air where gmt_modified>=@btime and gmt_modified<=@etime
datas.FirstOrDefault(s => s.name == "差值(空运)-实际周转采购金额占比").days.Add(new transfer_profit_dto.day_dto
{
date = this_time,
val = (modalData.turnover_amount ?? 0) <= 0 ? 0M : (Math.Round((modalData.quantity_final_air_difference_amount ?? 0) / modalData.turnover_amount.Value, 3))
val = (modalData.quantity_final_advise_amount ?? 0) <= 0 ? 0M : (Math.Round((modalData.quantity_final_air_difference_amount ?? 0) / modalData.quantity_final_advise_amount.Value, 3))
});
}
else // 过去
......@@ -1439,7 +1443,7 @@ from dc_auto_turnover_air where gmt_modified>=@btime and gmt_modified<=@etime
})
});
modalData.unit_price = _connection.QueryFirstOrDefault<decimal?>(" select unit_price from dc_base_purchase_details where warehouse_into_code=@warehouse_into_code and bailun_sku=@bailun_sku and status!=-1 and create_time<=@btime limit 1 ", new
modalData.unit_price = _connection.QueryFirstOrDefault<decimal?>(" select unit_price from dc_base_purchase_details where warehouse_into_code=@warehouse_into_code and bailun_sku=@bailun_sku and status!=-1 and create_time<=@btime order by create_time desc limit 1 ", new
{
warehouse_into_code = result.warehouse_code,
bailun_sku = result.bailun_sku,
......@@ -1448,7 +1452,7 @@ from dc_auto_turnover_air where gmt_modified>=@btime and gmt_modified<=@etime
datas.FirstOrDefault(s => s.name == "采购单价").days.Add(new transfer_profit_dto.day_dto
{
date = this_time,
val = modalData.unit_price
val = Math.Round( modalData.unit_price??0,1)
});
modalData.quantity_final_advise = _connection.QueryFirstOrDefault<decimal?>(" select quantity_final_advise from dc_base_forecast_history where warehouse_code=@warehouse_code and bailun_sku=@bailun_sku and date_str=@date_str limit 1 ", new
{
......
AutoTurnOver.Models/Report/dc_mid_transit_dto.cs
......@@ -9,5 +9,7 @@ namespace AutoTurnOver.Models.Report
public string bailun_sku { get; set; }
public string warehouse_code { get; set; }
public decimal quantity_out_stock { get; set; }
public decimal quantity_purchase { get; set; }
public decimal quantity_transfer { get; set; }
}
}
AutoTurnOver.Models/transfer_profit_dto.cs
......@@ -18,6 +18,9 @@ namespace AutoTurnOver.Models
} }
public decimal? val { get; set; }
public string val_str { get {
return (val ?? 0).ToString("N");
} }
}
public static string Sinicization(DayOfWeek week)
......
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