fix

AutoTurnOver.DB/daily.cs

@@ -7,6 +7,7 @@ using AutoTurnOver.Models.ApiDto;
 using MySql.Data.MySqlClient;
 using System.Text;
 using AutoTurnOver.Utility;
+using AutoTurnOver.Models.Report;
 
 namespace AutoTurnOver.DB
 {
@@ -1305,6 +1306,277 @@ where id=@id
 
 
         }
+
+        /// <summary>
+        /// 查询供应链在途
+        /// </summary>
+        /// <param name="sku">sku</param>
+        /// <param name="warehouse_code">仓库编码</param>
+        /// <returns></returns>
+        public static List<full_link_purchase_dto> FullLinkPurchaseList(dc_base_stock_search_dto search_data, List<bailun_category_new_dto> categoryModels, ref int total)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            var sql = "";
+            if (search_data.isSum || search_data.is_warehouse_sum)
+            {
+                throw new Exception("暂不做汇总处理");
+            }
+            else
+            {
+                sql = @" 
+select 
t1.bailun_sku,
+t1.warehouse_code as 'warehouse_code',
+t2.warehouse_name as 'warehouse_name',
+t3.sku_title_cn as 'product_title',
+t3.buyer_name as 'buyer_name',
+t3.product_type_desc as 'product_type_desc',
+
+
+t4.usable_stock as 'stock',
+t5.quantity_transfer as 'quantity_transfer',
+t5.quantity_transfer_order as 'quantity_transfer_order',
+t5.quantity_transfer_temp_schedule as 'quantity_transfer_temp_schedule',
+t5.quantity_transfer_temporary_storage as 'quantity_transfer_temporary_storage',
+
+t6.history_sevenday_sales as 'history_sevenday_sales',
+t6.history_fourteenday_sales as 'history_fourteenday_sales',
+t6.history_thirtyday_sales as 'history_thirtyday_sales',
+t7.type as 'forecast_type',
+
+t1.purchase_id as 'purchase_id',
+t1.quantity_purchase as 'quantity_purchase',
+t1.`status` as 'purchase_status',
+t1.`last_signtime` as 'last_signtime',
+t1.`quantity_arrival` as 'quantity_arrival',
+t1.`quantity_inbound` as 'quantity_inbound',
+t1.`quantity_not_inbound` as 'quantity_not_inbound',
+t1.`arrivaldate` as 'purchase_arrivaldate',
+
+t8.`status` as 'prod_status',
+t8.distribution_quantity as 'prod_distribution_quantity',
+( t8.order_quantity - t8.distribution_quantity) as 'prod_not_distribution_quantity',
+t8.prod_quantity as 'prod_quantity'
+
+from dc_base_purchase_details as t1 
+left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code
+left join dc_base_sku as t3 on t1.bailun_sku = t3.bailun_sku
+left join dc_base_stock as t4 on t1.bailun_sku = t4.bailun_sku and t1.warehouse_code = t4.warehouse_code
+left join dc_mid_transit as t5 on t1.bailun_sku = t5.bailun_sku and t1.warehouse_code = t5.warehouse_code
+left join dc_auto_turnover as t6 on t1.bailun_sku = t6.bailun_sku and t1.warehouse_code = t6.warehouse_code
+left join dc_auto_forecast_fluctuation as t7 on t1.bailun_sku = t7.bailun_sku and t1.warehouse_code = t7.warehouse_code
+left join dc_base_prod_order as t8 on t1.bailun_sku = t8.bailun_sku and t1.purchase_id = t8.purchase_no
+
+
+";
+                if (search_data.has_tort != null)
+                {
+                    sql += " left join dc_base_tort as t9  on t1.bailun_sku = t9.bailun_sku ";
+                }
+                if (search_data.monitor_status != null)
+                {
+                    sql += " left join dc_auto_config_sku_warehouse as t10 on t1.bailun_sku = t10.bailun_sku and t1.warehouse_code = t10.warehouse_code ";
+                }
+                sql += " where  t1.`status` not in (-1) and t1.quantity_not_inbound > 0 ";
+            }
+
+
+            var countSql = @" 
+ select
+count(1)
+from 
+dc_base_purchase_details as t1
+left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code
+";
+            if ((categoryModels != null && categoryModels.Count >= 1) || !string.IsNullOrWhiteSpace(search_data.buyer_name) || search_data.product_type > 0)
+            {
+                countSql += " left join dc_base_sku as t3 on t1.bailun_sku = t3.bailun_sku ";
+            }
+            if (search_data.has_tort != null)
+            {
+                countSql += " left join dc_base_tort as t9  on t1.bailun_sku = t9.bailun_sku ";
+            }
+            if (search_data.monitor_status != null)
+            {
+                countSql += " left join dc_auto_config_sku_warehouse as t10 on t1.bailun_sku = t10.bailun_sku and t1.warehouse_code = t10.warehouse_code ";
+            }
+
+            countSql += " where  t1.`status` not in (-1) and t1.quantity_not_inbound > 0 ";
+
+
+
+            parameters.Add("time", DateTime.Now.ToString("yyyy-MM-dd 00:00:00"));
+
+            if (search_data.f_start_date != null)
+            {
+                sql += " and t4.`first_inbound_date`>=@f_start_date ";
+                countSql += " and t4.`first_inbound_date`>=@f_start_date ";
+                parameters.Add("f_start_date", search_data.f_start_date.Value.ToString("yyyy-MM-dd 00:00:00"));
+            }
+            if (search_data.f_end_date != null)
+            {
+                sql += " and t4.`first_inbound_date`<=@f_end_date ";
+                countSql += " and t4.`first_inbound_date`<=@f_end_date ";
+                parameters.Add("f_end_date", search_data.f_end_date.Value.ToString("yyyy-MM-dd 23:59:59"));
+            }
+            if (search_data.start_date != null && search_data.end_date != null)
+            {
+                sql += "  and t4.bailun_sku_warehouse_code  in (select t_re.bailun_sku_warehouse_code from dc_base_stock_record_effective as t_re where t_re.stock_time >=@start_date and t_re.stock_time <=@end_date ) ";
+                countSql += "  and t4.bailun_sku_warehouse_code  in (select t_re.bailun_sku_warehouse_code from dc_base_stock_record_effective as t_re where t_re.stock_time >=@start_date and t_re.stock_time <=@end_date ) ";
+                parameters.Add("start_date", search_data.start_date.Value.ToString("yyyy-MM-dd 00:00:00"));
+                parameters.Add("end_date", search_data.end_date.Value.ToString("yyyy-MM-dd 23:59:59"));
+            }
+            if (categoryModels != null && categoryModels.Count >= 1)
+            {
+                sql += " and t3.category_simple_id in ( " + string.Join(",", categoryModels.Select(s => s.id).Distinct()) + ")";
+                countSql += " and t3.category_simple_id in ( " + string.Join(",", categoryModels.Select(s => s.id).Distinct()) + ")";
+            }
+            if (!string.IsNullOrWhiteSpace(search_data.buyer_name))
+            {
+                sql += " and t3.buyer_name = @buyer_name ";
+                countSql += " and t3.buyer_name = @buyer_name ";
+                parameters.Add("buyer_name", search_data.buyer_name);
+            }
+            if (search_data.product_type > 0)
+            {
+                sql += " and t3.product_type = @product_type ";
+                countSql += " and t3.product_type = @product_type ";
+                parameters.Add("product_type", search_data.product_type);
+            }
+            if (search_data.monitor_status == 1)
+            {
+                sql += " and t10.`status`=1 ";
+                countSql += " and t10.`status`=1 ";
+            }
+            if (search_data.monitor_status == 0)
+            {
+                sql += " and ( t10.`status`=0 or t10.`status` is null ) ";
+                countSql += " and ( t10.`status`=0 or t10.`status` is null ) ";
+            }
+            if (search_data.has_tort != null)
+            {
+                if (search_data.has_tort == 0)
+                {
+                    sql += " and t9.id is null ";
+                    countSql += " and t9.id is null ";
+                }
+                else if (search_data.has_tort == 1)
+                {
+                    sql += " and t9.id is not null ";
+                    countSql += " and t9.id is not null ";
+                }
+            }
+            if (!string.IsNullOrWhiteSpace(search_data.warehousetype))
+            {
+                sql += " and t2.hq_type = @hq_type ";
+                countSql += " and t2.hq_type = @hq_type ";
+
+                parameters.Add("hq_type", search_data.warehousetype);
+            }
+            if (search_data.warehousearea > 0)
+            {
+                sql += " and t2.area_id = @area_id ";
+                countSql += " and t2.area_id = @area_id ";
+
+                parameters.Add("area_id", search_data.warehousearea);
+            }
+            if (search_data.searchType > 0 && !string.IsNullOrWhiteSpace(search_data.key_words))
+            {
+                switch (search_data.searchType)
+                {
+                    case 1:
+                        sql += " and t1.bailun_sku in @bailun_skus ";
+                        countSql += " and t1.bailun_sku in @bailun_skus ";
+                        parameters.Add("bailun_skus", search_data.key_words.Split(','));
+                        break;
+                    case 2:
+                        sql += " and t1.bailun_sku like @bailun_sku ";
+                        countSql += " and t1.bailun_sku like @bailun_sku ";
+
+                        parameters.Add("bailun_sku", $"%{search_data.key_words}%");
+                        break;
+                    case 3:
+                        sql += " and t3.product_inner_code like @product_inner_code ";
+                        countSql += " and t3.product_inner_code like @product_inner_code ";
+
+                        parameters.Add("product_inner_code", $"%{search_data.key_words}%");
+                        break;
+                    case 4:
+                        sql += " and t3.sku_title_cn like @sku_title_cn ";
+                        countSql += " and t3.sku_title_cn like @sku_title_cn ";
+
+                        parameters.Add("sku_title_cn", $"%{search_data.key_words}%");
+                        break;
+                    case 5:
+                        sql += " and t3.product_inner_code = @product_inner_code ";
+                        countSql += " and t3.product_inner_code = @product_inner_code ";
+                        parameters.Add("product_inner_code", $"{search_data.key_words}");
+                        break;
+                }
+
+            }
+            if (!string.IsNullOrWhiteSpace(search_data.warehousecode))
+            {
+                sql += " and t1.warehouse_code=@warehouse_code ";
+                countSql += " and t1.warehouse_code=@warehouse_code ";
+                parameters.Add("warehouse_code", search_data.warehousecode);
+            }
+            if (!string.IsNullOrWhiteSpace(search_data.supplier_name))
+            {
+                sql += " and t3.suppliers_name =@suppliers_name ";
+                parameters.Add("suppliers_name", search_data.supplier_name);
+            }
+            if (search_data.isSum)
+            {
+                total = 0;
+            }
+            else
+            {
+                if (search_data.is_warehouse_sum)
+                {
+                    countSql += " group by t1.warehouse_code ";
+                    sql += " group by t1.warehouse_code ";
+
+                    total = _connection.Query<int>(countSql, parameters, commandTimeout: 0).Count();
+                }
+                else
+                {
+                    if (search_data.limit > 1000)
+                    {
+                        total = 0;
+                    }
+                    else
+                    {
+                        total = _connection.QueryFirst<int>(countSql, parameters, commandTimeout: 0);
+                    }
+
+                }
+
+
+
+                if (!string.IsNullOrEmpty(search_data.sort) && !string.IsNullOrEmpty(search_data.order))
+                {
+                    sql += " order by " + search_data.sort;
+
+                    if (!string.IsNullOrEmpty(search_data.order))
+                    {
+                        sql += " " + search_data.order;
+                    }
+                    else
+                    {
+                        sql += " asc";
+                    }
+                }
+                sql += " limit " + search_data.offset + "," + search_data.limit;
+            }
+            var obj = _connection.Query<full_link_purchase_dto>(sql, parameters, buffered: false, commandTimeout: 0).AsList();
+            foreach (var item in obj)
+            {
+                item.history_sevenday_sales = (item.history_sevenday_sales??0).Round1();
+                item.history_fourteenday_sales =(item.history_fourteenday_sales??0).Round1();
+                item.history_thirtyday_sales = (item.history_thirtyday_sales??0).Round1();
+            }
+            return obj;
+        }
     }
 
 

