动态规则范围，需要配置规则组

AutoTurnOver.DB/db_config.cs

@@ -983,15 +983,20 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w
 
         #region 动态备货sku
 
-        public static List<dc_auto_stock_up_range> StockUpRangeList(Condition_ConfigPromotion m, int offset, int limit, ref int total)
+        public static List<dc_auto_stock_up_range_dto> StockUpRangeList(Condition_ConfigPromotion m, int offset, int limit, ref int total)
         {
-            var list = new List<dc_auto_stock_up_range>();
+            var list = new List<dc_auto_stock_up_range_dto>();
 
             try
             {
-                var sql = @"select dacp.* from dc_auto_stock_up_range as dacp
-left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code where 1 = 1 ";
-
+                var sql = @"select dacp.*,t3.`name` as 'group_name' from dc_auto_stock_up_range as dacp
+left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code 
+left join dc_auto_jit_tag_group as t3 on dacp.group_id = t3.id
+where 1 = 1 ";
+                if (m.group_id > 0)
+                {
+                    sql += " and dacp.group_id=" + m.group_id;
+                }
                 if (!string.IsNullOrWhiteSpace(m.warehousetype))
                 {
                     sql += " and dbw.hq_type=" + $"'{m.warehousetype}'";
@@ -1026,7 +1031,10 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w
 
         public static string SaveStockUpRange(Models.dc_auto_stock_up_range m, string username)
         {
-
+            if(m.group_id==null || m.group_id <= 0)
+            {
+                throw new Exception("规则组必选");
+            }
             var obj = _connection.QueryFirstOrDefault<Models.dc_auto_stock_up_range>("select * from dc_auto_stock_up_range where id=" + m.id);
             if (obj == null)
             {
@@ -1118,7 +1126,10 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w
 
         public static string SaveJitTagGroup(Models.dc_auto_jit_tag_group m, string username)
         {
-
+            if (m.id == 1)
+            {
+                throw new Exception("该规则组为jit专用,不可修改");
+            }
             var obj = _connection.QueryFirstOrDefault<Models.dc_auto_jit_tag_group>("select * from dc_auto_jit_tag_group where id=" + m.id);
             if (obj == null)
             {
@@ -1168,6 +1179,11 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w
             return _connection.QueryFirstOrDefault<dc_auto_jit_tag_group>("select * from dc_auto_jit_tag_group where id=" + id);
         }
 
+        public static List<dc_auto_jit_tag_group> JitTagGroupAll()
+        {
+            return _connection.Query<dc_auto_jit_tag_group>(" select * from dc_auto_jit_tag_group ").AsList();
+        }
+
         #endregion
     }
 }

AutoTurnOver.DB/dc_auto_jit_tag.cs

@@ -19,14 +19,21 @@ namespace AutoTurnOver.DB
         /// <param name="limit"></param>
         /// <param name="total"></param>
         /// <returns></returns>
-        public static List<dc_auto_jit_tag_dto> JitTagList(int offset, int limit, ref int total)
+        public static List<dc_auto_jit_tag_dto> JitTagList(int group_id,int offset, int limit, ref int total)
         {
             var list = new List<dc_auto_jit_tag_dto>();
 
             try
             {
-                var sql = @"select t1.* from dc_auto_jit_tag as t1 where 1 = 1 order by t1.level asc ";
+                var sql = @"select t1.*,t2.`name` as 'group_name' from dc_auto_jit_tag as t1 
+left join dc_auto_jit_tag_group as t2 on t1.group_id = t2.id
+where 1 = 1 ";
 
+                if (group_id > 0)
+                {
+                    sql += " and t1.group_id=" + group_id;
+                }
+                sql += " order by t1.level asc  ";
                
                 total = _connection.ExecuteScalar<int>("select count(0) from (" + sql + ") tb1");
 

AutoTurnOver.Models/dc_auto_config_promotion.cs

@@ -74,6 +74,7 @@ namespace AutoTurnOver.Models
     /// </summary>
     public class Condition_ConfigPromotion
     {
+        public int? group_id { get; set; }
         /// <summary>
         /// sku编码
         /// </summary>

AutoTurnOver.Models/dc_auto_jit_tag.cs

@@ -59,6 +59,7 @@ namespace AutoTurnOver.Models
 
     public class dc_auto_jit_tag_dto : dc_auto_jit_tag
     {
+        public string group_name { get; set; }
         public string is_gt_7_str { get { return ((dc_auto_jit_tag_gt_type)is_gt_7).ToString(); } }
         public string is_gt_14_str { get { return ((dc_auto_jit_tag_gt_type)is_gt_14).ToString(); } }
     }

AutoTurnOver.Models/dc_auto_stock_up_range.cs

@@ -13,5 +13,7 @@ namespace AutoTurnOver.Models
         public string warehouse_code { get; set; }
 
         public string warehouse_name { get; set; }
+
+        public int? group_id { get; set; }
     }
 }

AutoTurnOver.Models/dc_auto_stock_up_range_dto.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace AutoTurnOver.Models
+{
+   public  class dc_auto_stock_up_range_dto: dc_auto_stock_up_range
+    {
+        public string group_name { get; set; }
+    }
+}

AutoTurnOver.Services/ConfigServices.cs

@@ -590,6 +590,11 @@ namespace AutoTurnOver.Services
             return DB.db_config.GetJitTagGroupById(id);
         }
 
+        public List<dc_auto_jit_tag_group> JitTagGroupAll()
+        {
+            return DB.db_config.JitTagGroupAll();
+        }
+
         #endregion
     }
 }

AutoTurnOver.Services/JitTagServices.cs

@@ -17,9 +17,9 @@ namespace AutoTurnOver.Services
         /// <param name="offset"></param>
         /// <param name="limit"></param>
         /// <returns></returns>
-        public List<dc_auto_jit_tag_dto> JitTagList(int offset, int limit, ref int total)
+        public List<dc_auto_jit_tag_dto> JitTagList(int group_id,int offset, int limit, ref int total)
         {
-            return DB.dc_auto_jit_tag_dao.JitTagList( offset, limit, ref total);
+            return DB.dc_auto_jit_tag_dao.JitTagList(group_id,offset, limit, ref total);
         }
 
         public List<dc_auto_jit_tag_log_dto> JitTagLogList(dc_auto_jit_tag_log_search_dto data, int offset, int limit, ref int total)

AutoTurnOver/Controllers/ConfigController.cs

@@ -544,6 +544,13 @@ namespace AutoTurnOver.Controllers
             var m = new Services.ConfigServices().GetJitTagGroupById(id);
             return new JsonResult(m);
         }
+
+        [HttpGet]
+        public JsonResult JitTagGroupAll()
+        {
+            var m = new Services.ConfigServices().JitTagGroupAll();
+            return new JsonResult(m);
+        }
         #endregion
     }
 }
\ No newline at end of file

AutoTurnOver/Controllers/JitTagController.cs

@@ -15,11 +15,11 @@ namespace AutoTurnOver.Controllers
         #region 安全库存规则
 
         [HttpGet]
-        public JsonResult JitTagList(int limit, int offset, string order, string sort)
+        public JsonResult JitTagList(int limit, int offset, string order, string sort,int? group_id = null)
         {
             var total = 0;
             var service = new Services.JitTagServices();
-            var list = service.JitTagList( offset, limit, ref total);
+            var list = service.JitTagList(group_id, offset, limit, ref total);
 
             return new JsonResult(new
             {