新增清货标记

AutoGeneratePurchaseAdvise/Program.cs

@@ -21,7 +21,7 @@ namespace AutoGeneratePurchaseAdvise
             
             try
             {
-                //PurchaseAdviseServices.AutoPushBuySys(4) ;
+                //PurchaseAdviseServices.AutoPushBuySys(1) ;
                 //PurchaseAdviseServices.Generate($"早上的全量周转 {DateTime.Now.ToString("HH: mm")}", DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd 00:00:00")), is_clear_data: true);
                 //PurchaseAdviseServices.Generate($"下午的补充周转 {DateTime.Now.ToString("HH: mm")}", DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd 12:00:00")));
             }

AutoTurnOver.DB/daily.cs

@@ -431,6 +431,7 @@ t4.quantity_railway_transfer as 'quantity_railway_transfer',
 t1.bailun_sku,t1.warehouse_code,t4.quantity_out_stock,t4.gmt_out_stock_modified,t3.weight,t3.unit_price,
 (case when t5.id is null then '未侵权' else  '侵权' end) as 'has_tort',
 ( case when t7.`status`=0 or t7.`status` is null then 0 else 1 end ) as 'monitor_status',
+( case when t7_1.`status`=0 or t7_1.`status` is null then 0 else 1 end ) as 'clearance_status',
 t6.history_sevenday_sales,t6.history_fourteenday_sales,t6.history_thirtyday_sales,
 t6.history_sevenday_sales_ebay,t6.history_fourteenday_sales_ebay,t6.history_thirtyday_sales_ebay,
 t6.history_sevenday_sales_aliexpress,t6.history_fourteenday_sales_aliexpress,t6.history_thirtyday_sales_aliexpress,
@@ -494,6 +495,7 @@ left join dc_mid_transit as t4  on t1.bailun_sku = t4.bailun_sku and t1.warehous
 left join dc_base_tort as t5  on t1.bailun_sku = t5.bailun_sku
 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_config_sku_warehouse as t7 on t1.bailun_sku = t7.bailun_sku and t1.warehouse_code = t7.warehouse_code
+left join dc_config_sku_warehouse_clearance as t7_1 on t1.bailun_sku_warehouse_code = t7_1.bailun_sku_warehouse_code 
 left join dc_auto_sales as t8 on t1.bailun_sku=t8.bailun_sku and t1.warehouse_code = t8.warehouse_code
 left join dc_base_lastweek_data as t9 on t1.bailun_sku=t9.bailun_sku and t1.warehouse_code = t9.warehouse_code
 left join dc_base_stock_extend as t10 on t1.bailun_sku=t10.bailun_sku and t1.warehouse_code = t10.warehouse_code

AutoTurnOver.DB/db_config.cs

@@ -678,6 +678,89 @@ GROUP BY t1.bailun_sku,t3.hq_type
 
         }
 
