Commit e63815af by 泽锋 李

fix

parent 74ca65e2
...@@ -1900,8 +1900,8 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime ...@@ -1900,8 +1900,8 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
profit_data.ocean_purchase_amount = profit_data.ocean_purchase * profit_data.unit_price; profit_data.ocean_purchase_amount = profit_data.ocean_purchase * profit_data.unit_price;
profit_data.freight_stock_amount_ocean = profit_data.quantity_final_ocean_difference_amount <= 0 ? 0 : ((profit_data.freight_price_ocean_difference_amount) / (profit_data.quantity_final_ocean_difference_amount)); profit_data.freight_stock_amount_ocean = profit_data.quantity_final_ocean_difference_amount <= 0 ? 0 : ((profit_data.freight_price_ocean_difference_amount) / (profit_data.quantity_final_ocean_difference_amount));
profit_data.freight_stock_amount_air = profit_data.quantity_final_air_difference_amount <= 0 ? 0 : ((profit_data.freight_price_air_difference_amount) / (profit_data.quantity_final_air_difference_amount)); profit_data.freight_stock_amount_air = profit_data.quantity_final_air_difference_amount <= 0 ? 0 : ((profit_data.freight_price_air_difference_amount) / (profit_data.quantity_final_air_difference_amount));
profit_data.freight_stock_amount_ocean_30 = profit_data.quantity_final_advise_amount <= 0 ? 0 : (Math.Abs(profit_data.freight_price_ocean_30_difference) / profit_data.turnover_amount); profit_data.freight_stock_amount_ocean_30 = profit_data.turnover_amount <= 0 ? 0 : (Math.Abs(profit_data.freight_price_ocean_30_difference) / profit_data.turnover_amount);
profit_data.freight_stock_amount_air_30 = profit_data.quantity_final_advise_amount <= 0 ? 0 : (Math.Abs(profit_data.freight_price_air_30_difference) / profit_data.turnover_amount); profit_data.freight_stock_amount_air_30 = profit_data.turnover_amount <= 0 ? 0 : (Math.Abs(profit_data.freight_price_air_30_difference) / profit_data.turnover_amount);
var formula_json = profit_data.ToJson(); var formula_json = profit_data.ToJson();
dc_report_profit_analysis data = formula_json.ToObj<dc_report_profit_analysis>(); dc_report_profit_analysis data = formula_json.ToObj<dc_report_profit_analysis>();
data.bailun_sku = bailun_sku; data.bailun_sku = bailun_sku;
......
...@@ -24,7 +24,7 @@ namespace AutoTurnOver.Purchase.AverageTarget ...@@ -24,7 +24,7 @@ namespace AutoTurnOver.Purchase.AverageTarget
try try
{ {
//report.ResetTransExpectArrivaltime(); //report.ResetTransExpectArrivaltime();
//PurchaseAverageTargetServices.CalculationTransfer("284067113", days: (360 * 3)); //PurchaseAverageTargetServices.CalculationTransfer("LM-EO-007", days: (360 * 3));
//PurchaseAverageTargetServices.Calculation("942517901", days: (360 * 3)); //PurchaseAverageTargetServices.Calculation("942517901", days: (360 * 3));
//ApiUtility.GetLmsTransportCountList(new Models.ApiDto.api_transport_count_order_transfer_query_dto { bailun_sku= "LM-EO-007", targetwareno= "MMDUSFBA" }); //ApiUtility.GetLmsTransportCountList(new Models.ApiDto.api_transport_count_order_transfer_query_dto { bailun_sku= "LM-EO-007", targetwareno= "MMDUSFBA" });
......
...@@ -350,10 +350,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp ...@@ -350,10 +350,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
if (skuItem.warehouse_code == "MMDUSFBA") if (skuItem.warehouse_code == "MMDUSFBA")
{ {
} if (skuItem.warehouse_code == "GB4PXBL") }
{
}
var base_wa = conn.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 { skuItem.warehouse_code }); var base_wa = conn.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 { skuItem.warehouse_code });
var purchaseWList = AveragePurchase.GetPurchaseList(skuItem, _seed_count).ToList(); var purchaseWList = AveragePurchase.GetPurchaseList(skuItem, _seed_count).ToList();
......
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