AutoTurnOver.DB/dc_base_prod_order_dao.cs

 using AutoTurnOver.Models;
+using Dapper;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -125,7 +126,7 @@ namespace AutoTurnOver.DB
                     {
                         continue;
                     }
-                    var old_data = conn.QueryFirstOrDefault<dc_base_prod_order>(" select * from dc_base_prod_order where `purchase_no`=@purchase_no and  bailun_sku=@bailun_sku ", new
+                    var old_data = MyMySqlConnection._connection.QueryFirstOrDefault<dc_base_prod_order>(" select * from dc_base_prod_order where `purchase_no`=@purchase_no and  bailun_sku=@bailun_sku ", new
                     {
                         purchase_no = db_data.purchase_no,
                         bailun_sku = db_data.bailun_sku,

AutoTurnOver.Models/Report/full_link_purchase_dto.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace AutoTurnOver.Models.Report
+{
+    /// <summary>
+    /// 供应链采购在途
+    /// </summary>
+    public class full_link_purchase_dto
+    {
+        public string bailun_sku { get; set; }
+        public string warehouse_code { get; set; }
+        public string warehouse_name { get; set; }
+        public string product_title { get; set; }
+        public string buyer_name { get; set; }
+        public string product_type_desc { get; set; }
+        public decimal? stock { get; set; }
+        public decimal? quantity_transfer { get; set; }
+        public decimal? quantity_transfer_order { get; set; }
+        public decimal? quantity_transfer_temp_schedule { get; set; }
+        public decimal? quantity_transfer_temporary_storage { get; set; }
+        public decimal? history_sevenday_sales { get; set; }
+        public decimal? history_fourteenday_sales { get; set; }
+        public decimal? history_thirtyday_sales { get; set; }
+        public int? forecast_type { get; set; }
+        public string forecast_type_str { get {
+                if (forecast_type == null)
+                {
+                    return "";
+                }
+                else
+                {
+                    return ((forecast_type_enum)forecast_type).ToString();
+                }
+            } }
+
+        public enum forecast_type_enum
+        {
+            实际缺货=1,预计缺货=2,实际冗余=3,预计冗余=4,断货=5
+        }
+        public string purchase_id { get; set; }
+        public decimal quantity_purchase { get; set; }
+        public decimal quantity_not_inbound { get; set; }
+        public int purchase_status { get; set; }
+        public DateTime? last_signtime { get; set; }
+        public DateTime? purchase_arrivaldate { get; set; }
+        public decimal quantity_arrival { get; set; }
+        public decimal quantity_inbound { get; set; }
+        public string prod_status { get; set; }
+        public decimal? prod_distribution_quantity { get; set; }
+        public decimal? prod_not_distribution_quantity { get; set; }
+        public decimal? prod_quantity { get; set; }
+    }
+}

AutoTurnOver.Services/DailyServices.cs

 using AutoTurnOver.Models;
 using AutoTurnOver.Models.ApiDto;
+using AutoTurnOver.Models.Report;
 using AutoTurnOver.Utility;
 using System;
 using System.Collections.Generic;
@@ -48,6 +49,15 @@ namespace AutoTurnOver.Services
             }
             return DB.daily.RealtimeList(search_data, categoryModels, ref total);
         }
+        public List<full_link_purchase_dto> FullLinkPurchaseList(dc_base_stock_search_dto search_data,ref int total)
+        {
+            List<bailun_category_new_dto> categoryModels = null;
+            if (!string.IsNullOrWhiteSpace(search_data.categoryIds))
+            {
+                categoryModels = ApiServices.GetNewClientNodesByIds(search_data.categoryIds.Split(',').Select(s => int.Parse(s)).ToList());
+            }
+            return DB.daily.FullLinkPurchaseList(search_data, categoryModels, ref total);
+        }
 
         public List<dc_base_stock_fba_dto> RealtimeFbaList(dc_base_stock_search_dto search_data,ref int total)
         {
@@ -489,6 +499,92 @@ namespace AutoTurnOver.Services
            
         }
         
+        public string FullLinkPurchaseExport(dc_base_stock_search_dto search_data)
+        {
+            try
+            {
+                export_count++;
+                var services = new DailyServices();
+                var fileName = AppContext.BaseDirectory + $@"供应链采购在途-{DateTime.Now.ToString("yyyyMMddHHmmss")}{Guid.NewGuid()}.csv";
+                int page = 1;
+                int rows = 50000;
+                if (export_count == 1)
+                {
+                    rows = 250000;
+                }
+
+                while (true)
+                {
+                    int total = 0;
+                    search_data.offset = (page - 1)* rows;
+                    search_data.limit = rows;
+                    var list = services.FullLinkPurchaseList(search_data,ref total);
+
+                    if (list == null || list.Count <= 0) break;
+
+                    DataTable table = new DataTable();
+                    string[] cols = new string[] { "仓库名称","仓库编码","产品名称","可用库存","采购在途数","调拨在途数","暂存区数","临时在途数","调拨单在途数"
+                        ,"商品来源","采购员","过去7天日均","过去14天日均","过去30天日均","sku状态"
+                        ,"采购单号","采购数量","采购单状态","预计到货时间","最后签收时间","已到货数量","已入库数量","生产分配状态","待分配生产数","已分配生产数","已生产数"
+
+            };
+                    foreach (var item in cols)
+                    {
+                        table.Columns.Add(item);
+                    }
+
+                    foreach (var itemData in list)
+                    {
+                        DataRow row = table.NewRow();
+                       
+                        row["仓库名称"] = itemData.warehouse_name;
+                        row["仓库编码"] = itemData.warehouse_code;
+                        row["产品名称"] = itemData.product_title;
+                        row["可用库存"] = itemData.stock;
+                        row["采购在途数"] = itemData.quantity_not_inbound;
+                        row["调拨在途数"] = itemData.quantity_transfer;
+                        row["暂存区数"] = itemData.quantity_transfer_temporary_storage;
+                        row["临时在途数"] = itemData.quantity_transfer_temp_schedule;
+                        row["调拨单在途数"] = itemData.quantity_transfer_order;
+
+                        row["商品来源"] = itemData.product_type_desc;
+                        row["采购员"] = itemData.buyer_name;
+                        row["过去7天日均"] = itemData.history_sevenday_sales;
+                        row["过去14天日均"] = itemData.history_fourteenday_sales;
+                        row["过去30天日均"] = itemData.history_thirtyday_sales;
+                        row["sku状态"] = itemData.forecast_type_str;
+
+                        row["采购单号"] = itemData.purchase_id;
+                        row["采购数量"] = itemData.quantity_purchase;
+                        row["采购单状态"] = itemData.purchase_status;
+                        row["预计到货时间"] = itemData.purchase_arrivaldate;
+                        row["最后签收时间"] = itemData.last_signtime == null ? "" : itemData.last_signtime.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                        row["已到货数量"] = itemData.quantity_arrival;
+                        row["已入库数量"] = itemData.quantity_inbound;
+                        row["生产分配状态"] = itemData.prod_status;
+                        row["待分配生产数"] = itemData.prod_not_distribution_quantity;
+                        row["已分配生产数"] = itemData.prod_distribution_quantity;
+                        row["已生产数"] = itemData.prod_quantity;
+
+                        table.Rows.Add(row);
+                    }
+
+                    CsvFileHelper.SaveCSV(table, fileName, page == 1);
+                    page++;
+                }
+
+
+
+                return fileName;
+            }
+            catch (Exception)
+            {
+                export_count--;
+                throw;
+            }
+           
+        }
+
         public async void GenerateData()
         {
             try

AutoTurnOver.Services/TaskDownloadServices.cs

@@ -59,6 +59,9 @@ namespace AutoTurnOver.Services
                         case "退货汇总":
                            item.result_file_url = await DownloadReturnGoods(item.parameter, item);
                             break;
+                        case "供应链采购在途":
+                           item.result_file_url = await DownloadFullLinkPurchase(item.parameter, item);
+                            break;
                         default: throw new Exception("无法识别的任务");
                     }
                     item.end_date = DateTime.Now;
@@ -164,6 +167,20 @@ namespace AutoTurnOver.Services
             return fileData;
         }
         /// <summary>
