清除冗余代码

AppStart/Redis/BothdisDbconn.cs

@@ -1,443 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Library;
-
-namespace MySystem
-{
-    public class BothdisDbconn
-    {
-        public readonly static BothdisDbconn Instance = new BothdisDbconn();
-
-        public void SendMq(string key, object obj)
-        {
-            SetRedisDataList data = new SetRedisDataList()
-            {
-                key = key,
-                val = Newtonsoft.Json.JsonConvert.SerializeObject(obj),
-            };
-            RabbitMQClient.Instance.SendMsg(Newtonsoft.Json.JsonConvert.SerializeObject(data), "SetRedisDataList");
-        }
-
-        #region 设置单个字段
-        public void Set(string key, object value)
-        {
-            try
-            {
-                if(RedisDbconn.Instance.Set(key, value))
-                {
-                    RedisDbconn.Instance.Clear(key);
-                }
-            }
-            catch (Exception ex)
-            {
-                TendisErr err = new TendisErr()
-                {
-                    key = key,
-                    value = value,
-                    errMsg = ex.ToString(),
-                };
-                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:Set");  // TODO:重新执行，最多重试3次
-            }
-        }
-        #endregion
-
-        #region 整数累加
-        public void AddInt(string key, long value = 1)
-        {
-            try
-            {
-                if (RedisDbconn.Instance.AddInt(key, value) > 0)
-                {
-                    RedisDbconn.Instance.Clear(key);
-                }
-            }
-            catch (Exception ex)
-            {
-                TendisErr err = new TendisErr()
-                {
-                    key = key,
-                    value = value,
-                    errMsg = ex.ToString(),
-                };
-                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:AddInt");  // TODO:重新执行，最多重试3次
-            }
-        }
-        #endregion
-
-        #region 数字累加
-        public void AddNumber(string key, decimal value = 1)
-        {
-            try
-            {
-                if (RedisDbconn.Instance.AddNumber(key, value) > 0)
-                {
-                    RedisDbconn.Instance.Clear(key);
-                }
-            }
-            catch (Exception ex)
-            {
-                TendisErr err = new TendisErr()
-                {
-                    key = key,
-                    value = value,
-                    errMsg = ex.ToString(),
-                };
-                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:AddNumber");  // TODO:重新执行，最多重试3次
-            }
-        }
-        #endregion
-
-        #region 获取单个字段
-        public T Get<T>(string key)
-        {
-            if (RedisDbconn.Instance.Exists(key))
-            {
-                T obj = RedisDbconn.Instance.Get<T>(key);
-                if (obj != null)
-                {
-                    return obj;
-                }
-            }
-            T newobj = RedisDbconn.Instance.Get<T>(key);
-            if (newobj != null)
-            {
-                RedisDbconn.Instance.Set(key, newobj);
-            }
-            return newobj;
-        }
-        #endregion
-
-        #region 设置散列字段
-        public void HSet(string key, string field, object value)
-        {
-            try
-            {
-                RedisDbconn.Instance.HSet(key, field, value);
-            }
-            catch (Exception ex)
-            {
-                TendisErr err = new TendisErr()
-                {
-                    key = key,
-                    value = value,
-                    errMsg = ex.ToString(),
-                };
-                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:HSet");  // TODO:重新执行，最多重试3次
-            }
-            RedisDbconn.Instance.HSet(key, field, value);
-        }
-        #endregion
-
-        #region 散列整数累加
-        public void HAddInt(string key, string field, long value = 1)
-        {
-            try
-            {
-                RedisDbconn.Instance.HAddInt(key, field, value);
-            }
-            catch (Exception ex)
-            {
-                TendisErr err = new TendisErr()
-                {
-                    key = key,
-                    value = value,
-                    errMsg = ex.ToString(),
-                };
-                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:HAddInt");  // TODO:重新执行，最多重试3次
-            }
-            RedisDbconn.Instance.HAddInt(key, field, value);
-        }
-        #endregion
-
-        #region 散列数字累加
-        public void HAddNumber(string key, string field, decimal value = 1)
-        {
-            try
-            {
-                RedisDbconn.Instance.HAddNumber(key, field, value);
-            }
-            catch (Exception ex)
-            {
-                TendisErr err = new TendisErr()
-                {
-                    key = key,
-                    value = value,
-                    errMsg = ex.ToString(),
-                };
-                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:HAddNumber");  // TODO:重新执行，最多重试3次
-            }
-            RedisDbconn.Instance.HAddNumber(key, field, value);
-        }
-        #endregion
-
-        #region 获取散列元素
-        public T HGet<T>(string key, string field)
-        {
-            if (RedisDbconn.Instance.HExists(key, field))
-            {
-                T obj = RedisDbconn.Instance.HGet<T>(key, field);
-                if (obj != null)
-                {
-                    return obj;
-                }
-            }
-            T newobj = RedisDbconn.Instance.HGet<T>(key, field);
-            // if (newobj != null)
-            // {
-            //     RedisDbconn.Instance.HSet(key, field, newobj);
-            // }
-            return newobj;
-        }
-        #endregion
-
-        #region 获取散列所有元素
-        public Dictionary<string, T> HGetAll<T>(string key)
-        {
-            if (RedisDbconn.Instance.Exists(key))
-            {
-                Dictionary<string, T> obj = RedisDbconn.Instance.HGetAll<T>(key);
-                if (obj != null)
-                {
-                    return obj;
-                }
-            }
-            Dictionary<string, T> newobj = RedisDbconn.Instance.HGetAll<T>(key);
-            // if (newobj != null)
-            // {
-            //     foreach (string sub in newobj.Keys)
-            //     {
-            //         RedisDbconn.Instance.HSet(key, sub, newobj[sub]);
-            //     }
-            // }
-            return newobj;
-        }
-        #endregion
-
-        #region 添加集合对象
-        public void SAdd(string key, object value)
-        {
-            try
-            {
-                RedisDbconn.Instance.SAdd(key, value);
-            }
-            catch (Exception ex)
-            {
-                TendisErr err = new TendisErr()
-                {
-                    key = key,
-                    value = value,
-                    errMsg = ex.ToString(),
-                };
-                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:SAdd");  // TODO:重新执行，最多重试3次
-            }
-            RedisDbconn.Instance.SAdd(key, value);
-        }
-        public void SAdd(string key, object[] value)
-        {
-            try
-            {
-                RedisDbconn.Instance.SAdd(key, value);
-            }
-            catch (Exception ex)
-            {
-                TendisErr err = new TendisErr()
-                {
-                    key = key,
-                    value = value,
-                    errMsg = ex.ToString(),
-                };
-                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:SAdd");  // TODO:重新执行，最多重试3次
-            }
-            RedisDbconn.Instance.SAdd(key, value);
-        }
-        #endregion
-
-        #region 获取集合对象
-        public T[] SGetList<T>(string key)
-        {
-            if (RedisDbconn.Instance.Exists(key))
-            {
-                T[] obj = RedisDbconn.Instance.SGetList<T>(key);
-                if (obj != null)
-                {
-                    if (obj.Length > 0)
-                    {
-                        return obj;
-                    }
-                }
-            }
-            T[] newobj = RedisDbconn.Instance.SGetList<T>(key);
-            // if (newobj != null)
-            // {
-            //     foreach (T sub in newobj)
-            //     {
-            //         RedisDbconn.Instance.SAdd(key, sub);
-            //     }
-            // }
-            return newobj;
-        }
-        #endregion
-
-        #region 添加列表对象
-        public void AddList(string key, object value)
-        {
-            try
-            {
-                if (RedisDbconn.Instance.AddList(key, value) > 0)
-                {
-                    RedisDbconn.Instance.Clear(key);
-                }
-            }
-            catch (Exception ex)
-            {
-                TendisErr err = new TendisErr()
-                {
-                    key = key,
-                    value = value,
-                    errMsg = ex.ToString(),
-                };
-                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:AddList");  // TODO:重新执行，最多重试3次
-            }
-        }
-        public void AddList(string key, object[] value)
-        {
-            try
-            {
-                RedisDbconn.Instance.AddList(key, value);
-            }
-            catch (Exception ex)
-            {
-                TendisErr err = new TendisErr()
-                {
-                    key = key,
-                    value = value,
-                    errMsg = ex.ToString(),
-                };
-                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:AddList");  // TODO:重新执行，最多重试3次
-            }
-            RedisDbconn.Instance.AddList(key, value);
-            int Expired = 60 * 60 * 24 * 180;
-            RedisDbconn.Instance.SetExpire(key, Expired);
-        }
-        #endregion
-
-        #region 获取列表
-        public List<T> GetList<T>(string key, int pageNum = 1, int pageSize = 10)
-        {
-            if (RedisDbconn.Instance.Exists(key))
-            {
-                List<T> list = RedisDbconn.Instance.GetList<T>(key, pageNum, pageSize);
-                if (list.Count > 0)
-                {
-                    return list;
-                }
-            }
-            List<T> tlist = RedisDbconn.Instance.GetList<T>(key, pageNum, pageSize);
-            if (tlist.Count > 0)
-            {
-                RedisDbconn.Instance.Clear(key);
-                object[] tmplist = new object[tlist.Count];
-                for (int i = 0; i < tlist.Count; i++)
-                {
-                    tmplist[i] = tlist[i];
-                }
-                RedisDbconn.Instance.AddList(key, tmplist);
-            }
-            return tlist;
-        }
-        #endregion
-
-        #region 添加排序列表对象
-        public void AddSort(string key, object value, decimal score)
-        {
-            try
-            {
-                RedisDbconn.Instance.AddSort(key, value, score);
-            }
-            catch (Exception ex)
-            {
-                TendisErr err = new TendisErr()
-                {
-                    key = key,
-                    value = value,
-                    errMsg = ex.ToString(),
-                };
-                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:AddSort");  // TODO:重新执行，最多重试3次
-            }
-            RedisDbconn.Instance.AddSort(key, value, score);
-            int Expired = 60 * 60 * 24 * 180;
-            RedisDbconn.Instance.SetExpire(key, Expired);
-        }
-        #endregion
-
-        #region 获取排序列表
-        public List<T> GetSort<T>(string key, int pageNum = 1, int pageSize = 10)
-        {
-            if (RedisDbconn.Instance.Exists(key))
-            {
-                List<T> list = RedisDbconn.Instance.GetSort<T>(key, pageNum, pageSize);
-                if (list.Count > 0)
-                {
-                    return list;
-                }
-            }
-            return RedisDbconn.Instance.GetSort<T>(key, pageNum, pageSize);
-        }
-        public List<T> GetSortDesc<T>(string key, int pageNum = 1, int pageSize = 10)
-        {
-            if (RedisDbconn.Instance.Exists(key))
-            {
-                List<T> list = RedisDbconn.Instance.GetSortDesc<T>(key, pageNum, pageSize);
-                if (list.Count > 0)
-                {
-                    return list;
-                }
-            }
-            return RedisDbconn.Instance.GetSortDesc<T>(key, pageNum, pageSize);
-        }
-        #endregion
-
-        public void Remove(string key, long start, long end)
-        {
-            try
-            {
-                RedisDbconn.Instance.AddSort(key, start, end);
-            }
-            catch (Exception ex)
-            {
-                TendisErr err = new TendisErr()
-                {
-                    key = key,
-                    start = start,
-                    end = end,
-                    errMsg = ex.ToString(),
-                };
-                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:Remove");  // TODO:重新执行，最多重试3次
-            }
-            RedisDbconn.Instance.Remove(key, start, end);
-        }
-
-        public void RemoveTop(string key, long count)
-        {
-            Remove(key, count, RedisDbconn.Instance.Count(key) - 1); ;
-        }
-
-        public void Clear(string pattern)
-        {
-            try
-            {
-                RedisDbconn.Instance.Clear(pattern);
-                RedisDbconn.Instance.Clear(pattern);
-            }
-            catch (Exception ex)
-            {
-                TendisErr err = new TendisErr()
-                {
-                    key = pattern,
-                    errMsg = ex.ToString(),
-                };
-                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:Clear");  // TODO:重新执行，最多重试3次
-            }
-        }
-    }
-}

