fix

AutoTurnOver.DB/dc_auto_turnover.cs

@@ -1963,7 +1963,7 @@ from dc_base_oms_sku where bailun_sku=@bailun_sku and warehouse_code=@warehouse_
             while (true)
             {
                 var datas = conn.Query<sku_warehouse_code_dto>($@" select t1.bailun_sku,t1.warehouse_code from dc_auto_turnover as t1 left join dc_base_warehouse as t2 on t1.warehouse_code =t2.warehouse_code 
-where t2.hq_type not in ('国内仓') and t1.gmt_modified>=@btime and t1.gmt_modified <=@etime 
+where t2.hq_type not in ('国内仓') and t1.gmt_modified>=@btime and t1.gmt_modified <=@etime and t1.daily_weighted_sales>1
 order by t1.gmt_modified asc 
  limit {(page - 1) * rows},{rows}  ", new { btime = new_task_synchro_log.start_time, etime = new_task_synchro_log.end_time }).ToList();
                 if (datas.Count <= 0) { break; }

AutoTurnOver.Services/SkuAutoTurnServices.cs

@@ -712,7 +712,7 @@ namespace AutoTurnOver.Services
                     DataTable table = new DataTable();
                     string[] cols = new string[] { "sku", "国家", "仓库类型", "仓库", "默认调拨方式", "180天日均",  "90天日均", "30天日均","7天日均", "采购单价", "实际建议周转数",
                         "实际建议周转金额",  "实际周转数",  "实际周转运费",   "实际运费单价",  "海运周转数（推荐海运）", "海运周转金额", "海运周转运费", "空运周转数（推荐空运）", "空运周转金额",
-                        "空运周转运费", "实际-海运周转采购金额差值"  ,"实际-空运运费差值", "实际-空运周转采购金额差值", "海运-空运运费差值", "海运-空运周转采购金额差值", "安全库存数量", "空运周转天数",
+                        "空运周转运费","实际-海运运费差值", "实际-海运周转采购金额差值"  ,"实际-空运运费差值", "实际-空运周转采购金额差值", "海运-空运运费差值", "海运-空运周转采购金额差值", "安全库存数量", "空运周转天数",
                         "海运周转天数", "30天预测销量海运运费-实际周转运费金额", "30天预测销量空运运费-实际周转运费金额", "30天预测销量空运运费-海运周转运费金额"
                         , "差值(实际-海运)/实际周转采购金额占比"   , "差值(海运-空运)/实际周转采购金额占比" , "差值(空运-实际)/实际周转采购金额占比"
                         , "海运与实际运费差额/库存差额"   , "空运与实际运费差额/库存差额"  , "30天销量海运与实际运费差额/库存差额"  , "30天销量空运与实际运费差额/库存差额" , "补海运周转数" , "补海运周转金额"
@@ -731,36 +731,43 @@ namespace AutoTurnOver.Services
                         row["仓库类型"] = itemData.warehouse_type;
                         row["默认调拨方式"] = itemData.transport_type;
 
-                        row["180天日均"] = itemData.transport_type;
-                        row["90天日均"] = itemData.transport_type;
-                        row["30天日均"] = itemData.transport_type;
-                        row["7天日均"] = itemData.transport_type;
-                        row["采购单价"] = itemData.transport_type;
-                        row["实际建议周转数"] = itemData.transport_type;
-                        row["实际建议周转金额"] = itemData.transport_type;
-                        row["实际周转数"] = itemData.transport_type;
-                        row["实际周转运费"] = itemData.transport_type;
-                        row["实际运费单价"] = itemData.transport_type;
-                        row["海运周转数（推荐海运）"] = itemData.transport_type;
-                        row["海运周转金额"] = itemData.transport_type;
-                        row["海运周转运费"] = itemData.transport_type;
-                        row["空运周转数（推荐空运）"] = itemData.transport_type;
-                        row["空运周转金额"] = itemData.transport_type;
-                        row["空运周转运费"] = itemData.transport_type;
-                        row["实际-海运周转采购金额差值"] = itemData.transport_type;
-                        row["实际-空运运费差值"] = itemData.transport_type;
-                        row["实际-空运周转采购金额差值"] = itemData.transport_type;
-                        row["海运-空运运费差值"] = itemData.transport_type;
-                        row["海运-空运周转采购金额差值"] = itemData.transport_type;
-                        row["安全库存数量"] = itemData.transport_type;
-                        row["空运周转天数"] = itemData.transport_type;
-                        row["海运周转天数"] = itemData.transport_type;
-                        row["30天预测销量海运运费-实际周转运费金额"] = itemData.transport_type;
-                        row["30天预测销量空运运费-实际周转运费金额"] = itemData.transport_type;
-                        row["30天预测销量空运运费-海运周转运费金额"] = itemData.transport_type;
-                        row["差值(实际-海运)/实际周转采购金额占比"] = itemData.transport_type;
-                        row["差值(海运-空运)/实际周转采购金额占比"] = itemData.transport_type;
-                        row["差值(空运-实际)/实际周转采购金额占比"] = itemData.transport_type;
+                        row["180天日均"] = itemData.sales_avg_180;
+                        row["90天日均"] = itemData.sales_avg_90;
+                        row["30天日均"] = itemData.sales_avg_30;
+                        row["7天日均"] = itemData.sales_avg_7;
+                        row["采购单价"] = itemData.unit_price;
+                        row["实际建议周转数"] = itemData.quantity_final_advise;
+                        row["实际建议周转金额"] = itemData.quantity_final_advise_amount;
+                        row["实际周转数"] = itemData.turnover;
+                        row["实际周转运费"] = itemData.freight_price;
+                        row["实际运费单价"] = itemData.freight_unit_price;
+                        row["海运周转数（推荐海运）"] = itemData.quantity_final_advise_ocean;
+                        row["海运周转金额"] = itemData.quantity_final_advise_ocean_amount;
+                        row["海运周转运费"] = itemData.freight_price_ocean;
+                        row["空运周转数（推荐空运）"] = itemData.quantity_final_advise_air;
+                        row["空运周转金额"] = itemData.quantity_final_advise_air_amount;
+                        row["空运周转运费"] = itemData.freight_price_air;
+                        row["实际-海运运费差值"] = itemData.freight_price_ocean_difference_amount;
+                        row["实际-海运周转采购金额差值"] = itemData.quantity_final_ocean_difference_amount;
+                        row["实际-空运运费差值"] = itemData.freight_price_air_difference_amount;
+                        row["实际-空运周转采购金额差值"] = itemData.freight_price_air_difference_amount;
+                        row["海运-空运运费差值"] = itemData.freight_price_ocean_air_difference;
+                        row["海运-空运周转采购金额差值"] = itemData.quantity_final__ocean_air_difference_amount;
+                        row["安全库存数量"] = itemData.quantity_safe_inventory;
+                        row["空运周转天数"] = itemData.turnover_days_air;
+                        row["海运周转天数"] = itemData.turnover_days_ocean;
+                        row["30天预测销量海运运费-实际周转运费金额"] = itemData.freight_price_ocean_30_difference;
+                        row["30天预测销量空运运费-实际周转运费金额"] = itemData.freight_price_air_30_difference;
+                        row["30天预测销量空运运费-海运周转运费金额"] = itemData.freight_price_air_ocean_30_difference;
+                        row["差值(实际-海运)/实际周转采购金额占比"] = itemData.freight_price_ocean_difference_amount_radio;
+                        row["差值(海运-空运)/实际周转采购金额占比"] = itemData.freight_price_air_difference_amount_radio;
+                        row["差值(空运-实际)/实际周转采购金额占比"] = itemData.freight_price_ocean_air_difference_radio;
+                        row["海运与实际运费差额/库存差额"] = itemData.freight_stock_amount_ocean;
+                        row["空运与实际运费差额/库存差额"] = itemData.freight_stock_amount_air;
+                        row["30天销量海运与实际运费差额/库存差额"] = itemData.freight_stock_amount_ocean_30;
+                        row["30天销量空运与实际运费差额/库存差额"] = itemData.freight_stock_amount_air_30;
+                        row["补海运周转数"] = itemData.ocean_purchase;
+                        row["补海运周转金额"] = itemData.ocean_purchase_amount;
 
                         table.Rows.Add(row);
                     }