+        /// 下载供应链采购在途
+        /// </summary>
+        public async Task<string> DownloadFullLinkPurchase(string par_json, dc_task_download download_data)
+        {
+
+            dc_base_stock_search_dto search_data = par_json.ToObject<dc_base_stock_search_dto>();
+            Console.WriteLine("DownloadStock - 开始生成文件");
+            var memory = new DailyServices().FullLinkPurchaseExport(search_data);
+            Console.WriteLine("DownloadStock - 开始生成上传文件");
+            var fileData = await AutoTurnOver.Utility.QiNiuCloudHelper.UploadSectioningAsync(memory);
+            Console.WriteLine("DownloadStock - 上传完毕");
+            return fileData;
+        }
+        /// <summary>
         /// 下载库存
         /// </summary>
         public async Task<string> DownloadFbaStock(string par_json, dc_task_download download_data)

AutoTurnOver/Controllers/DailyController.cs

@@ -87,7 +87,46 @@ namespace AutoTurnOver.Controllers
                 });
             }
 
+        } 
+        
+        /// <summary>
+        /// <summary>
+        /// 供应链采购在途
+        /// </summary>
+        /// <param name="sku"></param>
+        /// <param name="warehousecode"></param>
+        /// <param name="offset"></param>
+        /// <param name="limit"></param>
+        /// <returns></returns>
+        [UseAction]
+        [BrowseLog("Bailun_aims", "访问【百伦自动周转系统】->【实时数据】->【供应链采购在途】->【搜索】页面", 0)]
+        public JsonResult FullLinkPurchaseList([FromQuery]dc_base_stock_search_dto search_data)
+        {
+
+            try
+            {
+                var services = new DailyServices();
+                var total = 0;
+                var list = services.FullLinkPurchaseList(search_data, ref total);
+
+                return new JsonResult(new
+                {
+                    rows = list,
+                    total = total,
+                });
+            }
+            catch (Exception ex)
+            {
+                return new JsonResult(new
+                {
+                    message = ex.Message,
+                    stack_trace = ex.StackTrace
+                });
+            }
+
         } /// <summary>