AppStart/Redis/TendisDbconn.cs

@@ -1,217 +0,0 @@
-using System.Collections.Generic;
-using Library;
-using System.Linq;
-
-namespace MySystem
-{
-    public class TendisDbconn
-    {
-        public readonly static TendisDbconn Instance = new TendisDbconn();
-        public static CSRedis.CSRedisClient csredis;
-        private TendisDbconn()
-        {
-        }
-
-        #region 设置单个字段
-        public bool Set(string key, object value)
-        {
-            return csredis.Set(key, value);
-            // return false;
-        }
-        #endregion
-
-        #region 整数累加
-        public long AddInt(string key, long value = 1)
-        {
-            return csredis.IncrBy(key, value);
-            // return 0;
-        }
-        #endregion
-
-        #region 数字累加
-        public decimal AddNumber(string key, decimal value = 1)
-        {
-            return csredis.IncrByFloat(key, value);
-            // return 0;
-        }
-        #endregion
-
-        #region 获取单个字段
-        public T Get<T>(string key)
-        {
-            return csredis.Get<T>(key);
-        }
-        #endregion
-
-        #region 设置散列字段
-        public bool HSet(string key, string field, object value)
-        {
-            return csredis.HSet(key, field, value);
-            // return false;
-        }
-        #endregion
-
-        #region 散列整数累加
-        public long HAddInt(string key, string field, long value = 1)
-        {
-            return csredis.HIncrBy(key, field, value);
-            // return 0;
-        }
-        #endregion
-
-        #region 散列数字累加
-        public decimal HAddNumber(string key, string field, decimal value = 1)
-        {
-            return csredis.HIncrByFloat(key, field, value);
-            // return 0;
-        }
-        #endregion
-
-        #region 获取散列元素
-        public T HGet<T>(string key, string field)
-        {
-            return csredis.HGet<T>(key, field);
-        }
-        #endregion
-
-        #region 获取散列所有元素
-        public Dictionary<string, T> HGetAll<T>(string key)
-        {
-            return csredis.HGetAll<T>(key);
-        }
-        #endregion
-
-        #region 添加列表对象
-        public long AddList(string key, object value)
-        {
-            return csredis.LPush(key, value);
-            // return 0;
-        }
-        public long AddList(string key, object[] value)
-        {
-            return csredis.LPush(key, value);
-            // return 0;
-        }
-        public T RPop<T>(string key)
-        {
-            return csredis.RPop<T>(key);
-        }
-        #endregion
-
-        #region 添加集合对象
-        public long SAdd(string key, object value)
-        {
-            return csredis.SAdd(key, value);
-            // return 0;
-        }
-        public long SAdd(string key, object[] value)
-        {
-            return csredis.SAdd(key, value);
-            // return 0;
-        }
-        #endregion
-
-        #region 获取集合对象
-        public T[] SGetList<T>(string key)
-        {
-            return csredis.SMembers<T>(key);
-        }
-        #endregion
-
-        #region 修改列表对象
-        public bool SetList(string key, int index, object value)
-        {
-            long itemindex = csredis.LLen(key) - index - 1;
-            return csredis.LSet(key, itemindex, value);
-            // return false;
-        }
-        #endregion
-
-        #region 获取列表
-        public List<T> GetList<T>(string key, int pageNum = 1, int pageSize = 10)
-        {
-            int start = (pageNum - 1) * pageSize;
-            int end = start + pageSize - 1;
-            T[] list = csredis.LRange<T>(key, start, end);
-            return list.ToList();
-        }
-        #endregion
-
-        #region 删除列表元素
-        public void DelList<T>(string key, T item)
-        {
-            List<T> oldlist = GetList<T>(key, 1, 10000000);
-            oldlist.Remove(item);
-            Clear(key);
-            AddList(key, oldlist.ToArray());
-        }
-        #endregion
-
-        #region 添加排序列表对象
-        public long AddSort(string key, object value, decimal score)
-        {
-            return csredis.ZAdd(key, (score, value));
-            // return 0;
-        }
-        #endregion
-
-        #region 获取排序列表
-        public List<T> GetSort<T>(string key, int pageNum = 1, int pageSize = 10)
-        {
-            int start = (pageNum - 1) * pageSize;
-            int end = start + pageSize;
-            string[] list = csredis.ZRangeByScore(key, start, end);
-            List<T> lists = new List<T>();
-            foreach (string record in list)
-            { 
-                lists.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<T>(record));
-            }
-            return lists;
-        }
-        public List<T> GetSortDesc<T>(string key, int pageNum = 1, int pageSize = 10)
-        {
-            int start = (pageNum - 1) * pageSize;
-            int end = start + pageSize;
-            string[] list = csredis.ZRevRangeByScore(key, start, end);
-            List<T> lists = new List<T>();
-            foreach (string record in list)
-            { 
-                lists.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<T>(record));
-            }
-            return lists;
-        }
-        #endregion
-
-        public bool Remove(string key, long start, long end)
-        {
-            return csredis.LTrim(key, start, end);
-        }
-
-        public bool RemoveTop(string key, long count)
-        {
-            return RedisDbconn.Instance.Remove(key, count, RedisDbconn.Instance.Count(key) - 1);;
-        }
-
-        public long Count(string key)
-        {
-            return csredis.LLen(key);
-        }
-
-        public void Clear(string pattern)
-        {
-            string[] keys = csredis.Keys(pattern);
-            csredis.Del(keys);
-        }
-
-        public string[] GetKeys(string pattern)
-        { 
-            string[] keys = csredis.Keys(pattern);
-            return keys;
-        }
-
-        public void SetExpire(string key, int expire)
-        { 
-            csredis.Expire(key, expire); //秒为单位
-        }
-    }
-}

