fix

AutoTurnOver.DB/dc_auto_turnover.cs

@@ -1907,8 +1907,8 @@ from dc_base_oms_sku where bailun_sku=@bailun_sku and warehouse_code=@warehouse_
                 etime1 = DateTime.Now.AddDays(-1).ToDayEnd(),
             },commandTimeout:0) ?? 0)/180;
 
-            data.freight_stock_amount_ocean = data.quantity_final_advise_amount<=0?0:((0 - data.freight_price_ocean_difference_amount) / data.quantity_final_advise_amount);
-            data.freight_stock_amount_air = data.quantity_final_advise_amount<=0?0:((0-data.freight_price_air_difference_amount) / data.quantity_final_advise_amount);
+            data.freight_stock_amount_ocean = data.quantity_final_ocean_difference_amount <= 0?0:((0 - data.freight_price_ocean_difference_amount) / data.quantity_final_ocean_difference_amount);
+            data.freight_stock_amount_air = data.quantity_final_air_difference_amount <= 0?0:((0-data.freight_price_air_difference_amount) / data.quantity_final_air_difference_amount);
             data.freight_stock_amount_ocean_30 = data.quantity_final_advise_amount <= 0 ? 0 : (( data.freight_price_ocean_30_difference) / data.quantity_final_advise_amount);
             data.freight_stock_amount_air_30 = data.quantity_final_advise_amount<=0?0:(( data.freight_price_air_30_difference) / data.quantity_final_advise_amount);
 

AutoTurnOver.Services/SkuAutoTurnServices.cs

@@ -715,7 +715,7 @@ namespace AutoTurnOver.Services
                         "空运周转运费","实际-海运运费差值", "实际-海运周转采购金额差值"  ,"实际-空运运费差值", "实际-空运周转采购金额差值", "海运-空运运费差值", "海运-空运周转采购金额差值", "安全库存数量", "空运周转天数",
                         "海运周转天数", "30天预测销量海运运费-实际周转运费金额", "30天预测销量空运运费-实际周转运费金额", "30天预测销量空运运费-海运周转运费金额"
                         , "差值(实际-海运)/实际周转采购金额占比"   , "差值(海运-空运)/实际周转采购金额占比" , "差值(空运-实际)/实际周转采购金额占比"
-                        , "海运与实际运费差额/库存差额"   , "空运与实际运费差额/库存差额"  , "30天销量海运与实际运费差额/库存差额"  , "30天销量空运与实际运费差额/库存差额" , "补海运周转数" , "补海运周转金额"
+                        , "海运与实际运费差额/库存差额"   , "空运与实际运费差额/库存差额"  , "30天销量海运与实际运费差额/库存金额"  , "30天销量空运与实际运费差额/库存金额" , "补海运周转数" , "补海运周转金额"
 };
                     foreach (var item in cols)
                     {
@@ -764,8 +764,8 @@ namespace AutoTurnOver.Services
                         row["差值(空运-实际)/实际周转采购金额占比"] = itemData.freight_price_air_difference_amount_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["30天销量海运与实际运费差额/库存金额"] = itemData.freight_stock_amount_ocean_30;
+                        row["30天销量空运与实际运费差额/库存金额"] = itemData.freight_stock_amount_air_30;
                         row["补海运周转数"] = itemData.ocean_purchase;
                         row["补海运周转金额"] = itemData.ocean_purchase_amount;