fix

AutoTurnOver.DB/dc_auto_turnover.cs

@@ -1290,9 +1290,9 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
                     sales30 += sales_details[i];
                 }
             }
-            var advised_details = result.advised_details.ToObj<List<decimal>>();
-            var advised_details_air = result_air.advised_details.ToObj<List<decimal>>();
-            var advised_details_ocean = result_ocean.advised_details.ToObj<List<decimal>>();
+            //var sales_details = result.sales_details.ToObj<List<decimal>>();
+            var sales_details_air = result_air.sales_details.ToObj<List<decimal>>();
+            var sales_details_ocean = result_ocean.sales_details.ToObj<List<decimal>>();
             if (btime == null)
             {
                 btime = DateTime.Now.AddDays(-30);
@@ -1308,12 +1308,13 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
                 // 预测未来
                 if (this_time_end >= now)
                 {
-                    var dc_base_transfer_freight_data = _connection.QueryFirstOrDefault<dc_base_transfer_freight>(" select freight_unit_price from dc_base_transfer_freight where warehouse_code=@warehouse_code and bailun_sku=@bailun_sku limit 1 ", new
+                    var dc_base_transfer_freight_data = _connection.QueryFirstOrDefault<dc_base_transfer_freight>(" select * from dc_base_transfer_freight where warehouse_code=@warehouse_code and bailun_sku=@bailun_sku limit 1 ", new
                     {
                         warehouse_code = result.warehouse_code,
                         bailun_sku = result.bailun_sku
                     }) ?? new dc_base_transfer_freight { };
                     modalData.freight_unit_price = dc_base_transfer_freight_data.freight_unit_price;
+                    modalData.freight_price = dc_base_transfer_freight_data.freight;
                     modalData.freight_unit_price_formula = dc_base_transfer_freight_data.formula;
                     datas.FirstOrDefault(s => s.name == "实际运费单价").days.Add(new transfer_profit_dto.day_dto
                     {
@@ -1326,9 +1327,9 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
                     modalData.transfer_days = result.transfer_delivery + ((int)Math.Ceiling(result.abroad_inbound_delivery)) + ((int)Math.Ceiling(result.transfer_bale_delivery));
                     modalData.transfer_days_ocean = result_ocean.transfer_delivery + ((int)Math.Ceiling(result_ocean.abroad_inbound_delivery)) + ((int)Math.Ceiling(result_ocean.transfer_bale_delivery));
 
-                    modalData.transfer_sales = advised_details.Where((s,a_index)=> a_index > 7 && a_index <= (7+ modalData.transfer_days)).Sum();
-                    modalData.transfer_sales_air = advised_details_air.Where((s,a_index)=> a_index > 7 && a_index <= (7+ modalData.transfer_days_air)).Sum();
-                    modalData.transfer_sales_ocean = advised_details_ocean.Where((s,a_index)=> a_index > 7 && a_index <= (7+ modalData.transfer_days_ocean)).Sum();
+                    modalData.transfer_sales = sales_details.Where((s,a_index)=> a_index > 7 && a_index <= (7+ modalData.transfer_days)).Sum();
+                    modalData.transfer_sales_air = sales_details_air.Where((s,a_index)=> a_index > 7 && a_index <= (7+ modalData.transfer_days_air)).Sum();
+                    modalData.transfer_sales_ocean = sales_details_ocean.Where((s,a_index)=> a_index > 7 && a_index <= (7+ modalData.transfer_days_ocean)).Sum();
 
                     //30天周转数
                     modalData.quantity_final_advise_30 = sales30;
@@ -1459,7 +1460,7 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
                         formula = $" 【实际周转数】 = 采购+调拨在途 （{quantity_transfer + quantity_purchase}） + 在库 （{dc_stock_data}） "
                     });
 
-                    modalData.freight_price = dc_base_transfer_freight_data.freight; ;
+                    modalData.freight_price = dc_base_transfer_freight_data.freight; 
                     datas.FirstOrDefault(s => s.name == "实际周转运费").days.Add(new transfer_profit_dto.day_dto
                     {
                         date = this_time,
@@ -1683,7 +1684,7 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
                     });
 
                     //modalData.quantity_final_advise_freight = modalData.quantity_final_advise * modalData.freight_unit_price;
-                    modalData.freight_price = modalData.purchase_quantity * modalData.freight_unit_price;
+                    //modalData.freight_price = modalData.purchase_quantity * modalData.freight_unit_price;
                     datas.FirstOrDefault(s => s.name == "实际周转运费").days.Add(new transfer_profit_dto.day_dto
                     {
                         date = this_time,