Areas/Admin/Controllers/MainServer/PosMachinesTwoChangeController.cs

@@ -216,10 +216,6 @@ namespace MySystem.Areas.Admin.Controllers
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
             int TotalCount = 0;//总机具数
-            string KysCount99 = "0.00";
-            string KssCount99 = "0.00";
-            string KssCoun198 = "0.00";
-            string KssCount298 = "0.00";
             DataTable dt = OtherMySqlConn.dtable("select count(0) from PosMachinesTwo where 1=1" + condition);
             if (dt.Rows.Count > 0)
             {

Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -181,10 +181,6 @@ namespace MySystem.Areas.Admin.Controllers
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
             int TotalCount = 0;//总机具数
-            string KysCount99 = "0.00";
-            string KssCount99 = "0.00";
-            string KssCoun198 = "0.00";
-            string KssCount298 = "0.00";
             DataTable dt = OtherMySqlConn.dtable("select count(0) from PosMachinesTwo where 1=1" + condition);
             if (dt.Rows.Count > 0)
             {

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -2200,13 +2200,16 @@ namespace MySystem.Areas.Admin.Controllers
                     data["OrderNo"] = order.OrderNo;
                     data["MakerCode"] = user.MakerCode;
                     data["RealName"] = user.RealName;
-                    data["ComeSn"] = SnNoList[i];
-                    data["ComeSnParam"] = SnNoList[i].Split(':')[0];
+                    if(SnNoList.Length > i)
+                    {
+                        data["ComeSn"] = SnNoList[i];
+                        data["ComeSnParam"] = SnNoList[i].Split(':')[0];
+                    }
                     if(OrderSnNo.Length > i)
                     {
                         data["SendSn"] = OrderSnNo[i];
                     }
-                    data["CreateDate"] = apply.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                    data["CreateDate"] = apply.CreateDate == null ? "" : apply.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
                     data["Status"] = order.Status == 2 ? "已发货" : "未发货";
                     dataList.Add(data);
                 }
@@ -2225,13 +2228,16 @@ namespace MySystem.Areas.Admin.Controllers
                     data["OrderNo"] = order.OrderNo;
                     data["MakerCode"] = user.MakerCode;
                     data["RealName"] = user.RealName;
-                    data["ComeSn"] = SnNoList[i];
-                    data["ComeSnParam"] = SnNoList[i].Split(':')[0];
+                    if(SnNoList.Length > i)
+                    {
+                        data["ComeSn"] = SnNoList[i];
+                        data["ComeSnParam"] = SnNoList[i].Split(':')[0];
+                    }
                     if(OrderSnNo.Length > i)
                     {
                         data["SendSn"] = OrderSnNo[i];
                     }
-                    data["CreateDate"] = apply.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                    data["CreateDate"] = apply.CreateDate == null ? "" : apply.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
                     data["Status"] = order.Status == 2 ? "已发货" : "未发货";
                     dataList.Add(data);
                 }