+        /// <summary>
+        /// 批量修改清货状态
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <param name="monitor_status"></param>
+        /// <param name="time_type"></param>
+        /// <param name="user"></param>
+        /// <returns></returns>
+        public static string BatchClearanceStatus(string ids, int monitor_status, int time_type, UserData user)
+        {
+            var conn = _connection;
+            if (monitor_status != 1 && monitor_status != 0)
+            {
+                throw new Exception("状态异常");
+            }
+            if (monitor_status == 0)
+            {
+                time_type = 0;
+            }
+            var datas = conn.Query<AutoTurnOver.Models.dc_auto_turnover>(" select * from dc_auto_turnover where id in @ids ", new { ids = ids.Split(',') }).AsList();
+            foreach (AutoTurnOver.Models.dc_auto_turnover turnover_item in datas)
+            {
+                // 先检查当前状态
+                var oldData = conn.QueryFirstOrDefault<dc_auto_config_sku_warehouse>($"select * from dc_config_sku_warehouse_clearance where bailun_sku=@bailun_sku and  warehouse_code=@warehouse_code ", new { turnover_item.bailun_sku, turnover_item.warehouse_code });
+                if (oldData == null || oldData.status == 0)
+                {
+                    if (monitor_status == 0)
+                    {
+                        continue;
+                    }
+
+                }
+
+                if (oldData != null && oldData.status == 1 && oldData.time_type == time_type)
+                {
+                    if (monitor_status == 1)
+                    {
+                        continue;
+                    }
+
+                }
+
+                DateTime now = DateTime.Now;
+
+                if (oldData == null)
+                {
+                    var newData = new dc_config_sku_warehouse_clearance
+                    {
+                        bailun_sku = turnover_item.bailun_sku,
+                        warehouse_code = turnover_item.warehouse_code,
+                        status = monitor_status,
+                        gmt_create = now,
+                        bl_operator = user.UserName,
+                        sku_title = "",
+                        warehouse_name = "",
+                        gmt_modified = now,
+                        time_type = time_type,
+                        bailun_sku_warehouse_code = $"{turnover_item.bailun_sku}{turnover_item.warehouse_code}"
+
+                    };
+                    conn.Insert<dc_config_sku_warehouse_clearance>(newData);
+                }
+                else
+                {
+                    conn.Execute(" update  dc_config_sku_warehouse_clearance set status=@monitor_status,time_type=@time_type,bl_operator=@bl_operator where id=@id", new { monitor_status, id = oldData.id, bl_operator = user.UserName, time_type = time_type });
+                }
+
+                conn.Insert(new dc_config_sku_warehouse_clearance_log
+                {
+                    bailun_sku = turnover_item.bailun_sku,
+                    warehouse_code = turnover_item.warehouse_code,
+                    date = DateTime.Now,
+                    monitor_status = monitor_status.ToString(),
+                    user_name = user.UserName
+                });
+            }
+
+
+            return "";
+
+
+        }
+
         private static void ResetMonitorStatus()
         {
             // 会与改零任务互锁，停用任务

AutoTurnOver.DB/dc_auto_turnover.cs

@@ -62,6 +62,7 @@ t4.bailun_category_name,
 t4.product_type_desc,
 t3.hq_type as 'warehouse_type',
 ( case when t5.`status`=0 or t5.`status` is null then 0 else 1 end ) as 'monitor_status',
+( case when t5_01.`status`=0 or t5_01.`status` is null then 0 else 1 end ) as 'clearance_status',
 ( case when t12.`status`=0 or t12.`status` is null then 0 else 1 end ) as 'returngoodspush_state',
 t4.suppliers_link,
 (t4.supplier_delivery - t6.virtual_delivery_days) as 'delivery_days_error',t4.weight,t4.unit_price,t7.usable_stock,t7.shipped_stock,
@@ -105,6 +106,7 @@ left join dc_auto_sales as t2 on t2.bailun_sku=dat.bailun_sku and dat.warehouse_
 left join dc_base_warehouse as t3 on dat.warehouse_code = t3.warehouse_code
 left join dc_base_sku as t4 on dat.bailun_sku = t4.bailun_sku
 left join dc_auto_config_sku_warehouse as t5 on dat.bailun_sku = t5.bailun_sku and dat.warehouse_code = t5.warehouse_code
+left join dc_config_sku_warehouse_clearance as t5_01 on dat.bailun_sku_warehouse_code = t5_01.bailun_sku_warehouse_code 
 left join dc_average_purchase as t6 on dat.bailun_sku = t6.bailun_sku and dat.warehouse_code  =t6.warehouse_code and t4.suppliers_id = t6.supplier_id
 left join dc_base_stock as t7 on dat.bailun_sku = t7.bailun_sku and dat.warehouse_code = t7.warehouse_code
 left join dc_base_tort as t8  on dat.bailun_sku = t8.bailun_sku

AutoTurnOver.Models/dc_auto_turnover.cs

@@ -1252,6 +1252,7 @@ namespace AutoTurnOver.Models
         /// 是否停止监控
         /// </summary>
         public int monitor_status { get; set; }
+        public int clearance_status { get; set; }
 
         public string supplier_name { get; set; }
 

AutoTurnOver.Models/dc_base_stock.cs

@@ -471,6 +471,7 @@ namespace AutoTurnOver.Models
         public string base_sku_name { get; set; }
         public string sku_product_inner_code { get; set; }
         public int monitor_status { get; set; }
+        public int clearance_status { get; set; }
         public string warehouse_name { get; set; }
         public string sku_name { get; set; }
         /// <summary>

AutoTurnOver.Models/dc_config_sku_warehouse_clearance.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace AutoTurnOver.Models
+{
+    /// <summary>
+    /// 清货标记
+    /// </summary>
+    public class dc_config_sku_warehouse_clearance
+    {
+        public int id { get; set; }
+        public string bailun_sku { get; set; }
+        public string bailun_sku_warehouse_code { get; set; }
+        public string sku_title { get; set; }
+        public string warehouse_code { get; set; }
+        public string warehouse_name { get; set; }
+        public DateTime gmt_create { get; set; }
+        public DateTime gmt_modified { get; set; }
+        public int status { get; set; }
+        public string bl_operator { get; set; }
+
+        /// <summary>
+        /// 1= 暂时停止 2 = 永久停止
+        /// </summary>
+        public int time_type { get; set; }
+    }
+
+    public class dc_config_sku_warehouse_clearance_log
+    {
+        public int id { get; set; }
+        public string user_name { get; set; }
+        public string monitor_status { get; set; }
+        public DateTime date { get; set; }
+        public string bailun_sku { get; set; }
+        public string warehouse_code { get; set; }
+        /// <summary>
+        /// 1= 暂时停止 2 = 永久停止
+        /// </summary>
+        public int time_type { get; set; }
+    }
+}

AutoTurnOver.Services/ConfigServices.cs

@@ -429,6 +429,19 @@ namespace AutoTurnOver.Services
             }
             
         }