+
+
         /// 实时库存
         /// </summary>
         /// <param name="sku"></param>
@@ -331,9 +370,26 @@ namespace AutoTurnOver.Controllers
                 return new JsonResult(new { success = false,message = ex.Message });
             }
 
-            //int total = 0;
-            //var memory = new DailyServices().Export(user, monitor_status, searchType, key_words, warehousecode, supplier_name, offset, limit, ref total, warehousetype, warehousearea, has_tort: has_tort, buyer_name: buyer_name, start_date: start_date, end_date: end_date, f_start_date: f_start_date, f_end_date: f_end_date);
-            //return File(memory, "text/csv", $"{user.UserAccount}实时库存.csv");
+        }
+        
+        public JsonResult ExportFullLinkPurchase([FromQuery]dc_base_stock_search_dto search_data)
+        {
+            try
+            {
+                var user = AutoUtility.GetUser();
+                search_data.limit = int.MaxValue;
+                dc_task_download_dao.PushData<dc_base_stock_search_dto>(new dc_task_download
+                {
+                    parameter = search_data.ToJson(),
+                    task_name = "供应链采购在途"
+                }, user);
+                return new JsonResult(new { success = true });
+            }
+            catch (Exception ex)
+            {
+                return new JsonResult(new { success = false,message = ex.Message });
+            }
+
         }
         
         /// <summary>