Areas/Admin/Views/MainServer/SysTools/Loop.cshtml

@@ -62,6 +62,9 @@
                             <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
                                 <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询
                             </button>
+                            <button class="layui-btn" onclick="window.history.go(-1)">
+                                上一步
+                            </button>
                         </div>
                     </div>
                 </div>
@@ -73,10 +76,10 @@
                     <img style="display: inline-block; width: 50%; height: 100%;" src={{ d.avatar }}>
                 </script>
                 <script type="text/html" id="ComeSnLoop">
-                    <a lay-href="/Admin/SysTools/Loop?right=@right&SwapSnExpand=@("{{d.SendSn}}")" lay-text="查找申请来源" style="color: #428bca;">{{d.ComeSn}}</a>
+                    <a href="/Admin/SysTools/Loop?right=@right&SnNos=@("{{d.ComeSnParam}}")" style="color: #428bca;">{{d.ComeSn}}</a>
                 </script>
                 <script type="text/html" id="SendSnLoop">
-                    <a lay-href="/Admin/SysTools/Loop?right=@right&SnNos=@("{{d.ComeSnParam}}")" lay-text="查找发货机" style="color: #428bca;">{{d.SendSn}}</a>
+                    <a href="/Admin/SysTools/Loop?right=@right&SwapSnExpand=@("{{d.SendSn}}")" style="color: #428bca;">{{d.SendSn}}</a>
                 </script>
             </div>
         </div>
@@ -85,7 +88,8 @@
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/modules_main/Loop_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
-        
+        var SwapSnExpand = '@SwapSnExpand';
+        var SnNos = '@SnNos';
     </script>
 </body>
 

Startup.cs

@@ -95,7 +95,6 @@ namespace MySystem
             initCashServer();
 
             RedisDbconn.csredis = new CSRedis.CSRedisClient(Configuration["Setting:RedisConnStr"]);
-            TendisDbconn.csredis = new CSRedis.CSRedisClient(Configuration["Setting:TendisConnStr"]);
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

wwwroot/layuiadmin/modules_main/Loop_Admin.js

@@ -142,6 +142,8 @@ layui.config({
             , { field: 'Status', width: 200, title: '申请状态', sort: true }
         ]]
         , where: {
+            SwapSnExpand: SwapSnExpand,
+            SnNos: SnNos
         }
         , page: true
         , limit: 30