周转表新是否自动回货的筛选

AutoTurnOver.DB/dc_auto_turnover.cs

@@ -98,6 +98,9 @@ from dc_auto_turnover as dat
                 if (m.monitor_status != null)
                 {
                     sqlCount += " left join dc_auto_config_sku_warehouse as t5 on dat.bailun_sku = t5.bailun_sku and dat.warehouse_code = t5.warehouse_code ";
+                } if (m.returngoodspush_state != null)
+                {
+                    sqlCount += " left join dc_auto_config_sku_warehouse as t12 on dat.bailun_sku = t12.bailun_sku and dat.warehouse_code = t12.warehouse_code ";
                 }
                 if (m.has_tort != null)
                 {
@@ -144,6 +147,17 @@ from dc_auto_turnover as dat
                     sql += " and ( t5.`status`=0 or t5.`status` is null ) ";
                     sqlCount += " and ( t5.`status`=0 or t5.`status` is null ) ";
                 }
+                
+                if (m.returngoodspush_state == 1)
+                {
+                    sql += " and t12.`status`=1 ";
+                    sqlCount += " and t12.`status`=1 ";
+                }
+                if (m.returngoodspush_state == 0)
+                {
+                    sql += " and ( t12.`status`=0 or t12.`status` is null ) ";
+                    sqlCount += " and ( t12.`status`=0 or t12.`status` is null ) ";
+                }
 
                 if (m.hasAadvise == true)
                 {

AutoTurnOver.Models/dc_auto_turnover.cs

@@ -325,6 +325,7 @@ namespace AutoTurnOver.Models
         /// 0 = 开启监控
         /// </summary>
         public int? monitor_status { get; set; }
+        public int? returngoodspush_state { get; set; }
 
         /// <summary>
         ///百伦分类

AutoTurnOver/Controllers/SkuAutoTurnController.cs

@@ -29,7 +29,7 @@ namespace AutoTurnOver.Controllers
         /// <returns></returns>
         [HttpGet]
         [UseAction]
-        public JsonResult List(int limit, int offset, string order, string sort, int? searchType, string key_words, string buyer_name, int? IsRedundant, int? IsStockOut, string warehousecode,string supplier_name, string warehousetype, int? warehousearea, bool? hasDefectConfig, bool? hasAadvise = null, string categoryIds = null, int? monitor_status = null,int? has_tort = null)
+        public JsonResult List(int limit, int offset, string order, string sort, int? searchType, string key_words, string buyer_name, int? IsRedundant, int? IsStockOut, string warehousecode,string supplier_name, string warehousetype, int? warehousearea, bool? hasDefectConfig, bool? hasAadvise = null, string categoryIds = null, int? monitor_status = null, int? returngoodspush_state = null,int? has_tort = null)
         {
             try
             {
@@ -46,6 +46,7 @@ namespace AutoTurnOver.Controllers
                     hasAadvise = hasAadvise,
                     categoryIds = categoryIds,
                     monitor_status = monitor_status,
+                    returngoodspush_state = returngoodspush_state,
                     buyer_name = buyer_name,
                     supplier_name = supplier_name,
                     has_tort = has_tort
@@ -78,7 +79,7 @@ namespace AutoTurnOver.Controllers
             return new JsonResult(new Services.SkuAutoTurnServices().GetLabelList());
         }
 
-        public JsonResult ListSumFooter(string supplier_name, int limit, int offset, string order, string sort,  int? searchType, string key_words,string buyer_name, string sku_prefix, int? IsRedundant, int? IsStockOut, string warehousecode, string warehousetype, int? warehousearea, bool? hasDefectConfig,  bool? hasAadvise = null, string categoryIds = null, int? monitor_status = null,int? has_tort = null)
+        public JsonResult ListSumFooter(string supplier_name, int limit, int offset, string order, string sort,  int? searchType, string key_words,string buyer_name, string sku_prefix, int? IsRedundant, int? IsStockOut, string warehousecode, string warehousetype, int? warehousearea, bool? hasDefectConfig,  bool? hasAadvise = null, string categoryIds = null, int? monitor_status = null, int? returngoodspush_state = null,int? has_tort = null)
         {
             var m = new Condition_AutoTurnOver
             {
@@ -93,6 +94,7 @@ namespace AutoTurnOver.Controllers
                 hasAadvise = hasAadvise,
                 categoryIds = categoryIds,
                 monitor_status = monitor_status,
+                returngoodspush_state = returngoodspush_state,
                 buyer_name = buyer_name,
                 supplier_name = supplier_name,
                 has_tort = has_tort
@@ -111,7 +113,7 @@ namespace AutoTurnOver.Controllers
         /// <param name="warehousecode"></param>
         /// <returns></returns>
         [UseAction]
-        public ActionResult Export(string supplier_name, int limit, int offset, string order, string sort,  int? searchType, string key_words, string buyer_name, string sku_prefix, int? IsRedundant, int? IsStockOut, string warehousecode, string warehousetype, int? warehousearea, bool? hasDefectConfig, bool? hasAadvise = null, string categoryIds = null, int? monitor_status = null,int? has_tort = null)
+        public ActionResult Export(string supplier_name, int limit, int offset, string order, string sort,  int? searchType, string key_words, string buyer_name, string sku_prefix, int? IsRedundant, int? IsStockOut, string warehousecode, string warehousetype, int? warehousearea, bool? hasDefectConfig, bool? hasAadvise = null, string categoryIds = null, int? monitor_status = null, int? returngoodspush_state = null,int? has_tort = null)
         {
             try
             {
@@ -130,6 +132,7 @@ namespace AutoTurnOver.Controllers
                     hasAadvise = hasAadvise,
                     categoryIds = categoryIds,
                     monitor_status = monitor_status,
+                    returngoodspush_state = returngoodspush_state,
                     buyer_name = buyer_name,
                     supplier_name = supplier_name,
                     has_tort = has_tort