新增供应链类型字段

AutoTurnOver.DB/dc_auto_forecast_fluctuation.cs

@@ -69,7 +69,7 @@ where 1 = 1
             }
             if (!string.IsNullOrWhiteSpace(data.character))
             {
-                sql += " and t1.bailun_sku=@bailun_sku ";
+                sql += " and t6.bailun_sku_warehouse_code in  ( select bailun_sku_warehouse_code from dc_base_data_character where `character`=@character )  ";
                 parameters.Add("character", data.character);
             }
             if (!string.IsNullOrWhiteSpace(data.warehouse_code))

AutoTurnOver/Controllers/ExceptionReminderController.cs

@@ -44,7 +44,7 @@ namespace AutoTurnOver.Controllers
             });
         }
 
-        public FileResult Export(int limit, int offset, string order, string sort, string sku, string warehousecode, string warehousetype, int? warehousearea,
+        public FileResult Export(int limit, int offset, string order, string sort, string sku, string character, string warehousecode, string warehousetype, int? warehousearea,
             bool? has_overdue = null, bool? has_confirm = null, bool? has_solve = null, int? err_type = null)
         {
             var m = new dc_auto_forecast_fluctuation_search_dto
@@ -56,7 +56,8 @@ namespace AutoTurnOver.Controllers
                 has_solve = has_solve,
                 warehousetype = warehousetype,
                 warehousearea = warehousearea,
-                err_type = err_type
+                err_type = err_type,
+                character = character
             };
 
             var total = 0;
@@ -67,7 +68,7 @@ namespace AutoTurnOver.Controllers
             string[] cols = new string[] { "Sku","中文名称","仓库编码","仓库名称","最近3日日均","最近7日日均","最近14日日均","最近30日日均","异常类型","开始时间",
                 "总缺货数","在途数量","采购员","预计到货","bi 采购单号","供应商","逾期状态",
                 "结束时间","是否确认","确认人","预计解决时间",
-                "处理方案","是否解决","监控状态","实时库存","moq"
+                "处理方案","是否解决","监控状态","实时库存","moq","供应链类型"
             };
             foreach (var item in cols)
             {
@@ -107,6 +108,7 @@ namespace AutoTurnOver.Controllers
                 row["监控状态"] = itemData.monitor_status==1?"停止监控":"正常监控";
                 row["实时库存"] = itemData.usable_stock; 
                 row["moq"] = itemData.moq; 
+                row["供应链类型"] = itemData.character; 
                 table.Rows.Add(row);
             }