+        public string BatchClearanceStatus(string ids, int monitor_status, int time_type, UserData user)
+        {
+            try
+            {
+                return DB.db_config.BatchClearanceStatus(ids, monitor_status, time_type, user);
+            }
+            catch (Exception ex)
+            {
+
+                throw;
+            }
+            
+        }
         public string BatchReturnGoodsStatus(string ids, int monitor_status, UserData user)
         {
             return DB.db_config.BatchReturnGoodsStatus(ids, monitor_status, user);

AutoTurnOver.Services/DailyServices.cs

@@ -293,7 +293,7 @@ namespace AutoTurnOver.Services
                         "调拨最快到货时间","调拨最快到货单号","调拨最快到货数量","调拨最快到货跟踪号","调拨最快到货运输方式","调拨最快到到货物流","周转表更新时间",
                         "供应链长度天数","供应链预测销量","供应链预测缺货","供应链预测冗余","walmart最近7天日均销量","walmart最近14天日均销量","walmart最近30天日均销量","库存更新时间",
                         "在库+调拨单在途数量","在库+调拨单在途金额","在库+在途金额(总)","产品线",
-                        "头程费/一个单位","头程费/kg","产品特性","最近7天的订单数量"
+                        "头程费/一个单位","头程费/kg","产品特性","最近7天的订单数量","清货状态"
             };
                     foreach (var item in cols)
                     {
@@ -305,6 +305,7 @@ namespace AutoTurnOver.Services
                         DataRow row = table.NewRow();
                         row["产品特性"] = itemData.character_names==null?"" : itemData.character_names.Replace(","," | ");
                         row["头程费/一个单位"] = itemData.cost_first;
+
                         row["最近7天的订单数量"] = itemData.orders_7;
                         row["头程费/kg"] = itemData.cost_first_weight;
                         row["产品线"] = itemData.product_line_name;
@@ -407,6 +408,7 @@ namespace AutoTurnOver.Services
                         row["amazon最近14天日均销量"] = itemData.history_fourteenday_sales_amazon;
                         row["amazon最近30天日均销量"] = itemData.history_thirtyday_sales_amazon;
                         row["监控状态"] = itemData.monitor_status == 0 ? "监控中" : "停止监控";
+                        row["清货状态"] = itemData.clearance_status == 0 ? "" : "清货";
                         row["开发时间"] = itemData.develop_time == null ? "" : itemData.develop_time.Value.ToString("yyyy-MM-dd HH:mm:ss");
                         row["昨日销量"] = itemData.oneday_sales;
 

AutoTurnOver.Services/SkuAutoTurnServices.cs

@@ -321,7 +321,7 @@ namespace AutoTurnOver.Services
                 "日均出单次数","首次出单日期","首次出单订单号",
                 "备货数量","产品类型","头程平均值取值来源","Walmart最近7天日均销量","Walmart最近14天日均销量","Walmart最近30天日均销量",
                 "平均交期","配置交期",
-                "库存可用天数","库存可用日期", "库存+在途可用天数","库存+在途可用日期","在途+库存可卖天数总目标销量","供应链长度总目标销量","最近7天的备货数量"
+                "库存可用天数","库存可用日期", "库存+在途可用天数","库存+在途可用日期","在途+库存可卖天数总目标销量","供应链长度总目标销量","最近7天的备货数量","清货状态"
             };
                 foreach (var item in cols)
                 {
@@ -429,6 +429,7 @@ namespace AutoTurnOver.Services
                     row["简易分类"] = itemData.category_simple_name;
                     row["首次入库时间"] = (itemData.first_inbound_date == null ? "" : itemData.first_inbound_date.Value.ToString("yyyy-MM-dd"));
                     row["供应链累计销量"] = itemData.turnover_sales;
+                    row["清货状态"] = itemData.clearance_status == 1 ? "清货" : "";
                     table.Rows.Add(row);
                 }
 

AutoTurnOver/Controllers/ConfigController.cs

@@ -312,6 +312,20 @@ namespace AutoTurnOver.Controllers
             return new JsonResult(result);
         }
 
+        /// <summary>
+        /// 批量修改
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [BrowseLog("Bailun_aims", "触发【百伦自动周转系统】->【自动下单管理】->【自动周转列表】->【修改清货状态】操作",3)]
+        public JsonResult BatchClearanceStatus(string ids, int monitor_status, int time_type)
+        {
+            var user = AutoUtility.GetUser();
+            if (user == null) return null;
+            var result = new Services.ConfigServices().BatchClearanceStatus(ids, monitor_status, time_type, user);
+            return new JsonResult(result);
+        }
+
 
         #region fba共享仓发货仓