页面上支持提交转仓任务

AutoTurnOver.DB/daily.cs

@@ -1166,6 +1166,7 @@ where bailun_sku in @skus", new { skus = skus.Split(',').ToList() });
                 {
                     break;
                 }
+
                 foreach (var item in configs)
                 {
                     var tempData = _connection.QueryFirstOrDefault<dc_config_fba_extend_temp_dto>($@"

AutoTurnOver.DB/dc_aims_transfer_warehouse_dao.cs

@@ -9,7 +9,7 @@ namespace AutoTurnOver.DB
     /// <summary>
     /// 转仓
     /// </summary>
-   public class dc_aims_transfer_warehouse_dao : connectionHelper
+    public class dc_aims_transfer_warehouse_dao : connectionHelper
     {
         public static List<dc_aims_transfer_warehouse_log_dto> LogList(dc_aims_transfer_warehouse_log_search_dto search_data, int offset, int limit, ref int total)
         {
@@ -67,33 +67,50 @@ where 1=1 ";
         /// 转移仓库
         /// </summary>
         /// <param name="input_data"></param>
-        public static void TransferWarehouse(dc_aims_transfer_warehouse_input_dto input_data)
+        public static void TransferWarehouse(dc_aims_transfer_warehouse_input_dto input_data, UserData user)
         {
             using (var conn = MyMySqlConnection._connection)
             {
+                conn.Open();
                 using (var t = conn.BeginTransaction())
                 {
+                    var to_warehouse_name = conn.QueryFirstOrDefault<string>(" select warehouse_name from dc_base_warehouse where warehouse_code=@warehouse_code ", new { warehouse_code = input_data.to_warehouse_code });
                     foreach (var item in input_data.turnover_ids)
                     {
                         var turnover_data = conn.QueryFirstOrDefault<AutoTurnOver.Models.dc_auto_turnover>(" select * from dc_auto_turnover where id=@id ", new { id = item });
 
                         // 检查是否已经存在数据
-                        var new_turnover_data_count = conn.QueryFirstOrDefault<int>(" select count(1) from dc_auto_turnover where  warehouse_code=@warehouse_code and bailun_sku=@bailun_sku ", new
-                        {
-                            warehouse_code = input_data.to_warehouse_code,
-                            bailun_sku = turnover_data.bailun_sku
-                        });
-                        if (new_turnover_data_count >= 1)
+                        //var new_turnover_data_count = conn.QueryFirstOrDefault<int>(" select count(1) from dc_auto_turnover where  warehouse_code=@warehouse_code and bailun_sku=@bailun_sku ", new
+                        //{
+                        //    warehouse_code = input_data.to_warehouse_code,
+                        //    bailun_sku = turnover_data.bailun_sku
+                        //});
+                        //if (new_turnover_data_count >= 1)
+                        //{
+                        //    throw new Exception($" {turnover_data.bailun_sku} - {input_data.to_warehouse_code} 已存在，请勿重复操作");
+                        //}
+
+                        // 添加一条日志
+                        conn.Insert(new dc_aims_transfer_warehouse_log
                         {
-                            throw new Exception($" {turnover_data.bailun_sku} - {input_data.to_warehouse_code} 已存在，请勿重复操作");
-                        }
+                            bailun_sku = turnover_data.bailun_sku,
+                            create_date = DateTime.Now,
+                            create_user = user.UserName,
+                            from_warehouse_code = turnover_data.warehouse_code,
+                            from_warehouse_name = turnover_data.warehouse_name,
+                            to_warehouse_code = input_data.to_warehouse_code,
+                            to_warehouse_name = to_warehouse_name,
+                            status = (int)dc_aims_transfer_warehouse_log_dto.status_enum.待处理,
+                            error_message = "",
+                            error_stack_trace = ""
+                        }, t);
 
                     }
 
                     t.Commit();
                 }
             }
-                
+
         }
     }
 }

AutoTurnOver.Models/dc_aims_transfer_warehouse_log.cs

@@ -17,11 +17,25 @@ namespace AutoTurnOver.Models
         public string to_warehouse_code { get; set; }
         public string create_user { get; set; }
         public DateTime create_date { get; set; }
+        public int status { get; set; }
+        public string error_message { get; set; }
+        public string error_stack_trace { get; set; }
     }
 
     public class dc_aims_transfer_warehouse_log_dto: dc_aims_transfer_warehouse_log
     {
-
+        public string status_str { get
+            {
+                return ((status_enum)status).ToString();
+            } }
+        public enum status_enum
+        {
+            待处理=0,
+            转移最新30天销量= 1,
+            刷新周转数据= 2,
+            完成=3,
+            失败 =-1
+        }
     }
 
     /// <summary>
@@ -29,7 +43,7 @@ namespace AutoTurnOver.Models
     /// </summary>
     public class dc_aims_transfer_warehouse_input_dto
     {
-        public List<int> turnover_ids { get; set; }
+        public List<string> turnover_ids { get; set; }
         public string to_warehouse_code { get; set; }
     }
 

AutoTurnOver.Services/ConfigServices.cs

@@ -1146,5 +1146,15 @@ namespace AutoTurnOver.Services
         {
             DB.db_config.ApiBatchHeadTransport(input_data);
         }
+
+        /// <summary>
+        /// 批量转仓
+        /// </summary>
+        /// <param name="input_data"></param>
+        /// <param name="user"></param>
+        public void TransferWarehouse(dc_aims_transfer_warehouse_input_dto input_data, UserData user)
+        {
+            DB.dc_aims_transfer_warehouse_dao.TransferWarehouse(input_data, user);
+        }
     }
 }

AutoTurnOver.Services/DailyServices.cs

@@ -144,7 +144,7 @@ namespace AutoTurnOver.Services
                     if (list == null || list.Count <= 0) break;
 
                     DataTable table = new DataTable();
-                    string[] cols = new string[] { "来源仓库编码", "来源仓库名称", "目的仓库编码", "目的仓库名称", "sku", "操作时间", "操作人" };
+                    string[] cols = new string[] { "来源仓库编码", "来源仓库名称", "目的仓库编码", "目的仓库名称", "sku","状态","备注", "操作时间", "操作人" };
                     foreach (var item in cols)
                     {
                         table.Columns.Add(item);
@@ -158,6 +158,8 @@ namespace AutoTurnOver.Services
                         row["目的仓库编码"] = itemData.to_warehouse_code;
                         row["目的仓库名称"] = itemData.to_warehouse_name;
                         row["sku"] = itemData.bailun_sku;
+                        row["状态"] = itemData.status_str;
+                        row["备注"] = itemData.error_message;
                         row["操作时间"] = itemData.create_date;
                         row["操作人"] = itemData.create_user;
                         table.Rows.Add(row);

AutoTurnOver/Controllers/ConfigController.cs

@@ -1011,6 +1011,22 @@ namespace AutoTurnOver.Controllers
            
         }
 
+        [HttpPost]
+        [BrowseLog("Bailun_aims", "触发【百伦自动周转系统】->【转仓操作】->操作", 1)]
+        public JsonResult TransferWarehouse([FromBody]dc_aims_transfer_warehouse_input_dto m)
+        {
+            try
+            {
+                new Services.ConfigServices().TransferWarehouse(m, AutoUtility.GetUser());
+                return new JsonResult("");
+            }
+            catch (Exception ex)
+            {
+                return new JsonResult(ex.Message);
+            }
+
+        }
+
 
         [HttpPost]
         [UseAction]