fix

AutoTurnOver.DB/AveragePurchase.cs

@@ -38,18 +38,17 @@ GROUP BY t1.bailun_sku,t1.warehouse_code,t1.supplier_id ", new { c_time  = DateT
         {
             DynamicParameters parameters = new DynamicParameters();
             parameters.Add("c_time", DateTime.Now.AddDays(0 - day).ToString("yyyy-MM-dd 00:00:00"));
-            var sql = @"select t2.hq_type,tsku.sku as 'bailun_sku',t1.targetwareno as 'warehouse_code'
-from dc_base_transfer_info as t1 
-left join dc_base_transfer_info_skus as tsku on t1.dataid = tsku.dataid
-left join dc_base_warehouse as t2 on t1.targetwareno = t2.warehouse_code
-where t1.isdeleted=0  and t1.`timestamp`>=@c_time
+            var sql = @"select t2.hq_type,t1.bailun_sku as 'bailun_sku',t1.warehouse_code as 'warehouse_code'
+from dc_base_stock as t1 
+left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code
+where t1.`gmt_modified`>=@c_time
 ";
             if (!string.IsNullOrWhiteSpace(bailun_sku))
             {
-                sql += " and tsku.sku=@bailun_sku ";
+                sql += " and t1.bailun_sku=@bailun_sku ";
                 parameters.Add("bailun_sku", bailun_sku);
             }
-            sql += " group by tsku.sku,t1.targetwareno ";
+            sql += " group by t1.bailun_sku,t1.warehouse_code ";
             return _connection.Query<temp_sku_dto>(sql, parameters);
             
 

AutoTurnOver.DB/daily.cs

@@ -220,26 +220,71 @@ UNION ALL
                 }
                 else
                 {
-                    var nos = relation.Replace("[", "").Replace("]", "").Split(',')[index];
-                    var datas = new List<dc_estimated_arrival_dto>();
-                    if (nos != "N/A")
+                    if (index >= 0)
                     {
-                        foreach (var no_str in nos.Split('*'))
+                        var nos = relation.Replace("[", "").Replace("]", "").Split(',')[index];
+                        var datas = new List<dc_estimated_arrival_dto>();
+                        if (nos != "N/A")
                         {
-                            var no_datas = no_str.Split('_');
-                            dc_estimated_arrival_dto data = new dc_estimated_arrival_dto();
-                            data.type = no_datas[0].Contains("p") ? 1 : no_datas[0].Contains("t") ? 2 : 0;
-                            data.no = no_datas[1];
-                            data.quantity = decimal.Parse(no_datas[2]);
-                            datas.Add(data);
+                            foreach (var no_str in nos.Split('*'))
+                            {
+                                var no_datas = no_str.Split('_');
+                                dc_estimated_arrival_dto data = new dc_estimated_arrival_dto();
+                                data.type = no_datas[0].Contains("p") ? 1 : no_datas[0].Contains("t") ? 2 : 0;
+                                data.no = no_datas[1];
+                                data.quantity = decimal.Parse(no_datas[2]);
+                                datas.Add(data);
+
+                            }
 
+                            return datas;
                         }
 
+
                         return datas;
                     }
-
-
-                    return datas;
+                    else
+                    {
+                        // 查询周转表
+                        var dc_auto_turnover_data = _connection.QuerySingleOrDefault<AutoTurnOver.Models.dc_auto_turnover>(" select * from dc_auto_turnover where bailun_sku=@bailun_sku and warehouse_code=@warehouse_code ",new {
+                            bailun_sku = sku,
+                            warehouse_code = warehouse_code
+                        });
+                        var datas = new List<dc_estimated_arrival_dto>();
+                        var nos_list = relation.Replace("[", "").Replace("]", "").Split(',');
+                        int count = 0;
+                        foreach (var nos in nos_list)
+                        {
+                            count++;
+                            if(dc_auto_turnover_data.turnover_days< count)
+                            {
+                                break;
+                            }
+                            if (nos != "N/A")
+                            {
+                                foreach (var no_str in nos.Split('*'))
+                                {
+                                    try
+                                    {
+                                        var no_datas = no_str.Split('_');
+                                        dc_estimated_arrival_dto data = new dc_estimated_arrival_dto();
+                                        data.type = no_datas[0].Contains("p") ? 1 : no_datas[0].Contains("t") ? 2 : 0;
+                                        data.no = no_datas[1];
+                                        data.quantity = decimal.Parse(no_datas[2]);
+                                        datas.Add(data);
+                                    }
+                                    catch (Exception ex)
+                                    {
+
+                                    }
+                                    
+
+                                }
+                            }
+                        }
+                        return datas;
+                    }
+                   
                 }
             }
         }

AutoTurnOver.Services/PurchaseAverageTargetServices.cs

@@ -172,7 +172,7 @@ namespace AutoTurnOver.Services
         }
 
         public static void CalculationTransfer(string bailun_sku = "", int days = 30)
-        {
+         {
 
             MyMySqlConnection conn = connectionHelper._connection;
 

AutoTurnOver/Controllers/ReportsController.cs

@@ -121,7 +121,7 @@ namespace AutoTurnOver.Controllers
 
                 // 累计预计到货
                 decimal turnoverDatepurchase = 0;
-                var purchaseList = result[4].ToObj<List<decimal>>();
+                var purchaseList = result[3].ToObj<List<decimal>>();
                 for (int i = 7; i < turnoverData.turnover_days + 7; i++)
                 {
                     turnoverDatepurchase += purchaseList[i];
@@ -165,7 +165,7 @@ namespace AutoTurnOver.Controllers
                    
                     turnoverDateStr = turnoverDate.ToString("yyyy-MM-dd"), // 取值日期
                     turnoverDateSales = turnoverDateSales, // 当日预测销量
-                    turnoverDateStock = (int)result[5].ToObj<List<decimal>>()[turnoverData.turnover_days + 7 - 1],   // 当日预测库存,
+                    turnoverDateStock = (int)result[4].ToObj<List<decimal>>()[turnoverData.turnover_days + 7 - 1],   // 当日预测库存,
                     turnoverDatecumulativeSales = (int)turnoverDatecumulativeSales, // 累计销量
                     nowStr = DateTime.Now.ToString("yyyy-MM-dd"), // 今天的日期
                     nowShortage = (int)result[6].ToObj<List<decimal>>()[7], // 今天的实际缺货