Skip to content

D
data-center-auto
Commit 62b1ae50 by 泽锋 李
Options

fix

parent 10f6fdcb
Showing with 32 additions and 33 deletions
AutoTurnOver.DB/daily.cs
...@@ -1784,7 +1784,6 @@ left join dc_lms_order_transfer_current_node as t8 on t1.dataid = t8.data_id and ...@@ -1784,7 +1784,6 @@ left join dc_lms_order_transfer_current_node as t8 on t1.dataid = t8.data_id and
sql += " where t1.stateid !=5 and t2.deliverycount > t2.storagecount and t1.isdeleted=0 and t1.isexception=0 "; sql += " where t1.stateid !=5 and t2.deliverycount > t2.storagecount and t1.isdeleted=0 and t1.isexception=0 ";
} }
var countSql = @" var countSql = @"
select select
1 1
...@@ -1958,8 +1957,8 @@ left join dc_lms_order_transfer_current_node as t8 on t1.dataid = t8.data_id and ...@@ -1958,8 +1957,8 @@ left join dc_lms_order_transfer_current_node as t8 on t1.dataid = t8.data_id and
} }
else else
{ {
sql += " group by t2.sku,t8.transfer_no "; sql += " group by t1.`code`,t2.sku,t8.transfer_no ";
countSql += " group by t2.sku,t8.transfer_no "; countSql += " group by t1.`code`,t2.sku,t8.transfer_no ";
if (search_data.limit > 1000) if (search_data.limit > 1000)
{ {
total = 0; total = 0;
......
AutoTurnOver.DB/dc_auto_turnover.cs
...@@ -1235,11 +1235,11 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime ...@@ -1235,11 +1235,11 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
new transfer_profit_dto{ name ="空运周转金额",remarks = "空运周转数 * 采购价",days = new List<transfer_profit_dto.day_dto>()}, new transfer_profit_dto{ name ="空运周转金额",remarks = "空运周转数 * 采购价",days = new List<transfer_profit_dto.day_dto>()},
new transfer_profit_dto{ name ="空运周转运费",remarks="空运周转数 * 最便宜的空运物流跑出来的运费单价 ",days = new List<transfer_profit_dto.day_dto>()}, new transfer_profit_dto{ name ="空运周转运费",remarks="空运周转数 * 最便宜的空运物流跑出来的运费单价 ",days = new List<transfer_profit_dto.day_dto>()},
new transfer_profit_dto{ name ="实际-海运运费差值",remarks = "【实际周转运费】-【海运周转运费】",days = new List<transfer_profit_dto.day_dto>()}, new transfer_profit_dto{ name ="实际-海运运费差值",remarks = "【实际周转运费】-【海运周转运费】",days = new List<transfer_profit_dto.day_dto>()},
new transfer_profit_dto{ name ="实际-海运周转采购金额差值",remarks = "【实际建议周转金额】-【海运周转金额】",days = new List<transfer_profit_dto.day_dto>()}, new transfer_profit_dto{ name ="海运-实际周转采购金额差值",remarks = "【海运周转金额】-【实际建议周转金额】",days = new List<transfer_profit_dto.day_dto>()},
new transfer_profit_dto{ name ="差值(海运)-实际周转采购金额占比",remarks = "【实际-海运运费差值】/ 【实际建议周转金额】",days = new List<transfer_profit_dto.day_dto>()}, new transfer_profit_dto{ name ="差值(实际-海运)周转运费占比",remarks = "【实际-海运运费差值】/ 【实际周转运费】",days = new List<transfer_profit_dto.day_dto>()},
new transfer_profit_dto{ name ="实际-空运运费差值",remarks="【实际周转运费】-【空运周转运费】",days = new List<transfer_profit_dto.day_dto>()}, new transfer_profit_dto{ name ="空运-实际运费差值",remarks="-【空运周转运费】-【实际周转运费】",days = new List<transfer_profit_dto.day_dto>()},
new transfer_profit_dto{ name ="实际-空运周转采购金额差值",remarks = "【实际建议周转金额】-【空运周转金额】",days = new List<transfer_profit_dto.day_dto>()}, new transfer_profit_dto{ name ="实际-空运周转采购金额差值",remarks = "【实际建议周转金额】-【空运周转金额】",days = new List<transfer_profit_dto.day_dto>()},
new transfer_profit_dto{ name ="差值(空运)-实际周转采购金额占比",remarks = "【实际-空运运费差值】/ 【实际建议周转金额】",days = new List<transfer_profit_dto.day_dto>()}, new transfer_profit_dto{ name ="差值(空运-实际)周转运费占比",remarks = "【空运-实际运费差值】/ 【实际周转运费】",days = new List<transfer_profit_dto.day_dto>()},
new transfer_profit_dto{ name ="海运-空运运费差值",remarks="【海运周转运费】-【空运运周转运费】",days = new List<transfer_profit_dto.day_dto>()}, new transfer_profit_dto{ name ="海运-空运运费差值",remarks="【海运周转运费】-【空运运周转运费】",days = new List<transfer_profit_dto.day_dto>()},
new transfer_profit_dto{ name ="海运-空运周转采购金额差值",remarks="【海运周转金额】-【空运周转金额】",days = new List<transfer_profit_dto.day_dto>()}, new transfer_profit_dto{ name ="海运-空运周转采购金额差值",remarks="【海运周转金额】-【空运周转金额】",days = new List<transfer_profit_dto.day_dto>()},
new transfer_profit_dto{ name ="差值(海运-空运)-实际周转采购金额占比",remarks ="【海运-空运周转采购金额差值】/【实际建议周转金额】 ",days = new List<transfer_profit_dto.day_dto>()}, new transfer_profit_dto{ name ="差值(海运-空运)-实际周转采购金额占比",remarks ="【海运-空运周转采购金额差值】/【实际建议周转金额】 ",days = new List<transfer_profit_dto.day_dto>()},
...@@ -1272,10 +1272,10 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime ...@@ -1272,10 +1272,10 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
has_history_order = 90 has_history_order = 90
}).Where(s => s.min_freight_unit_price > 1); }).Where(s => s.min_freight_unit_price > 1);
var logoCeanData = logisticsDatas.Where(s => s.TransportType == 2).OrderBy(s => s.min_freight_unit_price).FirstOrDefault(); var logoCeanData = logisticsDatas.Where(s => s.TransportType == 2).OrderBy(s => s.min_freight_unit_price).FirstOrDefault();
modalData.freight_unit_price_ocean = Math.Round( logoCeanData.min_freight_unit_price.Value / (logoCeanData.min_freight_unit_weight ?? 1) * (dc_base_sku_data.weight / 1000),2); modalData.freight_unit_price_ocean = Math.Round(logoCeanData.min_freight_unit_price.Value / (logoCeanData.min_freight_unit_weight ?? 1) * (dc_base_sku_data.weight / 1000), 2);
var logoAirData = logisticsDatas.Where(s => s.TransportType == 3).OrderBy(s => s.min_freight_unit_price).FirstOrDefault(); var logoAirData = logisticsDatas.Where(s => s.TransportType == 3).OrderBy(s => s.min_freight_unit_price).FirstOrDefault();
modalData.freight_unit_price_air = Math.Round( logoAirData.min_freight_unit_price.Value / (logoAirData.min_freight_unit_weight ?? 1) * (dc_base_sku_data.weight / 1000),2); modalData.freight_unit_price_air = Math.Round(logoAirData.min_freight_unit_price.Value / (logoAirData.min_freight_unit_weight ?? 1) * (dc_base_sku_data.weight / 1000), 2);
var sales_details = result.sales_details.ToObj<List<decimal>>().Select(s => (int)Math.Ceiling(s)).ToList(); var sales_details = result.sales_details.ToObj<List<decimal>>().Select(s => (int)Math.Ceiling(s)).ToList();
var days30 = 30; var days30 = 30;
...@@ -1376,7 +1376,7 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime ...@@ -1376,7 +1376,7 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
{ {
date = this_time, date = this_time,
val = modalData.quantity_final_advise, val = modalData.quantity_final_advise,
formula =$" 【实际建议周转数】= 供应链长度预测销量（{result.turnover_sales}） + 安全库存（{ result.quantity_safe_inventory}） " formula = $" 【实际建议周转数】= 供应链长度预测销量（{result.turnover_sales}） + 安全库存（{ result.quantity_safe_inventory}） "
}); });
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);
...@@ -1401,7 +1401,7 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime ...@@ -1401,7 +1401,7 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
{ {
date = this_time, date = this_time,
val = modalData.freight_price, val = modalData.freight_price,
formula =$" 【实际周转运费】 = 【平均运费单价 {modalData.freight_unit_price}】 * 【实际周转数 {modalData.turnover}】 " formula = $" 【实际周转运费】 = 【平均运费单价 {modalData.freight_unit_price}】 * 【实际周转数 {modalData.turnover}】 "
}); });
// 实际建议周转运费 // 实际建议周转运费
...@@ -1416,7 +1416,7 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime ...@@ -1416,7 +1416,7 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
{ {
date = this_time, date = this_time,
val = modalData.quantity_final_advise_ocean, val = modalData.quantity_final_advise_ocean,
formula =$" 【海运周转数（推荐海运）】 = 海运供应链长度预测销量（{result_ocean.turnover_sales}） + 安全库存（{ result_ocean.quantity_safe_inventory}） " formula = $" 【海运周转数（推荐海运）】 = 海运供应链长度预测销量（{result_ocean.turnover_sales}） + 安全库存（{ result_ocean.quantity_safe_inventory}） "
}); });
modalData.quantity_final_advise_ocean_amount = Math.Round((modalData.quantity_final_advise_ocean ?? 0) * (modalData.unit_price ?? 0), 2); modalData.quantity_final_advise_ocean_amount = Math.Round((modalData.quantity_final_advise_ocean ?? 0) * (modalData.unit_price ?? 0), 2);
datas.FirstOrDefault(s => s.name == "海运周转金额").days.Add(new transfer_profit_dto.day_dto datas.FirstOrDefault(s => s.name == "海运周转金额").days.Add(new transfer_profit_dto.day_dto
...@@ -1438,7 +1438,7 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime ...@@ -1438,7 +1438,7 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
{ {
date = this_time, date = this_time,
val = modalData.quantity_final_advise_air, val = modalData.quantity_final_advise_air,
formula =$" 【空运周转数（推荐空运）】 = 空运供应链长度预测销量（{result_air.turnover_sales}） + 安全库存（{ result_air.quantity_safe_inventory}）" formula = $" 【空运周转数（推荐空运）】 = 空运供应链长度预测销量（{result_air.turnover_sales}） + 安全库存（{ result_air.quantity_safe_inventory}）"
}); });
modalData.quantity_final_advise_air_amount = Math.Round(modalData.quantity_final_advise_air * modalData.unit_price ?? 0, 2); modalData.quantity_final_advise_air_amount = Math.Round(modalData.quantity_final_advise_air * modalData.unit_price ?? 0, 2);
datas.FirstOrDefault(s => s.name == "空运周转金额").days.Add(new transfer_profit_dto.day_dto datas.FirstOrDefault(s => s.name == "空运周转金额").days.Add(new transfer_profit_dto.day_dto
...@@ -1461,31 +1461,31 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime ...@@ -1461,31 +1461,31 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
{ {
date = this_time, date = this_time,
val = modalData.freight_price_ocean_difference_amount, val = modalData.freight_price_ocean_difference_amount,
formula =$"【实际-海运运费差值】= 【实际建议周转运费 {modalData.quantity_final_advise_freight }】 - 【海运周转运费 {modalData.freight_price_ocean}】" formula = $"【实际-海运运费差值】= 【实际建议周转运费 {modalData.quantity_final_advise_freight }】 - 【海运周转运费 {modalData.freight_price_ocean}】"
}); });
modalData.quantity_final_ocean_difference_amount = modalData.quantity_final_advise_amount - modalData.quantity_final_advise_ocean_amount; modalData.quantity_final_ocean_difference_amount = modalData.quantity_final_advise_ocean_amount - modalData.quantity_final_advise_amount ;
datas.FirstOrDefault(s => s.name == "实际-海运周转采购金额差值").days.Add(new transfer_profit_dto.day_dto datas.FirstOrDefault(s => s.name == "海运-实际周转采购金额差值").days.Add(new transfer_profit_dto.day_dto
{ {
date = this_time, date = this_time,
val = modalData.quantity_final_ocean_difference_amount, val = modalData.quantity_final_ocean_difference_amount,
formula = $"【实际-海运周转采购金额差值】= 【实际建议周转金额 {modalData.quantity_final_advise_amount }】 - 【海运周转金额 {modalData.quantity_final_advise_ocean_amount}】" formula = $"【海运-实际周转采购金额差值】= 【海运周转金额 {modalData.quantity_final_advise_ocean_amount}】-【实际建议周转金额 {modalData.quantity_final_advise_amount }】 "
}); });
datas.FirstOrDefault(s => s.name == "差值(海运)-实际周转采购金额占比").days.Add(new transfer_profit_dto.day_dto datas.FirstOrDefault(s => s.name == "差值(实际-海运)周转运费占比").days.Add(new transfer_profit_dto.day_dto
{ {
date = this_time, date = this_time,
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)), val = (modalData.quantity_final_advise_freight ?? 0) <= 0 ? 0M : (Math.Round((modalData.freight_price_ocean_difference_amount ?? 0) / modalData.quantity_final_advise_freight.Value, 3)),
formula = $"【差值(海运)-实际周转采购金额占比】 = 【实际-海运周转采购金额差值 {modalData.quantity_final_ocean_difference_amount}】/ 【实际建议周转金额 {modalData.quantity_final_advise_amount}】 " formula = $"【差值(实际-海运)周转运费占比】 = 【实际-海运运费差值 {modalData.freight_price_ocean_difference_amount}】/ 【实际建议周转运费 {modalData.quantity_final_advise_freight}】 "
}); });
modalData.freight_price_air_difference_amount = modalData.quantity_final_advise_freight - modalData.freight_price_air; modalData.freight_price_air_difference_amount = modalData.freight_price_air -modalData.quantity_final_advise_freight ;
datas.FirstOrDefault(s => s.name == "实际-空运运费差值").days.Add(new transfer_profit_dto.day_dto datas.FirstOrDefault(s => s.name == "实际-空运运费差值").days.Add(new transfer_profit_dto.day_dto
{ {
date = this_time, date = this_time,
val = modalData.freight_price_air_difference_amount, val = modalData.freight_price_air_difference_amount,
formula = $"【实际-空运运费差值】= 【实际建议周转运费 {modalData.quantity_final_advise_freight }】 - 【空运运周转运费 {modalData.freight_price_air}】" formula = $"【实际-空运运费差值】= 【空运运周转运费 {modalData.freight_price_air}】-【实际建议周转运费 {modalData.quantity_final_advise_freight }】 "
}); });
modalData.quantity_final_air_difference_amount = modalData.quantity_final_advise_amount - modalData.quantity_final_advise_air_amount; modalData.quantity_final_air_difference_amount = modalData.quantity_final_advise_amount - modalData.quantity_final_advise_air_amount;
...@@ -1493,15 +1493,15 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime ...@@ -1493,15 +1493,15 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
{ {
date = this_time, date = this_time,
val = modalData.quantity_final_air_difference_amount, val = modalData.quantity_final_air_difference_amount,
formula = $"【实际-空运运周转采购金额差值】= 【实际建议周转金额 {modalData.quantity_final_advise_amount }】 - 【空运周转金额 {modalData.quantity_final_advise_air_amount}】" formula = $"【实际-空运周转采购金额差值】= 【实际建议周转金额 {modalData.quantity_final_advise_amount }】 - 【空运周转金额 {modalData.quantity_final_advise_air_amount}】"
}); });
datas.FirstOrDefault(s => s.name == "差值(空运)-实际周转采购金额占比").days.Add(new transfer_profit_dto.day_dto datas.FirstOrDefault(s => s.name == "差值(空运-实际)周转运费占比").days.Add(new transfer_profit_dto.day_dto
{ {
date = this_time, date = this_time,
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)), val = (modalData.quantity_final_advise_freight ?? 0) <= 0 ? 0M : (Math.Round((modalData.freight_price_air_difference_amount ?? 0) / modalData.quantity_final_advise_freight.Value, 3)),
formula = $"【差值(空运)-实际周转采购金额占比】 = 【实际-空运周转采购金额差值 {modalData.quantity_final_air_difference_amount}】/ 【实际建议周转金额 {modalData.quantity_final_advise_amount}】 " formula = $"【差值(空运-实际)周转运费占比】 = 【海运-实际运费差值 {modalData.freight_price_air_difference_amount}】/ 【实际建议周转运费 {modalData.quantity_final_advise_freight}】 "
}); });
} }
...@@ -1677,21 +1677,21 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime ...@@ -1677,21 +1677,21 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
date = this_time, date = this_time,
val = modalData.freight_price_ocean_difference_amount val = modalData.freight_price_ocean_difference_amount
}); });
modalData.quantity_final_ocean_difference_amount = modalData.quantity_final_advise_amount - modalData.quantity_final_advise_ocean_amount; modalData.quantity_final_ocean_difference_amount = modalData.quantity_final_advise_ocean_amount -modalData.quantity_final_advise_amount ;
datas.FirstOrDefault(s => s.name == "实际-海运周转采购金额差值").days.Add(new transfer_profit_dto.day_dto datas.FirstOrDefault(s => s.name == "海运-实际周转采购金额差值").days.Add(new transfer_profit_dto.day_dto
{ {
date = this_time, date = this_time,
val = modalData.quantity_final_ocean_difference_amount val = modalData.quantity_final_ocean_difference_amount
}); });
datas.FirstOrDefault(s => s.name == "差值(海运)-实际周转采购金额占比").days.Add(new transfer_profit_dto.day_dto datas.FirstOrDefault(s => s.name == "差值(实际-海运)周转运费占比").days.Add(new transfer_profit_dto.day_dto
{ {
date = this_time, date = this_time,
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)) val = (modalData.quantity_final_advise_freight ?? 0) <= 0 ? 0M : (Math.Round(modalData.freight_price_ocean_difference_amount ?? 0 / modalData.quantity_final_advise_freight.Value, 3))
}); });
modalData.freight_price_air_difference_amount = modalData.quantity_final_advise_freight - modalData.freight_price_air; modalData.freight_price_air_difference_amount = modalData.quantity_final_advise_freight - modalData.freight_price_air;
datas.FirstOrDefault(s => s.name == "实际-空运运费差值").days.Add(new transfer_profit_dto.day_dto datas.FirstOrDefault(s => s.name == "空运-实际运费差值").days.Add(new transfer_profit_dto.day_dto
{ {
date = this_time, date = this_time,
val = modalData.freight_price_air_difference_amount val = modalData.freight_price_air_difference_amount
...@@ -1703,10 +1703,10 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime ...@@ -1703,10 +1703,10 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
val = modalData.quantity_final_air_difference_amount val = modalData.quantity_final_air_difference_amount
}); });
datas.FirstOrDefault(s => s.name == "差值(空运)-实际周转采购金额占比").days.Add(new transfer_profit_dto.day_dto datas.FirstOrDefault(s => s.name == "差值(空运-实际)周转运费占比").days.Add(new transfer_profit_dto.day_dto
{ {
date = this_time, date = this_time,
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)) val = (modalData.quantity_final_advise_freight ?? 0) <= 0 ? 0M : (Math.Round(modalData.freight_price_air_difference_amount ?? 0 / modalData.quantity_final_advise_freight.Value, 3))
}); });
#endregion #endregion
......
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