转仓日志查询fix

AutoTurnOver.DB/dc_aims_transfer_warehouse_dao.cs

@@ -45,8 +45,8 @@ where 1=1 ";
             }
             if (search_data.end_date != null)
             {
-                sql += " and t1.`date`<=@etime ";
-                countSql += " and t1.`date`<=@etime ";
+                sql += " and t1.`create_date`<=@etime ";
+                countSql += " and t1.`create_date`<=@etime ";
                 parameters.Add("etime", search_data.end_date);
             }
             if (!string.IsNullOrWhiteSpace(search_data.bailun_sku))

AutoTurnOver.Services/DailyServices.cs

@@ -64,7 +64,7 @@ namespace AutoTurnOver.Services
             return DB.daily.ShortagePushList(platform, bailun_sku, offset, limit,ref total, start_date, end_date, warehousecode, warehousetype, warehousearea);
         }
         
-        public List<dc_aims_transfer_warehouse_log_dto> LogList(dc_aims_transfer_warehouse_log_search_dto search_data, int offset, int limit, ref int total )
+        public List<dc_aims_transfer_warehouse_log_dto> TransferWarehouseLogList(dc_aims_transfer_warehouse_log_search_dto search_data, int offset, int limit, ref int total )
         {
             return DB.dc_aims_transfer_warehouse_dao.LogList(search_data, offset, limit,ref total);
         }
@@ -128,6 +128,61 @@ namespace AutoTurnOver.Services
             }
 
         }
+        public string ExportTransferWarehouseLog(dc_aims_transfer_warehouse_log_search_dto searchData)
+        {
+            try
+            {
+                var fileName = AppContext.BaseDirectory + $@"转仓日志-{DateTime.Now.ToString("yyyyMMddHHmmss")}{Guid.NewGuid()}.csv";
+                int page = 1;
+                int rows = 50000;
+
+                while (true)
+                {
+                    int total = 0;
+                    var list = TransferWarehouseLogList(searchData, (page-1)* rows, rows, ref total);
+
+                    if (list == null || list.Count <= 0) break;
+
+                    DataTable table = new DataTable();
+                    string[] cols = new string[] { "来源仓库编码", "来源仓库名称", "目的仓库编码", "目的仓库名称", "sku", "操作时间", "操作人" };
+                    foreach (var item in cols)
+                    {
+                        table.Columns.Add(item);
+                    }
+
+                    foreach (var itemData in list)
+                    {
+                        DataRow row = table.NewRow();
+                        row["来源仓库编码"] = itemData.from_warehouse_code;
+                        row["来源仓库名称"] = itemData.from_warehouse_name;
+                        row["目的仓库编码"] = itemData.to_warehouse_code;
+                        row["目的仓库名称"] = itemData.to_warehouse_name;
+                        row["sku"] = itemData.bailun_sku;
+                        row["操作时间"] = itemData.create_date;
+                        row["操作人"] = itemData.create_user;
+                        table.Rows.Add(row);
+                    }
+
+                    CsvFileHelper.SaveCSV(table, fileName, page == 1);
+                    page++;
+                }
+
+
+                return fileName;
+                //var memory = new MemoryStream();
+                //using (var stream = new FileStream(fileName, FileMode.Open))
+                //{
+                //    stream.CopyTo(memory);
+                //}
+                //memory.Position = 0;
+                //return memory;
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+
+        }
 
 
         /// <summary>

AutoTurnOver/Controllers/DailyController.cs

@@ -177,6 +177,30 @@ namespace AutoTurnOver.Controllers
                 });
             }
         } 
+        
+        [BrowseLog("Bailun_aims", "访问【百伦自动周转系统】->【实时数据】->【转仓日志】->【搜索】页面", 0)]
+        public JsonResult TransferWarehouseLogList([FromQuery]dc_aims_transfer_warehouse_log_search_dto search_data, [FromQuery]int offset, [FromQuery] int limit)
+        {
+            try
+            {
+                var services = new DailyServices();
+                var total = 0;
+                var list = services.TransferWarehouseLogList(search_data, offset, limit, 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>
@@ -232,6 +256,34 @@ namespace AutoTurnOver.Controllers
             //return File(memory, "text/csv", $"{user.UserAccount}修改在线数量日志.csv");
         }
 
+
+        /// <summary>
+        /// 转仓日志导出
+        /// </summary>
+        /// <param name="search_data"></param>
+        /// <returns></returns>
+        public JsonResult ExportTransferWarehouseLogList([FromQuery] dc_aims_transfer_warehouse_log_search_dto search_data)
+        {
+            try
+            {
+                var user = AutoUtility.GetUser();
+                dc_task_download_dao.PushData<dc_aims_transfer_warehouse_log_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 });
+            }
+
+            //var user = AutoUtility.GetUser();
+            //var memory = new DailyServices().ExportShortagePush(searchData, user);
+            //return File(memory, "text/csv", $"{user.UserAccount}修改在线数量日志.csv");
+        }
+
         /// <summary>
         /// 预计到货
         /// </summary>