合并

AppStart/ExcelHelper.cs

@@ -26,7 +26,7 @@ namespace MySystem
         {
             while (true)
             {
-                string data = RedisDbconn.Instance.RPop<string>("ExcelImportV2");
+                string data = RedisDbconn.Instance.RPop<string>("ExcelImportV3");
                 // string data = RedisDbconn.Instance.RPop<string>("ExcelImportV3");
                 if (!string.IsNullOrEmpty(data))
                 {
@@ -277,163 +277,164 @@ namespace MySystem
                                         //调拨时若出货仓库与填写仓库不符，则该条出货失败
                                         var posinfo = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == SnNo && m.BrandId == BrandId);
                                         var storeinfo = db.StoreForCode.FirstOrDefault(m => m.Code == OutStoreNo && m.StoreId == posinfo.StoreId);
-                                        // if (storeinfo != null)
-                                        // {
-                                        KqProducts kqProduct = db.KqProducts.FirstOrDefault(m => m.Id == BrandId) ?? new KqProducts();
-                                        if (kqProduct.Id > 0)
+                                        if (storeinfo != null)
                                         {
-                                            StoreForCode storefor = db.StoreForCode.FirstOrDefault(m => m.Code == OutStoreNo) ?? new StoreForCode();
-                                            StoreHouse store = db.StoreHouse.FirstOrDefault(m => m.Id == storefor.StoreId) ?? new StoreHouse();
-                                            if (store.LaveNum > 0)
+                                            KqProducts kqProduct = db.KqProducts.FirstOrDefault(m => m.Id == BrandId) ?? new KqProducts();
+                                            if (kqProduct.Id > 0)
                                             {
-                                                StoreForCode tostorefor = db.StoreForCode.FirstOrDefault(m => m.Code == StoreNo) ?? new StoreForCode();
-                                                StoreHouse tostore = db.StoreHouse.FirstOrDefault(m => m.Id == tostorefor.StoreId && m.Status > -1) ?? new StoreHouse();
-                                                if (tostore.Id > 0)
+                                                StoreForCode storefor = db.StoreForCode.FirstOrDefault(m => m.Code == OutStoreNo) ?? new StoreForCode();
+                                                StoreHouse store = db.StoreHouse.FirstOrDefault(m => m.Id == storefor.StoreId) ?? new StoreHouse();
+                                                if (store.LaveNum > 0)
                                                 {
-                                                    MachineForSnNo machinefor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SnNo) ?? new MachineForSnNo();
-                                                    PosMachinesTwo machine = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machinefor.SnId && m.StoreId != tostore.Id && m.BuyUserId == 0 && m.UserId == 0) ?? new PosMachinesTwo();
-                                                    if (machine.Id > 0)
+                                                    StoreForCode tostorefor = db.StoreForCode.FirstOrDefault(m => m.Code == StoreNo) ?? new StoreForCode();
+                                                    StoreHouse tostore = db.StoreHouse.FirstOrDefault(m => m.Id == tostorefor.StoreId) ?? new StoreHouse();
+                                                    if (tostore.Id > 0)
                                                     {
-                                                        if(machine.BrandId == BrandId)
+                                                        MachineForSnNo machinefor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SnNo) ?? new MachineForSnNo();
+                                                        PosMachinesTwo machine = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machinefor.SnId && m.StoreId != tostore.Id && m.BuyUserId == 0 && m.UserId == 0) ?? new PosMachinesTwo();
+                                                        if (machine.Id > 0)
                                                         {
-                                                            StoreStockChange stockchange = db.StoreStockChange.Add(new StoreStockChange()
+                                                            if (machine.PreUserId == 0)
                                                             {
-                                                                CreateDate = DateTime.Now,
-                                                                CreateMan = Operator,
-                                                                StoreId = storefor.StoreId, //仓库
-                                                                BrandId = BrandId, //产品类型
-                                                                ProductName = RelationClass.GetKqProductBrandInfo(BrandId), //产品名称
-                                                                BizBatchNo = BatchNo, //业务批次号
-                                                                TransType = 1, //交易类型
-                                                                SnNo = SnNo, //SN编号
-                                                                StockOpDirect = 1, //库存操作方向
-                                                                SnStatus = 1, //SN状态
-                                                                DeviceVendor = machine.DeviceName, //设备厂商
-                                                                DeviceModel = machine.DeviceKind, //设备型号
-                                                                DeviceType = machine.DeviceType, //设备类型
-                                                                FromUserId = store.UserId, //出货人
-                                                                FromDate = DateTime.Now, //出库时间
-                                                                FromRemark = OutNote, //出库备注
-                                                                ToUserId = tostore.UserId, //收货人
-                                                                ToStoreId = tostorefor.StoreId, //退货收货仓库                        
-                                                                SourceStoreId = machine.SourceStoreId, //源仓库编号
-                                                                BrandType = machine.DeviceType, //品牌类型
-                                                            }).Entity;
-                                                            db.SaveChanges();
-                                                            string ChangeNo = "SC";
-                                                            int StoreStockChangeId = stockchange.Id;
-                                                            string StoreStockChangeIdString = StoreStockChangeId.ToString();
-                                                            for (int j = 0; j < 18 - StoreStockChangeId.ToString().Length; j++)
-                                                            {
-                                                                StoreStockChangeIdString = "0" + StoreStockChangeIdString;
-                                                            }
-                                                            ChangeNo += StoreStockChangeIdString;
-                                                            stockchange.ChangeNo = ChangeNo; //交易流水编号
-                                                            machine.StoreId = tostorefor.StoreId;
+                                                                StoreStockChange stockchange = db.StoreStockChange.Add(new StoreStockChange()
+                                                                {
+                                                                    CreateDate = DateTime.Now,
+                                                                    CreateMan = Operator,
+                                                                    StoreId = storefor.StoreId, //仓库
+                                                                    BrandId = BrandId, //产品类型
+                                                                    ProductName = RelationClass.GetKqProductBrandInfo(BrandId), //产品名称
+                                                                    BizBatchNo = BatchNo, //业务批次号
+                                                                    TransType = 1, //交易类型
+                                                                    SnNo = SnNo, //SN编号
+                                                                    StockOpDirect = 1, //库存操作方向
+                                                                    SnStatus = 1, //SN状态
+                                                                    DeviceVendor = machine.DeviceName, //设备厂商
+                                                                    DeviceModel = machine.DeviceKind, //设备型号
+                                                                    DeviceType = machine.DeviceType, //设备类型
+                                                                    FromUserId = store.UserId, //出货人
+                                                                    FromDate = DateTime.Now, //出库时间
+                                                                    FromRemark = OutNote, //出库备注
+                                                                    ToUserId = tostore.UserId, //收货人
+                                                                    ToStoreId = tostorefor.StoreId, //退货收货仓库                        
+                                                                    SourceStoreId = machine.SourceStoreId, //源仓库编号
+                                                                    BrandType = machine.DeviceType, //品牌类型
+                                                                }).Entity;
+                                                                db.SaveChanges();
+                                                                string ChangeNo = "SC";
+                                                                int StoreStockChangeId = stockchange.Id;
+                                                                string StoreStockChangeIdString = StoreStockChangeId.ToString();
+                                                                for (int j = 0; j < 18 - StoreStockChangeId.ToString().Length; j++)
+                                                                {
+                                                                    StoreStockChangeIdString = "0" + StoreStockChangeIdString;
+                                                                }
+                                                                ChangeNo += StoreStockChangeIdString;
+                                                                stockchange.ChangeNo = ChangeNo; //交易流水编号
+                                                                machine.StoreId = tostorefor.StoreId;
 
-                                                            db.StoreChangeHistory.Add(new StoreChangeHistory()
-                                                            {
-                                                                CreateDate = DateTime.Now,
-                                                                CreateMan = Operator,
-                                                                UserId = store.UserId, //创客
-                                                                BrandId = BrandId, //产品类型
-                                                                ChangeRecordNo = ChangeNo, //变更记录单号
-                                                                BizBatchNo = BatchNo, //业务批次号
-                                                                TransType = 1, //交易类型
-                                                                SnNo = SnNo, //SN编号
-                                                                SnType = machine.PosSnType, //SN机具类型
-                                                                StockOpDirect = 1, //库存操作方向
-                                                                DeviceVendor = machine.DeviceName, //设备厂商
-                                                                DeviceModel = machine.DeviceKind, //设备型号
-                                                                DeviceType = machine.DeviceType, //设备类型
-                                                                FromUserId = store.UserId, //出货创客
-                                                                FromDate = DateTime.Now, //出库时间
-                                                                FromRemark = OutNote, //出库备注
-                                                                SourceStoreId = machine.SourceStoreId, //源仓库
-                                                                StoreId = store.Id, //仓库
-                                                            });
+                                                                db.StoreChangeHistory.Add(new StoreChangeHistory()
+                                                                {
+                                                                    CreateDate = DateTime.Now,
+                                                                    CreateMan = Operator,
+                                                                    UserId = store.UserId, //创客
+                                                                    BrandId = BrandId, //产品类型
+                                                                    ChangeRecordNo = ChangeNo, //变更记录单号
+                                                                    BizBatchNo = BatchNo, //业务批次号
+                                                                    TransType = 1, //交易类型
+                                                                    SnNo = SnNo, //SN编号
+                                                                    SnType = machine.PosSnType, //SN机具类型
+                                                                    StockOpDirect = 1, //库存操作方向
+                                                                    DeviceVendor = machine.DeviceName, //设备厂商
+                                                                    DeviceModel = machine.DeviceKind, //设备型号
+                                                                    DeviceType = machine.DeviceType, //设备类型
+                                                                    FromUserId = store.UserId, //出货创客
+                                                                    FromDate = DateTime.Now, //出库时间
+                                                                    FromRemark = OutNote, //出库备注
+                                                                    SourceStoreId = machine.SourceStoreId, //源仓库
+                                                                    StoreId = store.Id, //仓库
+                                                                });
 
-                                                            db.StoreChangeHistory.Add(new StoreChangeHistory()
-                                                            {
-                                                                CreateDate = DateTime.Now,
-                                                                CreateMan = Operator,
-                                                                UserId = tostore.UserId, //创客
-                                                                BrandId = BrandId, //产品类型
-                                                                ChangeRecordNo = ChangeNo, //变更记录单号
-                                                                BizBatchNo = BatchNo, //业务批次号
-                                                                TransType = 1, //交易类型
-                                                                SnNo = SnNo, //SN编号
-                                                                SnType = machine.PosSnType, //SN机具类型
-                                                                StockOpDirect = 0, //库存操作方向
-                                                                DeviceVendor = machine.DeviceName, //设备厂商
-                                                                DeviceModel = machine.DeviceKind, //设备型号
-                                                                DeviceType = machine.DeviceType, //设备类型
-                                                                ToUserId = tostore.UserId, //收货创客
-                                                                ToStoreId = tostore.Id, //创客退货收货仓库
-                                                                ToDate = DateTime.Now, //入库时间
-                                                                ToRemark = OutNote, //入库备注
-                                                                SourceStoreId = machine.SourceStoreId, //源仓库
-                                                                StoreId = tostore.Id, //仓库
-                                                            });
-                                                            db.SaveChanges();
+                                                                db.StoreChangeHistory.Add(new StoreChangeHistory()
+                                                                {
+                                                                    CreateDate = DateTime.Now,
+                                                                    CreateMan = Operator,
+                                                                    UserId = tostore.UserId, //创客
+                                                                    BrandId = BrandId, //产品类型
+                                                                    ChangeRecordNo = ChangeNo, //变更记录单号
+                                                                    BizBatchNo = BatchNo, //业务批次号
+                                                                    TransType = 1, //交易类型
+                                                                    SnNo = SnNo, //SN编号
+                                                                    SnType = machine.PosSnType, //SN机具类型
+                                                                    StockOpDirect = 0, //库存操作方向
+                                                                    DeviceVendor = machine.DeviceName, //设备厂商
+                                                                    DeviceModel = machine.DeviceKind, //设备型号
+                                                                    DeviceType = machine.DeviceType, //设备类型
+                                                                    ToUserId = tostore.UserId, //收货创客
+                                                                    ToStoreId = tostore.Id, //创客退货收货仓库
+                                                                    ToDate = DateTime.Now, //入库时间
+                                                                    ToRemark = OutNote, //入库备注
+                                                                    SourceStoreId = machine.SourceStoreId, //源仓库
+                                                                    StoreId = tostore.Id, //仓库
+                                                                });
+                                                                db.SaveChanges();
 
-                                                            // RemoveClass.DeletePosMachineList("PosMachineTwoList:" + storefor.StoreId, machine.Id);
-                                                            // RedisDbconn.Instance.AddList("PosMachineTwoList:" + tostorefor.StoreId, machine);
+                                                                // RemoveClass.DeletePosMachineList("PosMachineTwoList:" + storefor.StoreId, machine.Id);
+                                                                // RedisDbconn.Instance.AddList("PosMachineTwoList:" + tostorefor.StoreId, machine);
+
+                                                                if (!storeData.ContainsKey(storefor.StoreId + "_" + BrandId))
+                                                                {
+                                                                    storeData.Add(storefor.StoreId + "_" + BrandId, 1);
+                                                                }
+                                                                else
+                                                                {
+                                                                    storeData[storefor.StoreId + "_" + BrandId] += 1;
+                                                                }
+                                                                if (!toStoreData.ContainsKey(tostorefor.StoreId + "_" + BrandId))
+                                                                {
+                                                                    toStoreData.Add(tostorefor.StoreId + "_" + BrandId, 1);
+                                                                }
+                                                                else
+                                                                {
+                                                                    toStoreData[tostorefor.StoreId + "_" + BrandId] += 1;
+                                                                }
+                                                                SuccessCount += 1;
+                                                                RedisDbconn.Instance.Set("CheckImport:" + checkKey, SuccessCount + " / " + TotalCount);
 
-                                                            if (!storeData.ContainsKey(storefor.StoreId + "_" + BrandId))
-                                                            {
-                                                                storeData.Add(storefor.StoreId + "_" + BrandId, 1);
-                                                            }
-                                                            else
-                                                            {
-                                                                storeData[storefor.StoreId + "_" + BrandId] += 1;
-                                                            }
-                                                            if (!toStoreData.ContainsKey(tostorefor.StoreId + "_" + BrandId))
-                                                            {
-                                                                toStoreData.Add(tostorefor.StoreId + "_" + BrandId, 1);
                                                             }
                                                             else
                                                             {
-                                                                toStoreData[tostorefor.StoreId + "_" + BrandId] += 1;
+                                                                RedisDbconn.Instance.AddList("ErrList" + checkKey, "机具" + SnNo + "为预发机，不可调拨");
                                                             }
-                                                            SuccessCount += 1;
-                                                            RedisDbconn.Instance.Set("CheckImport:" + checkKey, SuccessCount + " / " + TotalCount);
                                                         }
                                                         else
                                                         {
-                                                            RedisDbconn.Instance.AddList("ErrList" + checkKey, "机具" + SnNo + "与表格里填写的品牌不一致");
+                                                            RedisDbconn.Instance.AddList("ErrList" + checkKey, "机具" + SnNo + "不是仓库机或不在填写的收货仓库中");
+                                                        }
+                                                        if (string.IsNullOrEmpty(tostore.ProductName))
+                                                        {
+                                                            tostore.BrandId = BrandId.ToString();
+                                                            tostore.ProductName = kqProduct.Name;
                                                         }
                                                     }
                                                     else
                                                     {
-                                                        RedisDbconn.Instance.AddList("ErrList" + checkKey, "机具" + SnNo + "不是仓库机或不在填写的收货仓库中");
-                                                    }
-                                                    if (string.IsNullOrEmpty(tostore.ProductName))
-                                                    {
-                                                        tostore.BrandId = BrandId.ToString();
-                                                        tostore.ProductName = kqProduct.Name;
+                                                        RedisDbconn.Instance.AddList("ErrList" + checkKey, "机具" + SnNo + "填写的收货仓库编号不正确");
                                                     }
                                                 }
                                                 else
                                                 {
-                                                    RedisDbconn.Instance.AddList("ErrList" + checkKey, "机具" + SnNo + "填写的收货仓库编号不正确");
+                                                    RedisDbconn.Instance.AddList("ErrList" + checkKey, "机具" + SnNo + "所在的仓库" + store.StoreName + "(" + store.StoreNo + ")库存不足");
                                                 }
+                                                db.SaveChanges();
                                             }
                                             else
                                             {
-                                                RedisDbconn.Instance.AddList("ErrList" + checkKey, "机具" + SnNo + "所在的仓库" + store.StoreName + "(" + store.StoreNo + ")库存不足");
+                                                RedisDbconn.Instance.AddList("ErrList" + checkKey, "机具" + SnNo + "的品牌填写有误");
                                             }
-                                            db.SaveChanges();
                                         }
                                         else
                                         {
-                                            RedisDbconn.Instance.AddList("ErrList" + checkKey, "机具" + SnNo + "的品牌填写有误");
+                                            RedisDbconn.Instance.AddList("ErrList" + checkKey, "机具" + SnNo + "出货仓库与填写仓库不符");
                                         }
-                                        // }
-                                        // else
-                                        // {
-                                        //     RedisDbconn.Instance.AddList("ErrList" + checkKey, "机具" + SnNo + "出货仓库与填写仓库不符");
-                                        // }
                                     }
                                     DoCount += Size;
                                     foreach (string key in storeData.Keys)

Areas/Admin/Controllers/MainServer/PosMachinesFeeChangeRecordController.cs

@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 机具费率调整申请列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(PosMachinesFeeChangeRecord data, string UserIdMakerCode, string StatusSelect, string UserIdRealName, string PosUserIdMakerCode, string PosUserIdRealName, int page = 1, int limit = 30)
+        public JsonResult IndexData(PosMachinesFeeChangeRecord data, string UserIdMakerCode, string UserIdRealName, string PosUserIdMakerCode, string PosUserIdRealName, string SortSelect = "1", string StatusSelect = "2", int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -62,7 +62,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("Sort", "0"); //品牌
 
 
-            string condition = " and Status>=-1";
+            string condition = " and Status >=-1";
             //创客创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
@@ -84,22 +84,30 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and PosUserId in (select PosUserId from UsersForRealName where RealName='" + PosUserIdRealName + "')";
             }
             //品牌
-            if (data.Sort == 0)
+            if (!string.IsNullOrEmpty(SortSelect))
             {
-                condition += " and Sort = 1";
+                condition += " and Sort = " + Convert.ToInt32(SortSelect);
             }
-            if (data.Sort != 0)
+            // if (data.Sort > 0)
+            // {
+            //     condition += " and Sort = " + data.Sort;
+            // }
+            // if (data.Sort == 0)
+            // {
+            //     condition += " and Sort = 1";
+            // }
+            if (!string.IsNullOrEmpty(StatusSelect))
             {
-                condition += " and Sort = " + data.Sort;
-            }
-            if (data.Status > 0)
-            {
-                if(data.Status == 2) data.Status = 0;
-                if(data.Status == 3) data.Status = -1;
-                condition += " and Status = " + data.Status;
+                if (Convert.ToInt32(StatusSelect) > 0)
+                {
+                    if (Convert.ToInt32(StatusSelect) == 1) condition += " and Status = 1";
+                    if (Convert.ToInt32(StatusSelect) == 2) condition += " and Status = 0";
+                    if (Convert.ToInt32(StatusSelect) == 3) condition += " and Status = -1";
+                }
             }
 
 
+
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PosMachinesFeeChangeRecord", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
@@ -479,8 +487,8 @@ namespace MySystem.Areas.Admin.Controllers
             }
             if (data.Status > 0)
             {
-                if(data.Status == 2) data.Status = 0;
-                if(data.Status == 3) data.Status = -1;
+                if (data.Status == 2) data.Status = 0;
+                if (data.Status == 3) data.Status = -1;
                 condition += " and Status = " + data.Status;
             }
 

Areas/Admin/Controllers/MainServer/PosMachinesTwoChangeController.cs

@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 机具库列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(PosMachinesTwo data, string BindingStateSelect, string ActivationStateSelect, string UpFeeFlagSelect, string UserIdMakerCode, string UserIdRealName, string StoreIdCode, string StoreIdName, string ActivationDateData, string BindingDateData, int page = 1, int limit = 30)
+        public JsonResult IndexData(PosMachinesTwo data, string BindingStateSelect, string ActivationStateSelect, string UserIdMakerCode, string UserIdRealName, string StoreIdCode, string StoreIdName, string ActivationDateData, string BindingDateData, string BrandSelect = "1", string UpFeeFlagSelect = "0", int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -59,7 +59,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("PosSn", "1"); //SN编号
             Fields.Add("BrandId", "0"); //品牌
 
-            string condition = " and Status>-1 AND BindingState = 1 AND DATE_SUB(CURDATE(), INTERVAL 180 DAY) >= date(BindingTime)";
+            string condition = " and Status>-1 AND BindingState = 1 AND DATE_SUB(CURDATE(), INTERVAL 180 DAY) >= date(BindingTime) and DownFeeFlag =0";
             //绑定状态
             if (!string.IsNullOrEmpty(BindingStateSelect))
             {
@@ -91,14 +91,18 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and StoreId in (select StoreId from StoreForName where Name='" + StoreIdName + "')";
             }
             //品牌
-            if (data.BrandId == 0)
+            if (!string.IsNullOrEmpty(BrandSelect))
             {
-                condition += " and BrandId = 1";
-            }
-            if (data.BrandId != 0)
-            {
-                condition += " and BrandId = " + data.BrandId;
+                condition += " and BrandId = " + Convert.ToInt32(BrandSelect);
             }
+            // if (data.BrandId > 0)
+            // {
+            //     condition += " and BrandId = " + data.BrandId;
+            // }
+            // if (data.BrandId == 0)
+            // {
+            //     condition += " and BrandId = 1";
+            // }
             if (!string.IsNullOrEmpty(UpFeeFlagSelect))
             {
                 condition += " and UpFeeFlag = " + UpFeeFlagSelect;

Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -173,7 +173,7 @@ namespace MySystem.Areas.Admin.Controllers
                 //循环开始时间
                 if (!string.IsNullOrEmpty(dic["RecycEndDate"].ToString()))
                 {
-                    var RecycStartDate = Convert.ToDateTime(dic["RecycEndDate"].ToString()).AddMonths(-3).ToString("yyyy-MM-dd HH:mm:ss");
+                    var RecycStartDate = Convert.ToDateTime(dic["RecycEndDate"].ToString()).AddDays(-180).ToString("yyyy-MM-dd HH:mm:ss");
                     dic["RecycStartDate"] = RecycStartDate;
                 }
 

Areas/Admin/Controllers/MainServer/StoreHouseAmountRecordController.cs

@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 分仓机具额度记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(StoreHouseAmountRecord data, string UserIdRealName, string UserIdMakerCode, string AmountTypeSelect, string OperateTypeSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(StoreHouseAmountRecord data, string UserIdRealName, string UserIdMakerCode, string AmountTypeSelect, string OperateTypeSelect, string ChangeTypeSelect, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -75,6 +75,11 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and AmountType=" + AmountTypeSelect;
             }
+            //变动类别
+            if (!string.IsNullOrEmpty(ChangeTypeSelect))
+            {
+                condition += " and Sort=" + ChangeTypeSelect;
+            }
             //操作类别
             if (!string.IsNullOrEmpty(OperateTypeSelect))
             {

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -615,7 +615,7 @@ namespace MySystem.Areas.Admin.Controllers
         {
             // RedisDbconn.Instance.AddList("ExcelImport", ExcelPath + "#cut#" + Kind);
             string key = function.MD5_16(Guid.NewGuid().ToString());
-            RedisDbconn.Instance.AddList("ExcelImportV2", ExcelPath + "#cut#" + Kind + "#cut#" + key + "#cut#" + SysUserName);
+            RedisDbconn.Instance.AddList("ExcelImportV3", ExcelPath + "#cut#" + Kind + "#cut#" + key + "#cut#" + SysUserName);
             return "success|" + key;
         }
 
@@ -702,28 +702,22 @@ namespace MySystem.Areas.Admin.Controllers
                     string Remark = itemJson.Contains("\"F\"") ? dr["F"].ToString() : "";
                     UserForMakerCode userForMakerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode);
                     StoreForCode storeForCode = db.StoreForCode.FirstOrDefault(m => m.Code == StoreNo);
-                    var store = db.StoreHouse.FirstOrDefault(m => m.Id == storeForCode.StoreId && m.BrandId == BrandId);
+                    var store = db.StoreHouse.FirstOrDefault(m => m.Id == storeForCode.StoreId && m.BrandId == BrandId) ?? new StoreHouse();
                     MachineForSnNo machineForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == PosSn) ?? new MachineForSnNo();
-                    var pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineForSnNo.SnId && m.BrandId == Convert.ToInt32(BrandId) && m.BindingState == 0 && m.BuyUserId == userForMakerCode.UserId);
-                    var posInfo = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineForSnNo.SnId && m.BrandId == Convert.ToInt32(BrandId) && m.BindingState == 0);
-                    var posInfos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineForSnNo.SnId && m.BrandId == Convert.ToInt32(BrandId) && m.BindingState == 0 && m.StoreId == store.Id);
-                    if (pos == null)
+                    var pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineForSnNo.SnId && m.BrandId == Convert.ToInt32(BrandId) && m.BindingState == 0 && m.BuyUserId == userForMakerCode.UserId) ?? new PosMachinesTwo();
+                    var posInfo = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineForSnNo.SnId && m.BrandId == Convert.ToInt32(BrandId) && m.BindingState == 0) ?? new PosMachinesTwo();
+                    if (pos.Id == 0)
                     {
                         error += "以下操作失败" + PosSn + ',' + "未找到创客" + MakerCode + "的该台机具" + '\n';
                     }
-                    if (store == null)
+                    if (store.Id == 0)
                     {
                         error += "以下操作失败" + PosSn + ',' + StoreNo + ',' + "未找到该仓库" + '\n';
                     }
-                    var user = db.Users.FirstOrDefault(m => m.Id == userForMakerCode.UserId) ?? new Users();
-                    if (posInfo == null)
+                    if (posInfo.Id == 0)
                     {
                         error += "以下操作失败" + PosSn + ',' + "未找到该品牌的未使用机具" + '\n';
                     }
-                    if (posInfos != null)
-                    {
-                        error += "以下操作失败" + PosSn + ',' + "该机具已在仓库:" + StoreNo + '\n';
-                    }
                     if (PosSnList.Contains(PosSn))
                     {
                         error += "以下操作失败" + PosSn + ',' + "该机具号重复" + '\n';
@@ -770,82 +764,164 @@ namespace MySystem.Areas.Admin.Controllers
                     function.WriteLog(text, "机具驳回仓库");//机具驳回仓库日志
                     db.SaveChanges();
                     MachineForSnNo machineForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == PosSn) ?? new MachineForSnNo();
-                    var posInfo = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineForSnNo.SnId && m.BrandId == Convert.ToInt32(BrandId) && m.BindingState == 0);
+                    var posInfo = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineForSnNo.SnId && m.BrandId == Convert.ToInt32(BrandId) && m.BindingState == 0 && m.BuyUserId == userForMakerCode.UserId);
                     if (posInfo != null)
                     {
-                        var changeNo = "JJBH" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
-                        StoreStockChange stockchange = db.StoreStockChange.Add(new StoreStockChange()
-                        {
-                            CreateDate = DateTime.Now,
-                            StoreId = fromStore.Id, //出货仓库
-                            ToStoreId = toStore.Id, //发货仓库
-                            BrandId = Convert.ToInt32(BrandId), //产品类型
-                            ProductName = RelationClass.GetKqProductBrandInfo(Convert.ToInt32(BrandId)), //产品名称
-                            ChangeNo = changeNo, //变更记录单号
-                            BizBatchNo = No, //业务批次号
-                            TransType = 1, //交易类型
-                            SnNo = PosSn, //SN编号
-                            StockOpDirect = 1, //库存操作方向
-                            SnStatus = 1, //SN状态
-                            DeviceVendor = posInfo.DeviceName, //设备厂商
-                            DeviceModel = posInfo.DeviceKind, //设备型号
-                            DeviceType = posInfo.DeviceType, //设备类型                    
-                            SourceStoreId = posInfo.SourceStoreId, //源仓库编号
-                            BrandType = posInfo.DeviceType, //品牌类型
-                        }).Entity;
-                        db.SaveChanges();
-
-                        db.StoreChangeHistory.Add(new StoreChangeHistory()
-                        {
-                            CreateDate = DateTime.Now,
-                            UserId = user.Id, //创客
-                            StoreId = fromStore.Id, //出货仓库
-                            ToStoreId = toStore.Id, //发货仓库
-                            BrandId = Convert.ToInt32(BrandId), //产品类型
-                            ChangeRecordNo = changeNo, //变更记录单号
-                            SeoTitle = "机具驳回仓库",
-                            BizBatchNo = No, //业务批次号
-                            SnNo = PosSn, //SN编号
-                        });
-                        db.SaveChanges();
-
-                        StoreBalance fbalance = db.StoreBalance.Add(new StoreBalance()
+                        if (fromStore.Id != toStore.Id)
                         {
-                            CreateDate = DateTime.Now,
-                            StoreId = fromStore.Id, //仓库
-                            BrandId = Convert.ToInt32(BrandId), //产品类型
-                            OpStoreNum = 1, //操作库存数
-                            OpSymbol = "-", //操作符
-                            BeforeTotalNum = fromStore.TotalNum, //操作前总库存数
-                            AfterTotalNum = fromStore.TotalNum - 1, //操作后总库存数
-                            BeforeLaveNum = fromStore.LaveNum, //操作前剩余库存数
-                            AfterLaveNum = fromStore.LaveNum - 1, //操作后剩余库存数
-                            BeforeOutNum = fromStore.OutNum, //操作前出库数
-                            AfterOutNum = fromStore.OutNum - 1, //操作后出库数
-                        }).Entity;
-                        db.SaveChanges();
-
-                        StoreBalance tbalance = db.StoreBalance.Add(new StoreBalance()
+                            var changeNo = "JJBH" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
+                            StoreStockChange stockchange = db.StoreStockChange.Add(new StoreStockChange()
+                            {
+                                CreateDate = DateTime.Now,
+                                StoreId = fromStore.Id, //出货仓库
+                                ToStoreId = toStore.Id, //发货仓库
+                                BrandId = Convert.ToInt32(BrandId), //产品类型
+                                ProductName = RelationClass.GetKqProductBrandInfo(Convert.ToInt32(BrandId)), //产品名称
+                                ChangeNo = changeNo, //变更记录单号
+                                BizBatchNo = No, //业务批次号
+                                TransType = 4, //交易类型
+                                SnNo = PosSn, //SN编号
+                                StockOpDirect = 1, //库存操作方向
+                                SnStatus = 1, //SN状态
+                                DeviceVendor = posInfo.DeviceName, //设备厂商
+                                DeviceModel = posInfo.DeviceKind, //设备型号
+                                DeviceType = posInfo.DeviceType, //设备类型                    
+                                SourceStoreId = posInfo.SourceStoreId, //源仓库编号
+                                BrandType = posInfo.DeviceType, //品牌类型
+                            }).Entity;
+                            db.SaveChanges();
+
+                            db.StoreChangeHistory.Add(new StoreChangeHistory()
+                            {
+                                CreateDate = DateTime.Now,
+                                UserId = user.Id, //创客
+                                StoreId = fromStore.Id, //出货仓库
+                                ToStoreId = toStore.Id, //发货仓库
+                                BrandId = Convert.ToInt32(BrandId), //产品类型
+                                ChangeRecordNo = changeNo, //变更记录单号
+                                SeoTitle = "机具驳回仓库",
+                                BizBatchNo = No, //业务批次号
+                                TransType = 4,//驳回
+                                SnNo = PosSn, //SN编号
+                            });
+                            db.SaveChanges();
+
+                            StoreBalance fbalance = db.StoreBalance.Add(new StoreBalance()
+                            {
+                                CreateDate = DateTime.Now,
+                                StoreId = fromStore.Id, //仓库
+                                BrandId = Convert.ToInt32(BrandId), //产品类型
+                                OpStoreNum = 1, //操作库存数
+                                OpSymbol = "-", //操作符
+                                BeforeTotalNum = fromStore.TotalNum, //操作前总库存数
+                                AfterTotalNum = fromStore.TotalNum - 1, //操作后总库存数
+                                BeforeLaveNum = fromStore.LaveNum, //操作前剩余库存数
+                                AfterLaveNum = fromStore.LaveNum - 1, //操作后剩余库存数
+                                BeforeOutNum = fromStore.OutNum, //操作前出库数
+                                AfterOutNum = fromStore.OutNum - 1, //操作后出库数
+                            }).Entity;
+                            db.SaveChanges();
+
+                            StoreBalance tbalance = db.StoreBalance.Add(new StoreBalance()
+                            {
+                                CreateDate = DateTime.Now,
+                                StoreId = toStore.Id, //仓库
+                                BrandId = Convert.ToInt32(BrandId), //产品类型
+                                OpStoreNum = 1, //操作库存数
+                                OpSymbol = "+", //操作符
+                                BeforeTotalNum = toStore.TotalNum, //操作前总库存数
+                                AfterTotalNum = toStore.TotalNum + 1, //操作后总库存数
+                                BeforeLaveNum = toStore.LaveNum, //操作前剩余库存数
+                                AfterLaveNum = toStore.LaveNum + 1, //操作后剩余库存数
+                                BeforeOutNum = toStore.OutNum, //操作前出库数
+                                AfterOutNum = toStore.OutNum, //操作后出库数
+                            }).Entity;
+                            db.SaveChanges();
+
+                            posInfo.StoreId = toStore.Id;
+                            posInfo.BuyUserId = 0;
+                            toStore.TotalNum += 1;
+                            toStore.LaveNum += 1;
+                            fromStore.TotalNum -= 1;
+                            fromStore.LaveNum -= 1;
+                            db.SaveChanges();
+                        }
+                        else
                         {
-                            CreateDate = DateTime.Now,
-                            StoreId = toStore.Id, //仓库
-                            BrandId = Convert.ToInt32(BrandId), //产品类型
-                            OpStoreNum = 1, //操作库存数
-                            OpSymbol = "+", //操作符
-                            BeforeTotalNum = toStore.TotalNum, //操作前总库存数
-                            AfterTotalNum = toStore.TotalNum + 1, //操作后总库存数
-                            BeforeLaveNum = toStore.LaveNum, //操作前剩余库存数
-                            AfterLaveNum = toStore.LaveNum + 1, //操作后剩余库存数
-                            BeforeOutNum = toStore.OutNum, //操作前出库数
-                            AfterOutNum = toStore.OutNum, //操作后出库数
-                        }).Entity;
-                        db.SaveChanges();
-
-                        posInfo.StoreId = toStore.Id;
-                        toStore.TotalNum += 1;
-                        toStore.LaveNum += 1;
-                        fromStore.TotalNum -= 1;
-                        fromStore.LaveNum -= 1;
+                            var changeNo = "JJBH" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
+                            StoreStockChange stockchange = db.StoreStockChange.Add(new StoreStockChange()
+                            {
+                                CreateDate = DateTime.Now,
+                                StoreId = fromStore.Id, //出货仓库
+                                ToStoreId = toStore.Id, //发货仓库
+                                BrandId = Convert.ToInt32(BrandId), //产品类型
+                                ProductName = RelationClass.GetKqProductBrandInfo(Convert.ToInt32(BrandId)), //产品名称
+                                ChangeNo = changeNo, //变更记录单号
+                                BizBatchNo = No, //业务批次号
+                                TransType = 4, //交易类型
+                                SnNo = PosSn, //SN编号
+                                StockOpDirect = 1, //库存操作方向
+                                SnStatus = 1, //SN状态
+                                DeviceVendor = posInfo.DeviceName, //设备厂商
+                                DeviceModel = posInfo.DeviceKind, //设备型号
+                                DeviceType = posInfo.DeviceType, //设备类型                    
+                                SourceStoreId = posInfo.SourceStoreId, //源仓库编号
+                                BrandType = posInfo.DeviceType, //品牌类型
+                            }).Entity;
+                            db.SaveChanges();
+
+                            db.StoreChangeHistory.Add(new StoreChangeHistory()
+                            {
+                                CreateDate = DateTime.Now,
+                                UserId = user.Id, //创客
+                                StoreId = fromStore.Id, //出货仓库
+                                ToStoreId = toStore.Id, //发货仓库
+                                BrandId = Convert.ToInt32(BrandId), //产品类型
+                                ChangeRecordNo = changeNo, //变更记录单号
+                                SeoTitle = "机具驳回仓库",
+                                BizBatchNo = No, //业务批次号
+                                SnNo = PosSn, //SN编号
+                                TransType = 4,//驳回
+                            });
+                            db.SaveChanges();
+
+                            StoreBalance fbalance = db.StoreBalance.Add(new StoreBalance()
+                            {
+                                CreateDate = DateTime.Now,
+                                StoreId = fromStore.Id, //仓库
+                                BrandId = Convert.ToInt32(BrandId), //产品类型
+                                OpStoreNum = 1, //操作库存数
+                                OpSymbol = "-", //操作符
+                                BeforeTotalNum = fromStore.TotalNum, //操作前总库存数
+                                AfterTotalNum = fromStore.TotalNum - 1, //操作后总库存数
+                                BeforeLaveNum = fromStore.LaveNum, //操作前剩余库存数
+                                AfterLaveNum = fromStore.LaveNum - 1, //操作后剩余库存数
+                                BeforeOutNum = fromStore.OutNum, //操作前出库数
+                                AfterOutNum = fromStore.OutNum - 1, //操作后出库数
+                            }).Entity;
+                            db.SaveChanges();
+
+                            StoreBalance tbalance = db.StoreBalance.Add(new StoreBalance()
+                            {
+                                CreateDate = DateTime.Now,
+                                StoreId = toStore.Id, //仓库
+                                BrandId = Convert.ToInt32(BrandId), //产品类型
+                                OpStoreNum = 1, //操作库存数
+                                OpSymbol = "+", //操作符
+                                BeforeTotalNum = toStore.TotalNum, //操作前总库存数
+                                AfterTotalNum = toStore.TotalNum + 1, //操作后总库存数
+                                BeforeLaveNum = toStore.LaveNum, //操作前剩余库存数
+                                AfterLaveNum = toStore.LaveNum + 1, //操作后剩余库存数
+                                BeforeOutNum = toStore.OutNum, //操作前出库数
+                                AfterOutNum = toStore.OutNum, //操作后出库数
+                            }).Entity;
+                            db.SaveChanges();
+
+                            posInfo.StoreId = toStore.Id;
+                            posInfo.BuyUserId = 0;
+                            toStore.LaveNum += 1;
+                            db.SaveChanges();
+                        }
                         db.SaveChanges();
 
                     }

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1447,6 +1447,16 @@ namespace MySystem.Areas.Admin.Controllers
                 // oldpos.BuyUserId = 0;
                 // oldpos.UserId = 0;
                 oldpos.Status = -1;
+
+                //对应调整客小爽企业版数据
+                var posInfo = db.BusinessPartnerPos.FirstOrDefault(m => m.PosId == oldpos.Id);
+                if (posInfo != null)
+                {
+                    posInfo.PosSn = newpos.PosSn;
+                    posInfo.PosId = newpos.Id;
+                    db.SaveChanges();
+                }
+
                 MachineForMerNo forMerNo = db.MachineForMerNo.FirstOrDefault(m => m.MerNo == merchant.KqMerNo);
                 if (forMerNo != null)
                 {
@@ -1515,269 +1525,420 @@ namespace MySystem.Areas.Admin.Controllers
         }
 
         [HttpPost]
-        public string ChangeBadPosDo(string OldSn, string NewSn, int IsSend = 0)
+        public string ChangeBadPosDo(string ChangeType, string MakerCode, string StoreCode, string OldSn, string NewSn, string FromStoreNo, string BackStoreNo, int IsSend = 0)
         {
-            if (string.IsNullOrEmpty(OldSn))
-            {
-                return "请输入原机具SN";
-            }
-            if (string.IsNullOrEmpty(NewSn))
-            {
-                return "请输入新机具SN";
-            }
-            string[] OldSnList = OldSn.Split('\n');
-            string[] NewSnList = NewSn.Split('\n');
-            if (OldSnList.Length != NewSnList.Length)
-            {
-                return "原机具SN数量和新机具SN数量不一致";
-            }
+            string[] OldSnList;
+            string[] NewSnList;
             decimal amount = 0;
-            for (int i = 0; i < OldSnList.Length; i++)
+            //创客坏机换新
+            if (ChangeType == "0")
             {
-                string OldSnNum = OldSnList[i];
-                string NewSnNum = NewSnList[i];
-                MachineForSnNo oldForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == OldSnNum) ?? new MachineForSnNo();
-                MachineForSnNo newForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == NewSnNum) ?? new MachineForSnNo();
-                PosMachinesTwo oldpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == oldForSnNo.SnId && m.BindingState == 0);
-                oldpos.Status = -1;
-                var oldStore = db.StoreHouse.FirstOrDefault(m => m.Id == oldpos.StoreId);
-                if (oldpos == null)
+                if (string.IsNullOrEmpty(MakerCode))
                 {
-                    return "原机具SN不正确或者不符合换机条件";
+                    return "请输入创客编号";
                 }
-                PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId && m.BuyUserId == 0 && m.UserId == 0 && m.BindingState == 0);
-                if (newpos == null)
+                if (string.IsNullOrEmpty(OldSn))
                 {
-                    return "新机具SN不正确或者不为仓库机";
+                    return "请输入坏机SN";
                 }
-                if (oldpos.BrandId != newpos.BrandId)
+                if (string.IsNullOrEmpty(NewSn))
                 {
-                    return "新机具和旧机具品牌不相同";
+                    return "请输入新机SN";
                 }
-
-                var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == newpos.BrandId) ?? new KqProducts();
-                if (brandInfo.Name.Contains("大POS"))
+                if (string.IsNullOrEmpty(FromStoreNo))
                 {
-                    amount = 300;
+                    return "请输入新机发货仓库编号";
                 }
-                if (brandInfo.Name.Contains("电签"))
+                if (string.IsNullOrEmpty(BackStoreNo))
                 {
-                    amount = 200;
+                    return "请输入坏机退回仓库编号";
                 }
-                var storehouse = db.StoreHouse.FirstOrDefault(m => m.Id == newpos.StoreId) ?? new StoreHouse();
-                storehouse.LaveNum -= 1;
-                var userAcount = db.UserAccount.FirstOrDefault(m => m.Id == storehouse.UserId) ?? new UserAccount();
-                if (oldpos.StoreId != newpos.StoreId)
+                OldSnList = OldSn.Split('\n');
+                NewSnList = NewSn.Split('\n');
+                if (OldSnList.Length != NewSnList.Length)
                 {
-                    userAcount.ValidAmount += amount;
-                    newpos.StoreId = oldpos.StoreId;
-                    newpos.BuyUserId = oldpos.BuyUserId;
-                    newpos.UserId = oldpos.UserId;
-                    newpos.LeaderUserId = oldpos.LeaderUserId;
-                    newpos.PreUserId = oldpos.PreUserId;
-                    newpos.IsFirst = oldpos.IsFirst;
+                    return "原机具SN数量和新机具SN数量不一致";
                 }
-                else
+
+                for (int i = 0; i < OldSnList.Length; i++)
                 {
+                    string OldSnNum = OldSnList[i];
+                    string NewSnNum = NewSnList[i];
+                    UserForMakerCode userForMakerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new UserForMakerCode();
+                    StoreForCode storeForCodeFrom = db.StoreForCode.FirstOrDefault(m => m.Code == FromStoreNo) ?? new StoreForCode();
+                    if (storeForCodeFrom.StoreId == 0)
+                    {
+                        return "您输入的新机发货仓库编号不存在";
+                    }
+                    StoreForCode storeForCodeBack = db.StoreForCode.FirstOrDefault(m => m.Code == BackStoreNo) ?? new StoreForCode();
+                    if (storeForCodeBack.StoreId == 0)
+                    {
+                        return "您输入的坏机退回仓库编号不存在";
+                    }
+                    MachineForSnNo oldForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == OldSnNum) ?? new MachineForSnNo();
+                    MachineForSnNo newForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == NewSnNum) ?? new MachineForSnNo();
+                    PosMachinesTwo oldpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == oldForSnNo.SnId && m.BindingState == 0 && m.BuyUserId == userForMakerCode.UserId) ?? new PosMachinesTwo();
+                    if (oldpos.Id == 0)
+                    {
+                        return "您输入的坏机SN不存在或者不在" + MakerCode + "名下";
+                    }
+                    PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId && m.BindingState == 0) ?? new PosMachinesTwo();
+                    if (newpos.Id == 0)
+                    {
+                        return "您输入的新机SN不存在";
+                    }
+                    StoreHouse storeFrom = db.StoreHouse.FirstOrDefault(m => m.Id == storeForCodeFrom.StoreId);
+                    if (Convert.ToInt32(storeFrom.BrandId) != Convert.ToInt32(oldpos.BrandId))
+                    {
+                        return "您输入的新机发货仓库不符新机机具对应品牌";
+                    }
+                    if (newpos.StoreId != storeFrom.Id)
+                    {
+                        return "您输入的新机SN不在新机发货仓库";
+                    }
+                    StoreHouse storeBack = db.StoreHouse.FirstOrDefault(m => m.Id == storeForCodeBack.StoreId);
+                    if (Convert.ToInt32(storeBack.BrandId) != Convert.ToInt32(oldpos.BrandId))
+                    {
+                        return "您输入的坏机退回仓库不符坏机机具对应品牌";
+                    }
+                    var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == oldpos.BrandId) ?? new KqProducts();
+                    if (brandInfo.Name.Contains("大POS"))
+                    {
+                        amount = 300;
+                    }
+                    if (brandInfo.Name.Contains("电签"))
+                    {
+                        amount = 200;
+                    }
+                    // var storeUserAcount = db.UserAccount.FirstOrDefault(m => m.Id == store.UserId) ?? new UserAccount();
+                    var storeFromUserAcount = db.UserAccount.FirstOrDefault(m => m.Id == storeFrom.UserId) ?? new UserAccount();
+                    var storeBackUserAcount = db.UserAccount.FirstOrDefault(m => m.Id == storeBack.UserId) ?? new UserAccount();
+                    // storeUserAcount.ValidAmount += amount;
+                    storeFromUserAcount.ValidAmount += amount;
+                    storeBackUserAcount.ValidAmount -= amount;
+
+
                     newpos.BuyUserId = oldpos.BuyUserId;
                     newpos.UserId = oldpos.UserId;
+                    newpos.RecycEndDate = oldpos.RecycEndDate;
+                    newpos.ScanQrTrade = oldpos.ScanQrTrade;
+                    newpos.DebitCardTrade = oldpos.DebitCardTrade;
+                    newpos.CreditTrade = oldpos.CreditTrade;
+                    newpos.PosSnType = oldpos.PosSnType;
+                    newpos.TransferTime = oldpos.TransferTime;
+                    newpos.IsPurchase = oldpos.IsPurchase;
+                    newpos.BindingState = oldpos.BindingState;
+                    newpos.ActivationState = oldpos.ActivationState;
+                    newpos.BindingTime = oldpos.BindingTime;
+                    newpos.ActivationTime = oldpos.ActivationTime;
+                    newpos.IsFirst = oldpos.IsFirst;
+                    newpos.SeoKeyword = oldpos.SeoKeyword;
+                    newpos.PrizeParams = oldpos.PrizeParams;
                     newpos.LeaderUserId = oldpos.LeaderUserId;
+
+                    newpos.StoreId = oldpos.StoreId;
+                    newpos.UserId = oldpos.UserId;
                     newpos.PreUserId = oldpos.PreUserId;
-                    newpos.IsFirst = oldpos.IsFirst;
-                }
-                db.SaveChanges();
 
-                var oldPosBrand = db.KqProducts.FirstOrDefault(m => m.Id == oldpos.BrandId) ?? new KqProducts();
-                var newPosBrand = db.KqProducts.FirstOrDefault(m => m.Id == newpos.BrandId) ?? new KqProducts();
-                var UserId = 0;
-                if (oldpos.BuyUserId == 0)
+                    oldpos.StoreId = storeBack.Id;
+                    oldpos.BuyUserId = 0;
+                    oldpos.UserId = 0;
+                    oldpos.Status = -1;
+                    db.SaveChanges();
+
+                    BrokenMachineChange add = db.BrokenMachineChange.Add(new BrokenMachineChange()
+                    {
+                        CreateDate = DateTime.Now,
+                        CreateMan = SysUserName + "-" + SysRealName,
+                        ChangeNo = "BPC" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(3), //转换单号
+                        OutStoreId = storeFrom.Id,
+                        BackStoreId = storeBack.Id,
+                        OutProductType = newpos.BrandId,
+                        BackProductType = oldpos.BrandId,
+                        UserId = userForMakerCode.UserId, //创客
+                    }).Entity;
+                    db.SaveChanges();
+                    BrokenMachineChangeDetail adds = db.BrokenMachineChangeDetail.Add(new BrokenMachineChangeDetail()
+                    {
+                        CreateDate = DateTime.Now,
+                        CreateMan = SysUserName + "-" + SysRealName,
+                        OutSnNo = OldSnNum,
+                        BackSnNo = NewSnNum,
+                        ChangeNo = add.ChangeNo, //转换单号
+                        ChangeId = add.Id, //转换记录Id
+                        UserId = add.UserId, //创客
+                    }).Entity;
+                    db.SaveChanges();
+                    var oldPosBrand = db.KqProducts.FirstOrDefault(m => m.Id == oldpos.BrandId) ?? new KqProducts();
+                    if (IsSend == 1)
+                    {
+                        RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
+                        {
+                            UserId = userForMakerCode.UserId, //接收创客
+                            MsgType = 2,
+                            Title = "坏机换新成功通知", //标题
+                            Summary = "您的坏机 " + oldPosBrand.Name + " SN:" + OldSnNum + "已经成功为您换为" + oldPosBrand.Name + "SN:" + NewSnNum + "。",
+                            CreateDate = DateTime.Now,
+
+                        }));
+                    }
+                }
+            }
+            //仓库坏机换新
+            else
+            {
+                if (string.IsNullOrEmpty(StoreCode))
                 {
-                    UserId = oldStore.UserId;
+                    return "请输入仓库编号";
                 }
-                else
+                if (string.IsNullOrEmpty(OldSn))
                 {
-                    UserId = oldpos.BuyUserId;
+                    return "请输入坏机SN";
                 }
-                BrokenMachineChange add = db.BrokenMachineChange.Add(new BrokenMachineChange()
+                if (string.IsNullOrEmpty(NewSn))
                 {
-                    CreateDate = DateTime.Now,
-                    CreateMan = SysUserName + "-" + SysRealName,
-                    ChangeNo = "BPC" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(3), //转换单号
-                    UserId = UserId, //创客
-                }).Entity;
-                db.SaveChanges();
-                BrokenMachineChangeDetail adds = db.BrokenMachineChangeDetail.Add(new BrokenMachineChangeDetail()
+                    return "请输入新机SN";
+                }
+                if (string.IsNullOrEmpty(FromStoreNo))
                 {
-                    CreateDate = DateTime.Now,
-                    CreateMan = SysUserName + "-" + SysRealName,
-                    OutSnNo = OldSnNum,
-                    BackSnNo = NewSnNum,
-                    ChangeNo = add.ChangeNo, //转换单号
-                    ChangeId = add.Id, //转换记录Id
-                    UserId = add.UserId, //创客
-                }).Entity;
-                db.SaveChanges();
-                if (IsSend == 1)
+                    return "请输入新机发货仓库编号";
+                }
+                if (string.IsNullOrEmpty(BackStoreNo))
                 {
-                    RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
+                    return "请输入坏机退回仓库编号";
+                }
+                OldSnList = OldSn.Split('\n');
+                NewSnList = NewSn.Split('\n');
+                if (OldSnList.Length != NewSnList.Length)
+                {
+                    return "原机具SN数量和新机具SN数量不一致";
+                }
+
+                for (int i = 0; i < OldSnList.Length; i++)
+                {
+                    string OldSnNum = OldSnList[i];
+                    string NewSnNum = NewSnList[i];
+                    StoreHouse store = new StoreHouse();
+                    StoreForCode storeForBadCode = db.StoreForCode.FirstOrDefault(m => m.Code == StoreCode) ?? new StoreForCode();
+                    if (storeForBadCode.StoreId > 0)
+                    {
+                        store = db.StoreHouse.FirstOrDefault(m => m.Id == storeForBadCode.StoreId);
+                    }
+                    StoreForCode storeForCodeFrom = db.StoreForCode.FirstOrDefault(m => m.Code == FromStoreNo) ?? new StoreForCode();
+                    if (storeForCodeFrom.StoreId == 0)
+                    {
+                        return "您输入的新机发货仓库编号不存在";
+                    }
+                    StoreForCode storeForCodeBack = db.StoreForCode.FirstOrDefault(m => m.Code == BackStoreNo) ?? new StoreForCode();
+                    if (storeForCodeBack.StoreId == 0)
+                    {
+                        return "您输入的坏机退回仓库编号不存在";
+                    }
+                    MachineForSnNo oldForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == OldSnNum) ?? new MachineForSnNo();
+                    MachineForSnNo newForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == NewSnNum) ?? new MachineForSnNo();
+                    PosMachinesTwo oldpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == oldForSnNo.SnId && m.BindingState == 0 && m.StoreId == storeForBadCode.StoreId) ?? new PosMachinesTwo();
+                    if (oldpos.Id == 0)
+                    {
+                        return "您输入的坏机SN不存在或者不在仓库" + StoreCode + "中";
+                    }
+                    PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId && m.BindingState == 0) ?? new PosMachinesTwo();
+                    if (newpos.Id == 0)
+                    {
+                        return "您输入的新机SN不存在";
+                    }
+                    StoreHouse storeFrom = db.StoreHouse.FirstOrDefault(m => m.Id == storeForCodeFrom.StoreId);
+                    if (Convert.ToInt32(storeFrom.BrandId) != Convert.ToInt32(oldpos.BrandId))
+                    {
+                        return "您输入的新机发货仓库不符新机机具对应品牌";
+                    }
+                    if (newpos.StoreId != storeFrom.Id)
+                    {
+                        return "您输入的新机SN不在新机发货仓库";
+                    }
+                    StoreHouse storeBack = db.StoreHouse.FirstOrDefault(m => m.Id == storeForCodeBack.StoreId);
+                    if (Convert.ToInt32(storeBack.BrandId) != Convert.ToInt32(oldpos.BrandId))
+                    {
+                        return "您输入的坏机退回仓库不符坏机机具对应品牌";
+                    }
+                    var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == oldpos.BrandId) ?? new KqProducts();
+                    if (brandInfo.Name.Contains("大POS"))
+                    {
+                        amount = 300;
+                    }
+                    if (brandInfo.Name.Contains("电签"))
+                    {
+                        amount = 200;
+                    }
+                    var storeUserAcount = db.UserAccount.FirstOrDefault(m => m.Id == store.UserId) ?? new UserAccount();
+                    var storeFromUserAcount = db.UserAccount.FirstOrDefault(m => m.Id == storeFrom.UserId) ?? new UserAccount();
+                    var storeBackUserAcount = db.UserAccount.FirstOrDefault(m => m.Id == storeBack.UserId) ?? new UserAccount();
+                    // storeUserAcount.ValidAmount += amount;
+                    storeFromUserAcount.ValidAmount += amount;
+                    storeBackUserAcount.ValidAmount -= amount;
+                    newpos.StoreId = oldpos.StoreId;
+                    newpos.BuyUserId = oldpos.BuyUserId;
+                    newpos.UserId = oldpos.UserId;
+                    newpos.LeaderUserId = oldpos.LeaderUserId;
+                    newpos.PreUserId = oldpos.PreUserId;
+                    newpos.IsFirst = oldpos.IsFirst;
+                    newpos.TransferTime = oldpos.TransferTime;
+
+                    oldpos.StoreId = storeBack.Id;
+                    oldpos.BuyUserId = 0;
+                    oldpos.UserId = 0;
+                    db.SaveChanges();
+
+                    BrokenMachineChange add = db.BrokenMachineChange.Add(new BrokenMachineChange()
                     {
-                        UserId = UserId, //接收创客
-                        MsgType = 2,
-                        Title = "坏机换新成功通知", //标题
-                        Summary = "您的坏机 " + oldPosBrand.Name + " SN:" + OldSn + "已经成功为您换为" + newPosBrand.Name + "SN:" + NewSn + "。",
                         CreateDate = DateTime.Now,
+                        CreateMan = SysUserName + "-" + SysRealName,
+                        ChangeNo = "BPC" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(3), //转换单号
+                        OutStoreId = storeFrom.Id,
+                        BackStoreId = storeBack.Id,
+                        OutProductType = newpos.BrandId,
+                        BackProductType = oldpos.BrandId,
+                        UserId = store.UserId, //创客
+                    }).Entity;
+                    db.SaveChanges();
+                    BrokenMachineChangeDetail adds = db.BrokenMachineChangeDetail.Add(new BrokenMachineChangeDetail()
+                    {
+                        CreateDate = DateTime.Now,
+                        CreateMan = SysUserName + "-" + SysRealName,
+                        OutSnNo = OldSnNum,
+                        BackSnNo = NewSnNum,
+                        ChangeNo = add.ChangeNo, //转换单号
+                        ChangeId = add.Id, //转换记录Id
+                        UserId = add.UserId, //创客
+                    }).Entity;
+                    db.SaveChanges();
+                    var oldPosBrand = db.KqProducts.FirstOrDefault(m => m.Id == oldpos.BrandId) ?? new KqProducts();
+                    if (IsSend == 1)
+                    {
+                        RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
+                        {
+                            UserId = store.UserId, //接收创客
+                            MsgType = 2,
+                            Title = "坏机换新成功通知", //标题
+                            Summary = "您的坏机 " + oldPosBrand.Name + " SN:" + OldSnNum + "已经成功为您换为" + oldPosBrand.Name + "SN:" + NewSnNum + "。",
+                            CreateDate = DateTime.Now,
 
-                    }));
+                        }));
+                    }
                 }
             }
-            return "success";
-        }
+            // for (int i = 0; i < OldSnList.Length; i++)
+            // {
+            //     string OldSnNum = OldSnList[i];
+            //     string NewSnNum = NewSnList[i];
+            //     StoreForCode storeForCode = db.StoreForCode.FirstOrDefault(m => m.Code == BackStoreNo) ?? new StoreForCode();
+            //     MachineForSnNo oldForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == OldSnNum) ?? new MachineForSnNo();
+            //     MachineForSnNo newForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == NewSnNum) ?? new MachineForSnNo();
+            //     StoreHouse oldStore = new StoreHouse();
+            //     PosMachinesTwo oldpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == oldForSnNo.SnId && m.BindingState == 0);
+            //     if (storeForCode.StoreId > 0)
+            //     {
+            //         StoreHouse store = db.StoreHouse.FirstOrDefault(m => m.Id == storeForCode.StoreId);
+            //         if (Convert.ToInt32(store.BrandId) != Convert.ToInt32(oldpos.BrandId))
+            //         {
+            //             return "您输入的仓库不符机具对应品牌";
+            //         }
+            //         oldStore = db.StoreHouse.FirstOrDefault(m => m.Id == oldpos.StoreId);
+            //         oldpos.Status = -1;
+            //         oldpos.StoreId = store.Id;
+            //     }
+            //     if (oldpos == null)
+            //     {
+            //         return "原机具SN不正确或者不符合换机条件";
+            //     }
+            //     PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId && m.BuyUserId == 0 && m.UserId == 0 && m.BindingState == 0);
+            //     if (newpos == null)
+            //     {
+            //         return "新机具SN不正确或者不为仓库机";
+            //     }
+            //     if (oldpos.BrandId != newpos.BrandId)
+            //     {
+            //         return "新机具和旧机具品牌不相同";
+            //     }
 
-        // public string ChangeBadPosDo(string OldSn, string NewSn, string BackStoreNo, string OutStoreNo, string MakerCode = "", int IsSend = 0)
-        // {
-        //     if (string.IsNullOrEmpty(OldSn))
-        //     {
-        //         return "请输入原机具SN";
-        //     }
-        //     if (string.IsNullOrEmpty(NewSn))
-        //     {
-        //         return "请输入新机具SN";
-        //     }
-        //     string[] OldSnList = OldSn.Split('\n');
-        //     string[] NewSnList = NewSn.Split('\n');
-        //     if (OldSnList.Length != NewSnList.Length)
-        //     {
-        //         return "原机具SN数量和新机具SN数量不一致";
-        //     }
-        //     WebCMSEntities db = new WebCMSEntities();
-        //     PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == OldSn);
-        //     StoreForCode storeForBack = db.StoreForCode.FirstOrDefault(m => m.Code == BackStoreNo) ?? new StoreForCode();
-        //     StoreForCode storeForOut = db.StoreForCode.FirstOrDefault(m => m.Code == OutStoreNo) ?? new StoreForCode();
-        //     StoreHouse BackStore = db.StoreHouse.FirstOrDefault(m => m.Id == storeForBack.StoreId) ?? new StoreHouse();
-        //     StoreHouse OutStore = db.StoreHouse.FirstOrDefault(m => m.Id == storeForOut.StoreId) ?? new StoreHouse();
-        //     string ChangeNo = "BPC" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(3);
-        //     KqProducts oldPosBrand = new KqProducts();
-        //     KqProducts newPosBrand = new KqProducts();
-        //     MachineChange add = db.MachineChange.Add(new MachineChange()
-        //     {
-        //         CreateDate = DateTime.Now,
-        //         UpdateDate = DateTime.Now,
-        //         CreateMan = SysUserName + "-" + SysRealName,
-        //         ChangeNo = ChangeNo, //转换单号
-        //         UserId = 0, //创客
-        //         ChangeTime = DateTime.Now, //转换时间
-        //         BackStoreId = BackStore.Id, //退回仓库
-        //         BackStoreName = BackStore.StoreName, //退回仓库名称
-        //         Remark = "坏机换新", //订单备注
-        //         BackStoreUserId = BackStore.UserId, //退回仓库归属人
-        //         OutProductType = int.Parse(OutStore.BrandId), //出库产品类型
-        //         OutProductName = OutStore.ProductName, //出库产品名称
-        //         OutStoreId = OutStore.Id, //出库仓库
-        //         OutStoreName = OutStore.StoreName, //出库仓库名称
-        //         OutStoreAreas = OutStore.Areas, //出库仓库所在地区
-        //         OutStoreAddress = OutStore.Address, //出库仓库地址
-        //         OutStoreManager = "", //出库仓库联系人
-        //         OutStoreManagerMobile = OutStore.ManageMobile, //出库仓库联系人手机号
-        //     }).Entity;
-        //     db.SaveChanges();
-        //     int BackProductType = 0;
-        //     string BackProductName = "";
-        //     string ChangeDeviceName = "";
-        //     string ChangeSnExpand = "";
-        //     for (int i = 0; i < OldSnList.Length; i++)
-        //     {
-        //         string OldSnNum = OldSnList[i];
-        //         string NewSnNum = NewSnList[i];
-        //         MachineForSnNo oldForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == OldSnNum) ?? new MachineForSnNo();
-        //         MachineForSnNo newForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == NewSnNum) ?? new MachineForSnNo();
-        //         PosMachinesTwo oldpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == oldForSnNo.SnId);
-        //         if (oldpos == null)
-        //         {
-        //             return "原机具SN不正确";
-        //         }
-        //         PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId);
-        //         if (newpos == null)
-        //         {
-        //             return "新机具SN不正确";
-        //         }
-        //         oldPosBrand = db.KqProducts.FirstOrDefault(m => m.Id == oldpos.BrandId) ?? new KqProducts();
-        //         newPosBrand = db.KqProducts.FirstOrDefault(m => m.Id == newpos.BrandId) ?? new KqProducts();
-        //         Users user = new Users();
-        //         if (!string.IsNullOrEmpty(MakerCode))
-        //         {
-        //             UserForMakerCode userForMakerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new UserForMakerCode();
-        //             user = db.Users.FirstOrDefault(m => m.Id == userForMakerCode.UserId) ?? new Users();
-        //         }
-        //         else
-        //         {
-        //             user = db.Users.FirstOrDefault(m => m.Id == oldpos.UserId) ?? new Users();
-        //         }
-        //         newpos.BuyUserId = oldpos.BuyUserId;
-        //         newpos.UserId = oldpos.UserId;
-        //         newpos.RecycEndDate = oldpos.RecycEndDate;
-        //         newpos.ScanQrTrade = oldpos.ScanQrTrade;
-        //         newpos.DebitCardTrade = oldpos.DebitCardTrade;
-        //         newpos.CreditTrade = oldpos.CreditTrade;
-        //         newpos.PosSnType = oldpos.PosSnType;
-        //         newpos.TransferTime = oldpos.TransferTime;
-        //         newpos.IsPurchase = oldpos.IsPurchase;
-        //         newpos.BindingState = oldpos.BindingState;
-        //         newpos.ActivationState = oldpos.ActivationState;
-        //         newpos.BindingTime = oldpos.BindingTime;
-        //         newpos.ActivationTime = oldpos.ActivationTime;
-        //         newpos.IsFirst = oldpos.IsFirst;
-        //         newpos.SeoKeyword = oldpos.SeoKeyword;
-        //         newpos.PrizeParams = oldpos.PrizeParams;
-        //         newpos.LeaderUserId = oldpos.LeaderUserId;
-        //         newpos.IsFirst = oldpos.IsFirst;
-        //         oldpos.Status = -1;
-        //         db.MachineChangeDetail.Add(new MachineChangeDetail()
-        //         {
-        //             CreateDate = DateTime.Now,
-        //             CreateMan = SysUserName + "-" + SysRealName,
-        //             ChangeNo = ChangeNo, //订单号
-        //             ChangeId = add.Id, //订单Id
-        //             BackProductType = oldpos.BrandId, //退回产品类型
-        //             BackProductName = oldPosBrand.Name, //退回产品名称
-        //             UserId = 0, //创客
-        //             BackSnNo = oldpos.PosSn, //设备SN编号
-        //             OutProductType = newpos.BrandId, //出库产品类型
-        //             OutProductName = newPosBrand.Name, //出库产品名称
-        //             OutSnNo = newpos.PosSn, //出库设备SN编号
-        //             OutSnType = newpos.PosSnType, //出库SN机具类型
-        //             Remark = "坏机换新", //备注
-        //             BackSnType = oldpos.PosSnType, //退回SN机具类型
-        //         });
-        //         db.SaveChanges();
-        //         BackProductType = oldpos.BrandId;
-        //         BackProductName = newPosBrand.Name;
-        //         ChangeDeviceName = oldpos.DeviceName;
-        //         ChangeSnExpand += oldpos.PosSn + "\n";
-        //         PublicFunction.SycnMachineCount(oldpos.BuyUserId, oldpos.BrandId);
-        //     }
-        //     add.BackProductType = BackProductType; //退回产品类型
-        //     add.BackProductName = BackProductName; //退回产品名称
-        //     add.ChangeDeviceName = ChangeDeviceName; //转换机具名称
-        //     add.ChangeDeviceNum = OldSnList.Length; //转换机具数量
-        //     add.ChangeSnExpand = ChangeSnExpand; //机具SN
-        //     BackStore.LaveNum += OldSnList.Length; //退回仓库库存
-        //     OutStore.LaveNum -= OldSnList.Length; //出货仓库库存
-        //     db.SaveChanges();
-        //     db.Dispose();
-        //     if (IsSend == 1)
-        //     {
-        //         RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
-        //         {
-        //             UserId = pos.BuyUserId, //接收创客
-        //             MsgType = 2,
-        //             Title = "坏机换新成功通知", //标题
-        //             Summary = "您的 " + oldPosBrand.Name + " SN:" + OldSn + "已经成功为您换为" + newPosBrand.Name + "SN:" + NewSn + "。",
-        //             CreateDate = DateTime.Now,
+            //     var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == newpos.BrandId) ?? new KqProducts();
+            //     if (brandInfo.Name.Contains("大POS"))
+            //     {
+            //         amount = 300;
+            //     }
+            //     if (brandInfo.Name.Contains("电签"))
+            //     {
+            //         amount = 200;
+            //     }
+            //     var storehouse = db.StoreHouse.FirstOrDefault(m => m.Id == newpos.StoreId) ?? new StoreHouse();
+            //     storehouse.LaveNum -= 1;
+            //     var userAcount = db.UserAccount.FirstOrDefault(m => m.Id == storehouse.UserId) ?? new UserAccount();
+            //     if (oldpos.StoreId != newpos.StoreId)
+            //     {
+            //         userAcount.ValidAmount += amount;
+            //         newpos.StoreId = oldpos.StoreId;
+            //         newpos.BuyUserId = oldpos.BuyUserId;
+            //         newpos.UserId = oldpos.UserId;
+            //         newpos.LeaderUserId = oldpos.LeaderUserId;
+            //         newpos.PreUserId = oldpos.PreUserId;
+            //         newpos.IsFirst = oldpos.IsFirst;
+            //         newpos.TransferTime = oldpos.TransferTime;
+            //     }
+            //     else
+            //     {
+            //         newpos.BuyUserId = oldpos.BuyUserId;
+            //         newpos.UserId = oldpos.UserId;
+            //         newpos.LeaderUserId = oldpos.LeaderUserId;
+            //         newpos.PreUserId = oldpos.PreUserId;
+            //         newpos.IsFirst = oldpos.IsFirst;
+            //         newpos.TransferTime = oldpos.TransferTime;
+            //     }
+            //     db.SaveChanges();
 
-        //         }));
-        //     }
-        //     return "success";
-        // }
+            //     var oldPosBrand = db.KqProducts.FirstOrDefault(m => m.Id == oldpos.BrandId) ?? new KqProducts();
+            //     var newPosBrand = db.KqProducts.FirstOrDefault(m => m.Id == newpos.BrandId) ?? new KqProducts();
+            //     var UserId = 0;
+            //     if (oldpos.BuyUserId == 0)
+            //     {
+            //         UserId = oldStore.UserId;
+            //     }
+            //     else
+            //     {
+            //         UserId = oldpos.BuyUserId;
+            //     }
+            //     BrokenMachineChange add = db.BrokenMachineChange.Add(new BrokenMachineChange()
+            //     {
+            //         CreateDate = DateTime.Now,
+            //         CreateMan = SysUserName + "-" + SysRealName,
+            //         ChangeNo = "BPC" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(3), //转换单号
+            //         UserId = UserId, //创客
+            //     }).Entity;
+            //     db.SaveChanges();
+            //     BrokenMachineChangeDetail adds = db.BrokenMachineChangeDetail.Add(new BrokenMachineChangeDetail()
+            //     {
+            //         CreateDate = DateTime.Now,
+            //         CreateMan = SysUserName + "-" + SysRealName,
+            //         OutSnNo = OldSnNum,
+            //         BackSnNo = NewSnNum,
+            //         ChangeNo = add.ChangeNo, //转换单号
+            //         ChangeId = add.Id, //转换记录Id
+            //         UserId = add.UserId, //创客
+            //     }).Entity;
+            //     db.SaveChanges();
+            //     if (IsSend == 1)
+            //     {
+            //         RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
+            //         {
+            //             UserId = UserId, //接收创客
+            //             MsgType = 2,
+            //             Title = "坏机换新成功通知", //标题
+            //             Summary = "您的坏机 " + oldPosBrand.Name + " SN:" + OldSn + "已经成功为您换为" + newPosBrand.Name + "SN:" + NewSn + "。",
+            //             CreateDate = DateTime.Now,
+
+            //         }));
+            //     }
+            // }
+            return "success";
+        }
         #endregion
 
 
@@ -1851,6 +2012,18 @@ namespace MySystem.Areas.Admin.Controllers
                 PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId);
                 if (merchant != null)
                 {
+                    //机具解绑删除客小爽企业版对应数据
+                    var merInfo = db.BusinessPartnerMerchant.FirstOrDefault(m => m.MerchantId == merchant.Id);
+                    if (merInfo != null)
+                    {
+                        db.BusinessPartnerMerchant.Remove(merInfo);
+                    }
+                    var posInfo = db.BusinessPartnerPos.FirstOrDefault(m => m.PosId == pos.Id);
+                    if (posInfo != null)
+                    {
+                        db.BusinessPartnerPos.Remove(posInfo);
+                    }
+
                     db.PosMerchantInfo.Remove(merchant);
                 }
                 db.MachineForMerNo.Remove(forMerNo);
@@ -1995,47 +2168,47 @@ namespace MySystem.Areas.Admin.Controllers
             ViewBag.SwapSnExpand = SwapSnExpand;
             ViewBag.SnNos = SnNos;
 
-            // List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            // var machineApplie = db.MachineApply.Where(m => m.Status > -1).ToList();
-
-            // if (!string.IsNullOrEmpty(SwapSnExpand))
-            // {
-            //     machineApplie = db.MachineApply.Where(m => m.Status > -1 && m.SwapSnExpand.Contains(SwapSnExpand)).ToList();
-            //     foreach (var item in machineApplie)
-            //     {
-            //         var orders = db.Orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount);
-            //         Dictionary<string, object> data = new Dictionary<string, object>();
-            //         data["ApplyNo"] = item.ApplyNo.ToString();
-            //         data["OrderNo"] = orders.OrderNo.ToString();
-            //         data["MakerCode"] = item.ApplyNo.ToString();
-            //         data["RealName"] = item.ApplyNo.ToString();
-            //         data["ComeSn"] = item.ApplyNo.ToString();
-            //         data["SendSn"] = item.ApplyNo.ToString();
-            //         data["CreateDate"] = item.ApplyNo.ToString();
-            //         data["Status"] = item.ApplyNo.ToString();
-            //         dataList.Add(data);
-            //     }
-            // }
-            // if (!string.IsNullOrEmpty(SnNos))
-            // {
-            //     machineApplie = db.MachineApply.Where(m => m.Status > -1 && m.SwapSnExpand.Contains(SnNos)).ToList();
-            //     foreach (var item in machineApplie)
-            //     {
-            //         var orders = db.Orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount);
-            //         Dictionary<string, object> data = new Dictionary<string, object>();
-            //         data["ApplyNo"] = item.ApplyNo.ToString();
-            //         data["OrderNo"] = orders.OrderNo.ToString();
-            //         data["MakerCode"] = item.ApplyNo.ToString();
-            //         data["RealName"] = item.ApplyNo.ToString();
-            //         data["ComeSn"] = item.ApplyNo.ToString();
-            //         data["SendSn"] = item.ApplyNo.ToString();
-            //         data["CreateDate"] = item.ApplyNo.ToString();
-            //         data["Status"] = item.ApplyNo.ToString();
-            //         dataList.Add(data);
-            //     }
-            // }
-            // return View(dataList);
-            return View();
+            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+            var machineApplie = db.MachineApply.Where(m => m.Status > -1).ToList();
+            var orders = db.Orders.Where(m => m.Status > -1).ToList();
+            if (!string.IsNullOrEmpty(SwapSnExpand))
+            {
+                var machineApplie1 = machineApplie.Where(m => m.Status > -1 && m.SwapSnExpand.Contains(SwapSnExpand)).ToList();
+                foreach (var item in machineApplie1)
+                {
+                    var orders1 = orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount);
+                    Dictionary<string, object> data = new Dictionary<string, object>();
+                    data["ApplyNo"] = item.ApplyNo.ToString();
+                    data["OrderNo"] = orders1.OrderNo.ToString();
+                    data["MakerCode"] = item.ApplyNo.ToString();
+                    data["RealName"] = item.ApplyNo.ToString();
+                    data["ComeSn"] = item.ApplyNo.ToString();
+                    data["SendSn"] = item.ApplyNo.ToString();
+                    data["CreateDate"] = item.ApplyNo.ToString();
+                    data["Status"] = item.ApplyNo.ToString();
+                    dataList.Add(data);
+                }
+            }
+            if (!string.IsNullOrEmpty(SnNos))
+            {
+                var machineApplie1 = machineApplie.Where(m => m.Status > -1 && m.SwapSnExpand.Contains(SnNos)).ToList();
+                foreach (var item in machineApplie1)
+                {
+                    var orders1 = orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount);
+                    Dictionary<string, object> data = new Dictionary<string, object>();
+                    data["ApplyNo"] = item.ApplyNo.ToString();
+                    data["OrderNo"] = orders1.OrderNo.ToString();
+                    data["MakerCode"] = item.ApplyNo.ToString();
+                    data["RealName"] = item.ApplyNo.ToString();
+                    data["ComeSn"] = item.ApplyNo.ToString();
+                    data["SendSn"] = item.ApplyNo.ToString();
+                    data["CreateDate"] = item.ApplyNo.ToString();
+                    data["Status"] = item.ApplyNo.ToString();
+                    dataList.Add(data);
+                }
+            }
+            return View(dataList);
+            // return View();
         }
 
         #endregion
@@ -2054,16 +2227,17 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SnNos", "1"); //发货机具SN
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
             var machineApplie = db.MachineApply.Where(m => m.Status > -1).ToList();
+            var orders = db.Orders.Where(m => m.Status > -1).ToList();
 
             if (!string.IsNullOrEmpty(SwapSnExpand))
             {
-                machineApplie = db.MachineApply.Where(m => m.Status > -1 && m.SwapSnExpand.Contains(SwapSnExpand)).ToList();
-                foreach (var item in machineApplie)
+                var machineApplie1 = machineApplie.Where(m => m.Status > -1 && m.SwapSnExpand.Contains(SwapSnExpand)).ToList();
+                foreach (var item in machineApplie1)
                 {
-                    var orders = db.Orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount);
+                    var orders1 = orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount);
                     Dictionary<string, object> data = new Dictionary<string, object>();
                     data["ApplyNo"] = item.ApplyNo.ToString();
-                    data["OrderNo"] = orders.OrderNo.ToString();
+                    data["OrderNo"] = orders1.OrderNo.ToString();
                     data["MakerCode"] = item.ApplyNo.ToString();
                     data["RealName"] = item.ApplyNo.ToString();
                     data["ComeSn"] = item.ApplyNo.ToString();
@@ -2075,13 +2249,13 @@ namespace MySystem.Areas.Admin.Controllers
             }
             else if (!string.IsNullOrEmpty(SnNos))
             {
-                machineApplie = db.MachineApply.Where(m => m.Status > -1 && m.SwapSnExpand.Contains(SnNos)).ToList();
-                foreach (var item in machineApplie)
+                var machineApplie1 = machineApplie.Where(m => m.Status > -1 && m.SwapSnExpand.Contains(SnNos)).ToList();
+                foreach (var item in machineApplie1)
                 {
-                    var orders = db.Orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount);
+                    var orders1 = orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount);
                     Dictionary<string, object> data = new Dictionary<string, object>();
                     data["ApplyNo"] = item.ApplyNo.ToString();
-                    data["OrderNo"] = orders.OrderNo.ToString();
+                    data["OrderNo"] = orders1.OrderNo.ToString();
                     data["MakerCode"] = item.ApplyNo.ToString();
                     data["RealName"] = item.ApplyNo.ToString();
                     data["ComeSn"] = item.ApplyNo.ToString();
@@ -2093,26 +2267,25 @@ namespace MySystem.Areas.Admin.Controllers
             }
             else
             {
-                machineApplie = db.MachineApply.Where(m => m.Status > -1).ToList();
                 foreach (var item in machineApplie)
                 {
-                    var orders = db.Orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount) ?? new Orders();
+                    var orders1 = orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount) ?? new Orders();
                     var user = db.Users.FirstOrDefault(m => m.Id == item.UserId) ?? new Users();
                     Dictionary<string, object> data = new Dictionary<string, object>();
                     data["ApplyNo"] = item.ApplyNo.ToString();
-                    if (!string.IsNullOrEmpty(orders.OrderNo))
+                    if (!string.IsNullOrEmpty(orders1.OrderNo))
                     {
-                        data["OrderNo"] = orders.OrderNo.ToString();
+                        data["OrderNo"] = orders1.OrderNo.ToString();
                     }
-                    if (string.IsNullOrEmpty(orders.OrderNo))
+                    if (string.IsNullOrEmpty(orders1.OrderNo))
                     {
                         data["OrderNo"] = "";
                     }
-                    if (!string.IsNullOrEmpty(orders.SnNos))
+                    if (!string.IsNullOrEmpty(orders1.SnNos))
                     {
-                        data["SendSn"] = orders.SnNos.ToString();
+                        data["SendSn"] = orders1.SnNos.ToString();
                     }
-                    if (string.IsNullOrEmpty(orders.SnNos))
+                    if (string.IsNullOrEmpty(orders1.SnNos))
                     {
                         data["SendSn"] = "";
                     }

Areas/Admin/Controllers/SpServer/ActivateRecordController.cs

@@ -61,6 +61,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("MerMobile", "1"); //商户手机号
             Fields.Add("SnNo", "1"); //终端机身号
             Fields.Add("ChannelSerial", "1"); //渠道流水号
+            Fields.Add("ProductType", "0"); //产品类型
 
 
             string condition = " and Status>-1";
@@ -85,12 +86,14 @@ namespace MySystem.Areas.Admin.Controllers
                 if (ActivateStatus == "0") dic["ActivateStatus"] = "未激活";
                 if (ActivateStatus == "1") dic["ActivateStatus"] = "激活";
                 //产品类型
-                string ProductType = dic["ProductType"].ToString();
-                if (ProductType == "KYSPOS") dic["ProductType"] = "快益刷";
-                if (ProductType == "KPOS") dic["ProductType"] = "快联盟大POS";
-                if (ProductType == "SIGNPOS") dic["ProductType"] = "快联盟电签POS";
-                if (ProductType == "SUPPOS") dic["ProductType"] = "超级Mpos";
-                if (ProductType == "") dic["ProductType"] = "";
+                dic["ProductType"] = RelationClass.GetKqProductBrandList(dic["ProductType"].ToString());
+                // //产品类型
+                // string ProductType = dic["ProductType"].ToString();
+                // if (ProductType == "KYSPOS") dic["ProductType"] = "快益刷";
+                // if (ProductType == "KPOS") dic["ProductType"] = "快联盟大POS";
+                // if (ProductType == "SIGNPOS") dic["ProductType"] = "快联盟电签POS";
+                // if (ProductType == "SUPPOS") dic["ProductType"] = "超级Mpos";
+                // if (ProductType == "") dic["ProductType"] = "";
 
             }
             return Json(obj);

Areas/Admin/Controllers/SpServer/BindRecordController.cs

@@ -87,7 +87,8 @@ namespace MySystem.Areas.Admin.Controllers
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
-
+                //产品类型
+                dic["ProductType"] = RelationClass.GetKqProductBrandList(dic["ProductType"].ToString());
             }
             return Json(obj);
         }

Areas/Admin/Controllers/SpServer/ChangeBindRecordController.cs

@@ -77,7 +77,8 @@ namespace MySystem.Areas.Admin.Controllers
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
-
+                //产品类型
+                dic["ProductType"] = RelationClass.GetKqProductBrandList(dic["ProductType"].ToString());
             }
             return Json(obj);
         }

Areas/Admin/Controllers/SpServer/TradeFluxRecordController.cs

@@ -88,12 +88,14 @@ namespace MySystem.Areas.Admin.Controllers
                 if (BankCardType == "0002") dic["BankCardType"] = "借记卡";
                 if (BankCardType == "") dic["BankCardType"] = "";
                 //产品类型
-                string ProductType = dic["ProductType"].ToString();
-                if (ProductType == "KYSPOS") dic["ProductType"] = "快益刷";
-                if (ProductType == "KPOS") dic["ProductType"] = "快联盟大POS";
-                if (ProductType == "SIGNPOS") dic["ProductType"] = "快联盟电签POS";
-                if (ProductType == "SUPPOS") dic["ProductType"] = "超级Mpos";
-                if (ProductType == "") dic["ProductType"] = "";
+                dic["ProductType"] = RelationClass.GetKqProductBrandList(dic["ProductType"].ToString());
+                // //产品类型
+                // string ProductType = dic["ProductType"].ToString();
+                // if (ProductType == "KYSPOS") dic["ProductType"] = "快益刷";
+                // if (ProductType == "KPOS") dic["ProductType"] = "快联盟大POS";
+                // if (ProductType == "SIGNPOS") dic["ProductType"] = "快联盟电签POS";
+                // if (ProductType == "SUPPOS") dic["ProductType"] = "超级Mpos";
+                // if (ProductType == "") dic["ProductType"] = "";
 
             }
             return Json(obj);

Areas/Admin/Controllers/SpServer/TradeRecordController.cs

@@ -88,12 +88,14 @@ namespace MySystem.Areas.Admin.Controllers
                 if (BankCardType == "0002") dic["BankCardType"] = "借记卡";
                 if (BankCardType == "") dic["BankCardType"] = "";
                 //产品类型
-                string ProductType = dic["ProductType"].ToString();
-                if (ProductType == "KYSPOS") dic["ProductType"] = "快益刷";
-                if (ProductType == "KPOS") dic["ProductType"] = "快联盟大POS";
-                if (ProductType == "SIGNPOS") dic["ProductType"] = "快联盟电签POS";
-                if (ProductType == "SUPPOS") dic["ProductType"] = "超级Mpos";
-                if (ProductType == "") dic["ProductType"] = "";
+                dic["ProductType"] = RelationClass.GetKqProductBrandList(dic["ProductType"].ToString());
+                // //产品类型
+                // string ProductType = dic["ProductType"].ToString();
+                // if (ProductType == "KYSPOS") dic["ProductType"] = "快益刷";
+                // if (ProductType == "KPOS") dic["ProductType"] = "快联盟大POS";
+                // if (ProductType == "SIGNPOS") dic["ProductType"] = "快联盟电签POS";
+                // if (ProductType == "SUPPOS") dic["ProductType"] = "超级Mpos";
+                // if (ProductType == "") dic["ProductType"] = "";
 
             }
             return Json(obj);

Areas/Admin/Controllers/SpServer/UnBindRecordController.cs

@@ -76,7 +76,8 @@ namespace MySystem.Areas.Admin.Controllers
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
-
+                //产品类型
+                dic["ProductType"] = RelationClass.GetKqProductBrandList(dic["ProductType"].ToString());
             }
             return Json(obj);
         }

Areas/Admin/Views/MainServer/PosMachinesFeeChangeRecord/Index.cshtml

@@ -94,11 +94,11 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">品牌</label>
                         <div class="layui-input-inline">
-                            <select id="Sort" name="Sort" lay-search="">
+                            <select id="SortSelect" name="SortSelect" lay-search="">
                                 <option value="">全部...</option>
                                 @foreach (string key in ProfitObjectsActivesDic.Keys)
                                 {
-                                    <option value="@key" @(key == "1" ? "selected=selected" : "")>@ProfitObjectsActivesDic[key]</option>
+                                    <option value="@key" @(key == "1" ? "selected" : "")>@ProfitObjectsActivesDic[key]</option>
                                 }
                             </select>
                         </div>
@@ -108,8 +108,8 @@
                         <div class="layui-input-inline">
                             <select id="StatusSelect" name="StatusSelect" lay-search="">
                                 <option value="">全部...</option>
-                                <option value="2">处理中</option>
                                 <option value="1">成功</option>
+                                <option value="2" selected="selected">处理中</option>
                                 <option value="3">失败</option>
                             </select>
                         </div>

Areas/Admin/Views/MainServer/PosMachinesTwoChange/Index.cshtml

@@ -79,8 +79,8 @@
                         <div class="layui-input-inline">
                             <select id="UpFeeFlagSelect" name="UpFeeFlagSelect" lay-search="">
                                 <option value="">全部...</option>
+                                <option value="0" selected="selected">未调升</option>
                                 <option value="1">已调升</option>
-                                <option value="0">未调升</option>
                             </select>
                         </div>
                     </div>
@@ -125,11 +125,11 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">品牌</label>
                         <div class="layui-input-inline">
-                            <select id="BrandId" name="BrandId" lay-search="">
+                            <select id="BrandSelect" name="BrandSelect" lay-search="">
                                 <option value="">全部...</option>
                                 @foreach (string key in ProfitObjectsActivesDic.Keys)
                                 {
-                                    <option value="@key" @(key == "1" ? "selected=selected" : "")>@ProfitObjectsActivesDic[key]</option>
+                                    <option value="@key" @(key == "1" ? "selected" : "")>@ProfitObjectsActivesDic[key]</option>
                                 }
                             </select>
                         </div>

Areas/Admin/Views/MainServer/StoreChangeHistory/Index.cshtml

@@ -97,6 +97,7 @@
                                 <option value="2">出货</option>
                                 <option value="3">退货</option>
                                 <option value="0">采购</option>
+                                <option value="4">驳回</option>
                             </select>
                         </div>
                     </div>

Areas/Admin/Views/MainServer/StoreHouseAmountRecord/Index.cshtml

@@ -76,13 +76,13 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">变动类别</label>
                         <div class="layui-input-inline">
-                            <select id="AmountTypeSelect" name="AmountTypeSelect" lay-search="">
+                            <select id="ChangeTypeSelect" name="ChangeTypeSelect" lay-search="">
                                 <option value="">全部...</option>
-                                <option value="0">购买临时额度</option>
-                                <option value="1">增减分仓临时额度</option>
-                                <option value="1">调低额度返回余额</option>
-                                <option value="1">仓库发货，预发机申请</option>
-                                <option value="1">后台仓库调拨</option>
+                                <option value="1">购买临时额度</option>
+                                <option value="2">增减分仓临时额度</option>
+                                <option value="3">调低额度返回余额</option>
+                                <option value="4">仓库发货，预发机申请</option>
+                                <option value="5">后台仓库调拨</option>
                             </select>
                         </div>
                     </div>

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

@@ -31,42 +31,60 @@
                         <div class="layui-tab-content mt20">
                             <div class="layui-tab-item layui-show">
                                 <div class="layui-form-item">
-                                    <label class="layui-form-label">原机具SN</label>
+                                    <label class="layui-form-label">换新类型</label>
+                                    <div class="layui-input-inline">
+                                        <select id="ChangeType" name="ChangeType" lay-search="" lay-filter="ChangeType">
+                                            <option value="0">创客换新</option>
+                                            <option value="1">分仓换新</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" id="MakerCodeSelect" style="display: none;">
+                                    <label class="layui-form-label">创客编号</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" type="text" id="MakerCode" name="MakerCode"
+                                            maxlength="50" lay-verify="required|" autocomplete="off"
+                                            placeholder="请输入创客编号">
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" id="StoreCodeSelect" style="display: none;">
+                                    <label class="layui-form-label">仓库编号</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" type="text" id="StoreCode" name="StoreCode"
+                                            maxlength="50" lay-verify="required|" autocomplete="off"
+                                            placeholder="请输入仓库编号">
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">坏机SN</label>
                                     <div class="layui-input-block">
                                         <textarea class="layui-textarea" lay-verify="required|" name="OldSn" id="OldSn"
-                                            placeholder="请输入原机具SN"></textarea>
+                                            placeholder="请输入坏机SN"></textarea>
                                     </div>
                                 </div>
                                 <div class="layui-form-item">
-                                    <label class="layui-form-label">新机具SN</label>
+                                    <label class="layui-form-label">新机SN</label>
                                     <div class="layui-input-block">
                                         <textarea class="layui-textarea" lay-verify="required|" name="NewSn" id="NewSn"
-                                            placeholder="请输入新机具SN"></textarea>
+                                            placeholder="请输入新机SN"></textarea>
                                     </div>
-                                @* </div>
+                                </div>
                                 <div class="layui-form-item">
-                                    <label class="layui-form-label">退回仓库编号</label>
+                                    <label class="layui-form-label">新机发货仓库编号</label>
                                     <div class="layui-input-inline">
-                                        <input class="layui-input" type="text" id="BackStoreNo" name="BackStoreNo"
+                                        <input class="layui-input" type="text" id="FromStoreNo" name="FromStoreNo"
                                             maxlength="50" lay-verify="required|" autocomplete="off"
-                                            placeholder="请输入退回仓库编号">
+                                            placeholder="请输入新机发货仓库编号">
                                     </div>
                                 </div>
                                 <div class="layui-form-item">
-                                    <label class="layui-form-label">出货仓库编号</label>
+                                    <label class="layui-form-label">坏机退回仓库编号</label>
                                     <div class="layui-input-inline">
-                                        <input class="layui-input" type="text" id="OutStoreNo" name="OutStoreNo"
+                                        <input class="layui-input" type="text" id="BackStoreNo" name="BackStoreNo"
                                             maxlength="50" lay-verify="required|" autocomplete="off"
-                                            placeholder="请输入出货仓库编号">
+                                            placeholder="请输入坏机退回仓库编号">
                                     </div>
                                 </div>
-                                <div class="layui-form-item">
-                                    <label class="layui-form-label">创客编号</label>
-                                    <div class="layui-input-inline">
-                                        <input class="layui-input" type="text" id="MakerCode" name="MakerCode" maxlength="50"
-                                            autocomplete="off" placeholder="请输入创客编号">
-                                    </div>
-                                </div> *@
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">是否推送消息</label>
                                     <div class="layui-input-block">
@@ -89,7 +107,8 @@
     </div>
 
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script
+        src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script src="/other/mybjq/kindeditor-min.js"></script>
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>
@@ -251,6 +270,17 @@
                 location.hash = 'test=' + $(this).attr('lay-id');
             });
 
+            form.on('select(ChangeType)', function (data) {
+                if(data.value == '0') {
+                    $('#MakerCodeSelect').show();
+                    $('#StoreCodeSelect').hide();
+                } else if(data.value == '1') {
+                    $('#MakerCodeSelect').hide();
+                    $('#StoreCodeSelect').show();
+                }
+                form.render();
+            });
+
             //日期
 
 

Areas/Admin/Views/SpServer/ActivateRecord/Index.cshtml

@@ -1,94 +1,115 @@
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-    
+
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>激活记录</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <style>
-        .layui-input-inline{
+        .layui-input-inline {
             width: 175px !important;
         }
-        .layui-form-label{
+
+        .layui-form-label {
             width: 85px !important;
         }
-        .layui-inline{
+
+        .layui-inline {
             margin-right: 0px !important;
         }
-        .w100{
+
+        .w100 {
             width: 100px !important;
         }
-        .ml50{
+
+        .ml50 {
             margin-left: 50px !important;
         }
     </style>
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-card">
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                 <div class="layui-form-item">
                     <div class="layui-inline">
-<label class="layui-form-label">商户编号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="MerNo" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">商户名称</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="MerName" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">商户手机号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="MerMobile" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">终端机身号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="SnNo" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">激活状态</label>
-<div class="layui-input-inline">
-<select id="ActivateStatusSelect" name="ActivateStatusSelect" lay-search="">
-<option value="">全部...</option>
-<option value="0">未激活</option>
-<option value="1">激活</option>
-</select>
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">产品类型</label>
-<div class="layui-input-inline">
-<select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
-<option value="">全部...</option>
-<option value="KYSPOS">快益刷</option>
-<option value="KPOS">快联盟大POS</option>
-<option value="SIGNPOS">快联盟电签POS</option>
-<option value="SUPPOS">超级Mpos</option>
-</select>
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">渠道流水号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="ChannelSerial" placeholder="" autocomplete="off">
-</div>
-</div>
+                        <label class="layui-form-label">商户编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MerNo" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">商户名称</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MerName" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    @* <div class="layui-inline">
+                        <label class="layui-form-label">商户手机号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MerMobile" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">终端机身号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="SnNo" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">激活状态</label>
+                        <div class="layui-input-inline">
+                            <select id="ActivateStatusSelect" name="ActivateStatusSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="0">未激活</option>
+                                <option value="1">激活</option>
+                            </select>
+                        </div>
+                    </div> *@
+                    @{Dictionary<string, string> ProfitObjectsActivesDic = new MySystem.DictionaryClass().getKqProductBrandDic();}
+                    <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                @foreach (string key in ProfitObjectsActivesDic.Keys)
+                                {
+                                <option value="@key">@ProfitObjectsActivesDic[key]</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
+                    @* <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="KYSPOS">快益刷</option>
+                                <option value="KPOS">快联盟大POS</option>
+                                <option value="SIGNPOS">快联盟电签POS</option>
+                                <option value="SUPPOS">超级Mpos</option>
+                            </select>
+                        </div>
+                    </div> *@
+                    <div class="layui-inline">
+                        <label class="layui-form-label">渠道流水号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="ChannelSerial" placeholder=""
+                                autocomplete="off">
+                        </div>
+                    </div>
 
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
@@ -105,32 +126,35 @@
                 <div style="padding-bottom: 10px;">
                     @if (RightInfo.Contains("," + right + "_add,"))
                     {
-                        <button class="layui-btn" data-type="add"><i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>添加</button>
+                        <button class="layui-btn" data-type="add"><i
+                            class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>添加</button>
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                        <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
+                        <button class="layui-btn" data-type="batchdel"><i
+                            class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
                     }
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    <button class="layui-btn" data-type="ExportExcel"><i class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
+                        <button class="layui-btn" data-type="ExportExcel"><i
+                            class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
 
                     }
                 </div>
-                
+
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="table-list-tools">
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
+                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
+                        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
                     }
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    
+
                     }
                 </script>
             </div>
@@ -164,7 +188,8 @@
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/modules_sp/ActivateRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
-        
+
     </script>
 </body>
+
 </html>

Areas/Admin/Views/SpServer/BindRecord/Index.cshtml

@@ -1,116 +1,138 @@
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-    
+
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>绑定记录</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <style>
-        .layui-input-inline{
+        .layui-input-inline {
             width: 175px !important;
         }
-        .layui-form-label{
+
+        .layui-form-label {
             width: 85px !important;
         }
-        .layui-inline{
+
+        .layui-inline {
             margin-right: 0px !important;
         }
-        .w100{
+
+        .w100 {
             width: 100px !important;
         }
-        .ml50{
+
+        .ml50 {
             margin-left: 50px !important;
         }
     </style>
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-card">
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                 <div class="layui-form-item">
+                    @* <div class="layui-inline">
+                        <label class="layui-form-label">机构名称</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="AgentName" placeholder="" autocomplete="off">
+                        </div>
+                    </div> *@
+                    <div class="layui-inline">
+                        <label class="layui-form-label">商户编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MerNo" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">商户名称</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MerName" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    @* <div class="layui-inline">
+                        <label class="layui-form-label">终端机身号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MerSnNo" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
                     <div class="layui-inline">
-<label class="layui-form-label">机构名称</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="AgentName" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">商户编号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="MerNo" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">商户名称</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="MerName" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">终端机身号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="MerSnNo" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">操作类型</label>
-<div class="layui-input-inline">
-<select id="MerOperateTypeSelect" name="MerOperateTypeSelect" lay-search="">
-<option value="">全部...</option>
-<option value="绑定">绑定</option>
-<option value="解绑">解绑</option>
-<option value="换绑">换绑</option>
-</select>
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">商户状态</label>
-<div class="layui-input-inline">
-<select id="MerStatusSelect" name="MerStatusSelect" lay-search="">
-<option value="">全部...</option>
-<option value="正常">正常</option>
-<option value="禁用">禁用</option>
-</select>
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">产品类型</label>
-<div class="layui-input-inline">
-<select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
-<option value="">全部...</option>
-<option value="MPOS">MPOS</option>
-<option value="传统POS">传统POS</option>
-<option value="电签POS">电签POS</option>
-</select>
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">新终端机身号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="MerNewSnNo" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">创建时间</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" readonly name="CreateTimeData" id="CreateTime" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">渠道流水号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="ChannelSerial" placeholder="" autocomplete="off">
-</div>
-</div>
+                        <label class="layui-form-label">操作类型</label>
+                        <div class="layui-input-inline">
+                            <select id="MerOperateTypeSelect" name="MerOperateTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="绑定">绑定</option>
+                                <option value="解绑">解绑</option>
+                                <option value="换绑">换绑</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">商户状态</label>
+                        <div class="layui-input-inline">
+                            <select id="MerStatusSelect" name="MerStatusSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="正常">正常</option>
+                                <option value="禁用">禁用</option>
+                            </select>
+                        </div>
+                    </div> *@
+                    @{Dictionary<string, string> ProfitObjectsActivesDic = new MySystem.DictionaryClass().getKqProductBrandDic();}
+                    <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                @foreach (string key in ProfitObjectsActivesDic.Keys)
+                                {
+                                <option value="@key">@ProfitObjectsActivesDic[key]</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
+                    @* <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="MPOS">MPOS</option>
+                                <option value="传统POS">传统POS</option>
+                                <option value="电签POS">电签POS</option>
+                            </select>
+                        </div>
+                    </div> *@
+                    @* <div class="layui-inline">
+                        <label class="layui-form-label">新终端机身号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MerNewSnNo" placeholder="" autocomplete="off">
+                        </div>
+                    </div> *@
+                    <div class="layui-inline">
+                        <label class="layui-form-label">创建时间</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" readonly name="CreateTimeData" id="CreateTime"
+                                placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">渠道流水号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="ChannelSerial" placeholder=""
+                                autocomplete="off">
+                        </div>
+                    </div>
 
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
@@ -127,32 +149,35 @@
                 <div style="padding-bottom: 10px;">
                     @if (RightInfo.Contains("," + right + "_add,"))
                     {
-                        <button class="layui-btn" data-type="add"><i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>添加</button>
+                        <button class="layui-btn" data-type="add"><i
+                            class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>添加</button>
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                        <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
+                        <button class="layui-btn" data-type="batchdel"><i
+                            class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
                     }
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    <button class="layui-btn" data-type="ExportExcel"><i class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
+                        <button class="layui-btn" data-type="ExportExcel"><i
+                            class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
 
                     }
                 </div>
-                
+
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="table-list-tools">
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
+                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
+                        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
                     }
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    
+
                     }
                 </script>
             </div>
@@ -186,7 +211,8 @@
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/modules_sp/BindRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
-        
+
     </script>
 </body>
+
 </html>

Areas/Admin/Views/SpServer/ChangeBindRecord/Index.cshtml

@@ -1,95 +1,117 @@
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-    
+
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>换绑记录</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <style>
-        .layui-input-inline{
+        .layui-input-inline {
             width: 175px !important;
         }
-        .layui-form-label{
+
+        .layui-form-label {
             width: 85px !important;
         }
-        .layui-inline{
+
+        .layui-inline {
             margin-right: 0px !important;
         }
-        .w100{
+
+        .w100 {
             width: 100px !important;
         }
-        .ml50{
+
+        .ml50 {
             margin-left: 50px !important;
         }
     </style>
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-card">
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                 <div class="layui-form-item">
                     <div class="layui-inline">
-<label class="layui-form-label">机构名称</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="AgentName" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">商户编号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="MerNo" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">商户名称</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="MerName" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">终端机身号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="MerSnNo" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">产品类型</label>
-<div class="layui-input-inline">
-<select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
-<option value="">全部...</option>
-<option value="MPOS">MPOS</option>
-<option value="传统POS">传统POS</option>
-<option value="电签POS">电签POS</option>
-</select>
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">新终端机身号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="MerNewSnNo" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">提交时间</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" readonly name="ConfirmTimeData" id="ConfirmTime" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">渠道流水号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="ChannelSerial" placeholder="" autocomplete="off">
-</div>
-</div>
+                        <label class="layui-form-label">机构名称</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="AgentName" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">商户编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MerNo" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">商户名称</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MerName" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">终端机身号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MerSnNo" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    @{Dictionary<string, string> ProfitObjectsActivesDic = new MySystem.DictionaryClass().getKqProductBrandDic();}
+                    <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                @foreach (string key in ProfitObjectsActivesDic.Keys)
+                                {
+                                <option value="@key">@ProfitObjectsActivesDic[key]</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
+                    @* <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="MPOS">MPOS</option>
+                                <option value="传统POS">传统POS</option>
+                                <option value="电签POS">电签POS</option>
+                            </select>
+                        </div>
+                    </div> *@
+                    <div class="layui-inline">
+                        <label class="layui-form-label">新终端机身号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MerNewSnNo" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">提交时间</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" readonly name="ConfirmTimeData" id="ConfirmTime"
+                                placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">渠道流水号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="ChannelSerial" placeholder=""
+                                autocomplete="off">
+                        </div>
+                    </div>
 
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
@@ -106,32 +128,35 @@
                 <div style="padding-bottom: 10px;">
                     @if (RightInfo.Contains("," + right + "_add,"))
                     {
-                        <button class="layui-btn" data-type="add"><i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>添加</button>
+                        <button class="layui-btn" data-type="add"><i
+                            class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>添加</button>
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                        <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
+                        <button class="layui-btn" data-type="batchdel"><i
+                            class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
                     }
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    <button class="layui-btn" data-type="ExportExcel"><i class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
+                        <button class="layui-btn" data-type="ExportExcel"><i
+                            class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
 
                     }
                 </div>
-                
+
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="table-list-tools">
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
+                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
+                        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
                     }
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    
+
                     }
                 </script>
             </div>
@@ -165,7 +190,8 @@
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/modules_sp/ChangeBindRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
-        
+
     </script>
 </body>
+
 </html>

Areas/Admin/Views/SpServer/SpTradeRecord/Index.cshtml

@@ -1,76 +1,97 @@
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-    
+
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>交易记录</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <style>
-        .layui-input-inline{
+        .layui-input-inline {
             width: 175px !important;
         }
-        .layui-form-label{
+
+        .layui-form-label {
             width: 85px !important;
         }
-        .layui-inline{
+
+        .layui-inline {
             margin-right: 0px !important;
         }
-        .w100{
+
+        .w100 {
             width: 100px !important;
         }
-        .ml50{
+
+        .ml50 {
             margin-left: 50px !important;
         }
     </style>
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-card">
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                 <div class="layui-form-item">
                     <div class="layui-inline">
-<label class="layui-form-label">商户编号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="MerNo" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">交易状态</label>
-<div class="layui-input-inline">
-<select id="TradeStatusSelect" name="TradeStatusSelect" lay-search="">
-<option value="">全部...</option>
-<option value="1">成功</option>
-<option value="2">失败</option>
-</select>
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">产品类型</label>
-<div class="layui-input-inline">
-<select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
-<option value="">全部...</option>
-<option value="KYSPOS">快益刷</option>
-<option value="KPOS">快联盟大POS</option>
-<option value="SIGNPOS">快联盟电签POS</option>
-<option value="SUPPOS">超级Mpos</option>
-</select>
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">渠道流水号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="ChannelSerial" placeholder="" autocomplete="off">
-</div>
-</div>
+                        <label class="layui-form-label">商户编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MerNo" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">交易状态</label>
+                        <div class="layui-input-inline">
+                            <select id="TradeStatusSelect" name="TradeStatusSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="1">成功</option>
+                                <option value="2">失败</option>
+                            </select>
+                        </div>
+                    </div>
+                    @{Dictionary<string, string> ProfitObjectsActivesDic = new MySystem.DictionaryClass().getKqProductBrandDic();}
+                    <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                @foreach (string key in ProfitObjectsActivesDic.Keys)
+                                {
+                                <option value="@key">@ProfitObjectsActivesDic[key]</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
+                    @* <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="KYSPOS">快益刷</option>
+                                <option value="KPOS">快联盟大POS</option>
+                                <option value="SIGNPOS">快联盟电签POS</option>
+                                <option value="SUPPOS">超级Mpos</option>
+                            </select>
+                        </div>
+                    </div> *@
+                    @* <div class="layui-inline">
+                        <label class="layui-form-label">渠道流水号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="ChannelSerial" placeholder=""
+                                autocomplete="off">
+                        </div>
+                    </div> *@
 
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
@@ -87,32 +108,35 @@
                 <div style="padding-bottom: 10px;">
                     @if (RightInfo.Contains("," + right + "_add,"))
                     {
-                        <button class="layui-btn" data-type="add"><i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>添加</button>
+                        <button class="layui-btn" data-type="add"><i
+                            class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>添加</button>
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                        <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
+                        <button class="layui-btn" data-type="batchdel"><i
+                            class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
                     }
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    <button class="layui-btn" data-type="ExportExcel"><i class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
+                        <button class="layui-btn" data-type="ExportExcel"><i
+                            class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
 
                     }
                 </div>
-                
+
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="table-list-tools">
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
+                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
+                        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
                     }
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    
+
                     }
                 </script>
             </div>
@@ -146,7 +170,8 @@
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/modules_sp/TradeRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
-        
+
     </script>
 </body>
+
 </html>

Areas/Admin/Views/SpServer/TradeFluxRecord/Index.cshtml

@@ -1,76 +1,96 @@
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-    
+
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>流量卡分佣交易</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <style>
-        .layui-input-inline{
+        .layui-input-inline {
             width: 175px !important;
         }
-        .layui-form-label{
+
+        .layui-form-label {
             width: 85px !important;
         }
-        .layui-inline{
+
+        .layui-inline {
             margin-right: 0px !important;
         }
-        .w100{
+
+        .w100 {
             width: 100px !important;
         }
-        .ml50{
+
+        .ml50 {
             margin-left: 50px !important;
         }
     </style>
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-card">
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                 <div class="layui-form-item">
                     <div class="layui-inline">
-<label class="layui-form-label">商户编号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="MerNo" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">交易状态</label>
-<div class="layui-input-inline">
-<select id="TradeStatusSelect" name="TradeStatusSelect" lay-search="">
-<option value="">全部...</option>
-<option value="1">成功</option>
-<option value="2">失败</option>
-</select>
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">快钱交易流水号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="KqTradeSeq" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">产品类型</label>
-<div class="layui-input-inline">
-<select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
-<option value="">全部...</option>
-<option value="KYSPOS">快益刷</option>
-<option value="KPOS">快联盟大POS</option>
-<option value="SIGNPOS">快联盟电签POS</option>
-<option value="SUPPOS">超级Mpos</option>
-</select>
-</div>
-</div>
+                        <label class="layui-form-label">商户编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MerNo" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">交易状态</label>
+                        <div class="layui-input-inline">
+                            <select id="TradeStatusSelect" name="TradeStatusSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="1">成功</option>
+                                <option value="2">失败</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">快钱交易流水号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="KqTradeSeq" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    @{Dictionary<string, string> ProfitObjectsActivesDic = new MySystem.DictionaryClass().getKqProductBrandDic();}
+                    <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                @foreach (string key in ProfitObjectsActivesDic.Keys)
+                                {
+                                <option value="@key">@ProfitObjectsActivesDic[key]</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
+                    @* <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="KYSPOS">快益刷</option>
+                                <option value="KPOS">快联盟大POS</option>
+                                <option value="SIGNPOS">快联盟电签POS</option>
+                                <option value="SUPPOS">超级Mpos</option>
+                            </select>
+                        </div>
+                    </div> *@
 
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
@@ -87,32 +107,35 @@
                 <div style="padding-bottom: 10px;">
                     @if (RightInfo.Contains("," + right + "_add,"))
                     {
-                        <button class="layui-btn" data-type="add"><i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>添加</button>
+                        <button class="layui-btn" data-type="add"><i
+                            class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>添加</button>
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                        <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
+                        <button class="layui-btn" data-type="batchdel"><i
+                            class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
                     }
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    <button class="layui-btn" data-type="ExportExcel"><i class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
+                        <button class="layui-btn" data-type="ExportExcel"><i
+                            class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
 
                     }
                 </div>
-                
+
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="table-list-tools">
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
+                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
+                        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
                     }
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    
+
                     }
                 </script>
             </div>
@@ -146,7 +169,8 @@
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/modules_sp/TradeFluxRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
-        
+
     </script>
 </body>
+
 </html>

Areas/Admin/Views/SpServer/UnBindRecord/Index.cshtml

@@ -1,89 +1,111 @@
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-    
+
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>解绑记录</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <style>
-        .layui-input-inline{
+        .layui-input-inline {
             width: 175px !important;
         }
-        .layui-form-label{
+
+        .layui-form-label {
             width: 85px !important;
         }
-        .layui-inline{
+
+        .layui-inline {
             margin-right: 0px !important;
         }
-        .w100{
+
+        .w100 {
             width: 100px !important;
         }
-        .ml50{
+
+        .ml50 {
             margin-left: 50px !important;
         }
     </style>
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-card">
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                 <div class="layui-form-item">
                     <div class="layui-inline">
-<label class="layui-form-label">机构名称</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="AgentName" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">商户编号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="MerNo" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">商户名称</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="MerName" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">终端机身号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="MerSnNo" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">产品类型</label>
-<div class="layui-input-inline">
-<select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
-<option value="">全部...</option>
-<option value="MPOS">MPOS</option>
-<option value="传统POS">传统POS</option>
-<option value="电签POS">电签POS</option>
-</select>
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">解绑时间</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" readonly name="UnBindTimeData" id="UnBindTime" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">渠道流水号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="ChannelSerial" placeholder="" autocomplete="off">
-</div>
-</div>
+                        <label class="layui-form-label">机构名称</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="AgentName" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">商户编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MerNo" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">商户名称</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MerName" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">终端机身号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MerSnNo" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    @{Dictionary<string, string> ProfitObjectsActivesDic = new MySystem.DictionaryClass().getKqProductBrandDic();}
+                    <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                @foreach (string key in ProfitObjectsActivesDic.Keys)
+                                {
+                                <option value="@key">@ProfitObjectsActivesDic[key]</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
+                    @* <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="MPOS">MPOS</option>
+                                <option value="传统POS">传统POS</option>
+                                <option value="电签POS">电签POS</option>
+                            </select>
+                        </div>
+                    </div> *@
+                    <div class="layui-inline">
+                        <label class="layui-form-label">解绑时间</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" readonly name="UnBindTimeData" id="UnBindTime"
+                                placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    @* <div class="layui-inline">
+                        <label class="layui-form-label">渠道流水号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="ChannelSerial" placeholder=""
+                                autocomplete="off">
+                        </div>
+                    </div> *@
 
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
@@ -100,32 +122,35 @@
                 <div style="padding-bottom: 10px;">
                     @if (RightInfo.Contains("," + right + "_add,"))
                     {
-                        <button class="layui-btn" data-type="add"><i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>添加</button>
+                        <button class="layui-btn" data-type="add"><i
+                            class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>添加</button>
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                        <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
+                        <button class="layui-btn" data-type="batchdel"><i
+                            class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
                     }
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    <button class="layui-btn" data-type="ExportExcel"><i class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
+                        <button class="layui-btn" data-type="ExportExcel"><i
+                            class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
 
                     }
                 </div>
-                
+
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="table-list-tools">
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
+                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
+                        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
                     }
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    
+
                     }
                 </script>
             </div>
@@ -159,7 +184,8 @@
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/modules_sp/UnBindRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
-        
+
     </script>
 </body>
+
 </html>

wwwroot/layuiadmin/modules_sp/ActivateRecord_Admin.js

@@ -1,4 +1,4 @@
-var ExcelData,ExcelKind;
+var ExcelData, ExcelKind;
 function ConfirmImport() {
     $.ajax({
         type: "POST",
@@ -30,23 +30,23 @@ layui.config({
 
     //- 筛选条件-日期
     var laydate = layui.laydate;
-    
+
 
     //excel导入
-    excel = layui.excel;        
+    excel = layui.excel;
     $('#ExcelFile').change(function (e) {
         var files = e.target.files;
-        excel.importExcel(files, { }, function (data) {
+        excel.importExcel(files, {}, function (data) {
             ExcelData = data[0].sheet1;
         });
     });
 
     //监听单元格编辑
-    table.on('edit(LAY-list-manage)', function(obj){
+    table.on('edit(LAY-list-manage)', function (obj) {
         var value = obj.value //得到修改后的值
-        ,data = obj.data //得到所在行所有键值
-        ,field = obj.field; //得到字段
-        if(field == "Sort"){
+            , data = obj.data //得到所在行所有键值
+            , field = obj.field; //得到字段
+        if (field == "Sort") {
             $.ajax({
                 type: "POST",
                 url: "/Admin/ActivateRecord/Sort?r=" + Math.random(1),
@@ -57,35 +57,35 @@ layui.config({
             });
         }
     });
-    
+
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
         , url: '/Admin/ActivateRecord/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-    		, {field:'Id', fixed: 'left', title:'ID', width:80, sort: true, unresize: true}
-            ,{field:'MerNo', width: 200, title:'商户编号', sort: true}
-,{field:'MerName', width: 200, title:'商户名称', sort: true}
-,{field:'MerMobile', width: 200, title:'商户手机号', sort: true}
-,{field:'SnNo', width: 200, title:'终端机身号', sort: true}
-,{field:'MerRegDate', width: 200, title:'注册日期', sort: true}
-,{field:'AssessMonth', width: 200, title:'考核月', sort: true}
-,{field:'AssessMonthCount', width: 200, title:'考核第几月', sort: true}
-,{field:'ActivateStatus', width: 200, title:'激活状态', sort: true}
-,{field:'ActivateDate', width: 200, title:'激活日期', sort: true}
-,{field:'MerRealName', width: 200, title:'商户真实姓名', sort: true}
-,{field:'MerIdcardNo', width: 200, title:'商户身份证号', sort: true}
-,{field:'Remark', width: 200, title:'备注', sort: true}
-,{field:'AgentNo', width: 200, title:'代理商编号', sort: true}
-,{field:'ProductType', width: 200, title:'产品类型', sort: true}
-,{field:'ChannelSerial', width: 200, title:'渠道流水号', sort: true}
-
-            , {field:'Sort', fixed: 'right', title:'排序', width:80, edit: 'text'}
+            , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            , { field: 'MerNo', width: 200, title: '商户编号', sort: true }
+            , { field: 'MerName', width: 200, title: '商户名称', sort: true }
+            // , { field: 'MerMobile', width: 200, title: '商户手机号', sort: true }
+            // , { field: 'SnNo', width: 200, title: '终端机身号', sort: true }
+            // , { field: 'MerRegDate', width: 200, title: '注册日期', sort: true }
+            // , { field: 'AssessMonth', width: 200, title: '考核月', sort: true }
+            // , { field: 'AssessMonthCount', width: 200, title: '考核第几月', sort: true }
+            // , { field: 'ActivateStatus', width: 200, title: '激活状态', sort: true }
+            , { field: 'ActivateDate', width: 200, title: '激活日期', sort: true }
+            // , { field: 'MerRealName', width: 200, title: '商户真实姓名', sort: true }
+            // , { field: 'MerIdcardNo', width: 200, title: '商户身份证号', sort: true }
+            // , { field: 'Remark', width: 200, title: '备注', sort: true }
+            // , { field: 'AgentNo', width: 200, title: '代理商编号', sort: true }
+            , { field: 'ProductType', width: 200, title: '产品类型', sort: true }
+            , { field: 'ChannelSerial', width: 200, title: '渠道流水号', sort: true }
+
+            // , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
             , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {
-            
+
         }
         , page: true
         , limit: 30
@@ -107,7 +107,7 @@ layui.config({
                     data: "Id=" + data.Id,
                     dataType: "text",
                     success: function (data) {
-                        if (data == "success") {                            
+                        if (data == "success") {
                             obj.del();
                             layer.close(index);
                         } else {
@@ -130,20 +130,20 @@ layui.config({
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -154,7 +154,7 @@ layui.config({
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/ActivateRecord/Edit?r=" + Math.random(1),
@@ -247,20 +247,20 @@ layui.config({
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -271,7 +271,7 @@ layui.config({
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/ActivateRecord/Add?r=" + Math.random(1),
@@ -328,9 +328,9 @@ layui.config({
         , Open: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要开启的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";
@@ -357,9 +357,9 @@ layui.config({
         , Close: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要关闭的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";

wwwroot/layuiadmin/modules_sp/BindRecord_Admin.js

@@ -1,4 +1,4 @@
-var ExcelData,ExcelKind;
+var ExcelData, ExcelKind;
 function ConfirmImport() {
     $.ajax({
         type: "POST",
@@ -31,49 +31,49 @@ layui.config({
     //- 筛选条件-日期
     var laydate = layui.laydate;
     var layCreateTime = laydate.render({
-elem: '#CreateTime',
-trigger: 'click',
-type: 'datetime',
-range: true,
-change: function (value, date, endDate) {
-var op = true;
-if (date.year == endDate.year && endDate.month - date.month <= 1) {
-if (endDate.month - date.month == 1 && endDate.date > date.date) {
-op = false;
-layCreateTime.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-} else {
-op = false;
-layCreateTime.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-if (op) {
-$('#CreateTime').val(value);
-}
-}
-});
+        elem: '#CreateTime',
+        trigger: 'click',
+        type: 'datetime',
+        range: true,
+        change: function (value, date, endDate) {
+            var op = true;
+            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+                    op = false;
+                    layCreateTime.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layCreateTime.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#CreateTime').val(value);
+            }
+        }
+    });
 
 
     //excel导入
-    excel = layui.excel;        
+    excel = layui.excel;
     $('#ExcelFile').change(function (e) {
         var files = e.target.files;
-        excel.importExcel(files, { }, function (data) {
+        excel.importExcel(files, {}, function (data) {
             ExcelData = data[0].sheet1;
         });
     });
 
     //监听单元格编辑
-    table.on('edit(LAY-list-manage)', function(obj){
+    table.on('edit(LAY-list-manage)', function (obj) {
         var value = obj.value //得到修改后的值
-        ,data = obj.data //得到所在行所有键值
-        ,field = obj.field; //得到字段
-        if(field == "Sort"){
+            , data = obj.data //得到所在行所有键值
+            , field = obj.field; //得到字段
+        if (field == "Sort") {
             $.ajax({
                 type: "POST",
                 url: "/Admin/BindRecord/Sort?r=" + Math.random(1),
@@ -84,32 +84,32 @@ $('#CreateTime').val(value);
             });
         }
     });
-    
+
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
         , url: '/Admin/BindRecord/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-    		, {field:'Id', fixed: 'left', title:'ID', width:80, sort: true, unresize: true}
-            ,{field:'AgentName', width: 200, title:'机构名称', sort: true}
-,{field:'MerNo', width: 200, title:'商户编号', sort: true}
-,{field:'MerName', width: 200, title:'商户名称', sort: true}
-,{field:'MerSnNo', width: 200, title:'终端机身号', sort: true}
-,{field:'MerOperateDate', width: 200, title:'操作时间', sort: true}
-,{field:'MerOperateType', width: 200, title:'操作类型', sort: true}
-,{field:'MerStatus', width: 200, title:'商户状态', sort: true}
-,{field:'ProductType', width: 200, title:'产品类型', sort: true}
-,{field:'MerNewSnNo', width: 200, title:'新终端机身号', sort: true}
-,{field:'CreateTime', width: 200, title:'创建时间', sort: true}
-,{field:'UpdateTime', width: 200, title:'更新时间', sort: true}
-,{field:'ChannelSerial', width: 200, title:'渠道流水号', sort: true}
-
-            , {field:'Sort', fixed: 'right', title:'排序', width:80, edit: 'text'}
+            , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            // , { field: 'AgentName', width: 200, title: '机构名称', sort: true }
+            , { field: 'MerNo', width: 200, title: '商户编号', sort: true }
+            , { field: 'MerName', width: 200, title: '商户名称', sort: true }
+            // , { field: 'MerSnNo', width: 200, title: '终端机身号', sort: true }
+            , { field: 'MerOperateDate', width: 200, title: '操作时间', sort: true }
+            // , { field: 'MerOperateType', width: 200, title: '操作类型', sort: true }
+            // , { field: 'MerStatus', width: 200, title: '商户状态', sort: true }
+            , { field: 'ProductType', width: 200, title: '产品类型', sort: true }
+            // , { field: 'MerNewSnNo', width: 200, title: '新终端机身号', sort: true }
+            , { field: 'CreateTime', width: 200, title: '创建时间', sort: true }
+            , { field: 'UpdateTime', width: 200, title: '更新时间', sort: true }
+            , { field: 'ChannelSerial', width: 200, title: '渠道流水号', sort: true }
+
+            // , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
             , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {
-            
+
         }
         , page: true
         , limit: 30
@@ -131,7 +131,7 @@ $('#CreateTime').val(value);
                     data: "Id=" + data.Id,
                     dataType: "text",
                     success: function (data) {
-                        if (data == "success") {                            
+                        if (data == "success") {
                             obj.del();
                             layer.close(index);
                         } else {
@@ -154,20 +154,20 @@ $('#CreateTime').val(value);
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -178,7 +178,7 @@ $('#CreateTime').val(value);
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/BindRecord/Edit?r=" + Math.random(1),
@@ -271,20 +271,20 @@ $('#CreateTime').val(value);
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -295,7 +295,7 @@ $('#CreateTime').val(value);
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/BindRecord/Add?r=" + Math.random(1),
@@ -352,9 +352,9 @@ $('#CreateTime').val(value);
         , Open: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要开启的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";
@@ -381,9 +381,9 @@ $('#CreateTime').val(value);
         , Close: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要关闭的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";

wwwroot/layuiadmin/modules_sp/ChangeBindRecord_Admin.js

@@ -1,4 +1,4 @@
-var ExcelData,ExcelKind;
+var ExcelData, ExcelKind;
 function ConfirmImport() {
     $.ajax({
         type: "POST",
@@ -31,49 +31,49 @@ layui.config({
     //- 筛选条件-日期
     var laydate = layui.laydate;
     var layConfirmTime = laydate.render({
-elem: '#ConfirmTime',
-trigger: 'click',
-type: 'datetime',
-range: true,
-change: function (value, date, endDate) {
-var op = true;
-if (date.year == endDate.year && endDate.month - date.month <= 1) {
-if (endDate.month - date.month == 1 && endDate.date > date.date) {
-op = false;
-layConfirmTime.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-} else {
-op = false;
-layConfirmTime.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-if (op) {
-$('#ConfirmTime').val(value);
-}
-}
-});
+        elem: '#ConfirmTime',
+        trigger: 'click',
+        type: 'datetime',
+        range: true,
+        change: function (value, date, endDate) {
+            var op = true;
+            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+                    op = false;
+                    layConfirmTime.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layConfirmTime.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#ConfirmTime').val(value);
+            }
+        }
+    });
 
 
     //excel导入
-    excel = layui.excel;        
+    excel = layui.excel;
     $('#ExcelFile').change(function (e) {
         var files = e.target.files;
-        excel.importExcel(files, { }, function (data) {
+        excel.importExcel(files, {}, function (data) {
             ExcelData = data[0].sheet1;
         });
     });
 
     //监听单元格编辑
-    table.on('edit(LAY-list-manage)', function(obj){
+    table.on('edit(LAY-list-manage)', function (obj) {
         var value = obj.value //得到修改后的值
-        ,data = obj.data //得到所在行所有键值
-        ,field = obj.field; //得到字段
-        if(field == "Sort"){
+            , data = obj.data //得到所在行所有键值
+            , field = obj.field; //得到字段
+        if (field == "Sort") {
             $.ajax({
                 type: "POST",
                 url: "/Admin/ChangeBindRecord/Sort?r=" + Math.random(1),
@@ -84,30 +84,30 @@ $('#ConfirmTime').val(value);
             });
         }
     });
-    
+
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
         , url: '/Admin/ChangeBindRecord/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-    		, {field:'Id', fixed: 'left', title:'ID', width:80, sort: true, unresize: true}
-            ,{field:'AgentName', width: 200, title:'机构名称', sort: true}
-,{field:'MerNo', width: 200, title:'商户编号', sort: true}
-,{field:'MerName', width: 200, title:'商户名称', sort: true}
-,{field:'MerSnNo', width: 200, title:'终端机身号', sort: true}
-,{field:'ProductType', width: 200, title:'产品类型', sort: true}
-,{field:'MerNewSnNo', width: 200, title:'新终端机身号', sort: true}
-,{field:'ConfirmTime', width: 200, title:'提交时间', sort: true}
-,{field:'ReBindTime', width: 200, title:'重新绑定时间', sort: true}
-,{field:'ChannelSerial', width: 200, title:'渠道流水号', sort: true}
-,{field:'AgentNo', width: 200, title:'机构号', sort: true}
-
-            , {field:'Sort', fixed: 'right', title:'排序', width:80, edit: 'text'}
+            , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            // , { field: 'AgentName', width: 200, title: '机构名称', sort: true }
+            , { field: 'MerNo', width: 200, title: '商户编号', sort: true }
+            , { field: 'MerName', width: 200, title: '商户名称', sort: true }
+            // , { field: 'MerSnNo', width: 200, title: '终端机身号', sort: true }
+            , { field: 'ProductType', width: 200, title: '产品类型', sort: true }
+            // , { field: 'MerNewSnNo', width: 200, title: '新终端机身号', sort: true }
+            , { field: 'ConfirmTime', width: 200, title: '提交时间', sort: true }
+            , { field: 'ReBindTime', width: 200, title: '重新绑定时间', sort: true }
+            , { field: 'ChannelSerial', width: 200, title: '渠道流水号', sort: true }
+            // , { field: 'AgentNo', width: 200, title: '机构号', sort: true }
+
+            // , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
             , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {
-            
+
         }
         , page: true
         , limit: 30
@@ -129,7 +129,7 @@ $('#ConfirmTime').val(value);
                     data: "Id=" + data.Id,
                     dataType: "text",
                     success: function (data) {
-                        if (data == "success") {                            
+                        if (data == "success") {
                             obj.del();
                             layer.close(index);
                         } else {
@@ -152,20 +152,20 @@ $('#ConfirmTime').val(value);
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -176,7 +176,7 @@ $('#ConfirmTime').val(value);
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/ChangeBindRecord/Edit?r=" + Math.random(1),
@@ -269,20 +269,20 @@ $('#ConfirmTime').val(value);
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -293,7 +293,7 @@ $('#ConfirmTime').val(value);
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/ChangeBindRecord/Add?r=" + Math.random(1),
@@ -350,9 +350,9 @@ $('#ConfirmTime').val(value);
         , Open: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要开启的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";
@@ -379,9 +379,9 @@ $('#ConfirmTime').val(value);
         , Close: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要关闭的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";

wwwroot/layuiadmin/modules_sp/TradeFluxRecord_Admin.js

@@ -1,4 +1,4 @@
-var ExcelData,ExcelKind;
+var ExcelData, ExcelKind;
 function ConfirmImport() {
     $.ajax({
         type: "POST",
@@ -30,23 +30,23 @@ layui.config({
 
     //- 筛选条件-日期
     var laydate = layui.laydate;
-    
+
 
     //excel导入
-    excel = layui.excel;        
+    excel = layui.excel;
     $('#ExcelFile').change(function (e) {
         var files = e.target.files;
-        excel.importExcel(files, { }, function (data) {
+        excel.importExcel(files, {}, function (data) {
             ExcelData = data[0].sheet1;
         });
     });
 
     //监听单元格编辑
-    table.on('edit(LAY-list-manage)', function(obj){
+    table.on('edit(LAY-list-manage)', function (obj) {
         var value = obj.value //得到修改后的值
-        ,data = obj.data //得到所在行所有键值
-        ,field = obj.field; //得到字段
-        if(field == "Sort"){
+            , data = obj.data //得到所在行所有键值
+            , field = obj.field; //得到字段
+        if (field == "Sort") {
             $.ajax({
                 type: "POST",
                 url: "/Admin/TradeFluxRecord/Sort?r=" + Math.random(1),
@@ -57,33 +57,33 @@ layui.config({
             });
         }
     });
-    
+
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
         , url: '/Admin/TradeFluxRecord/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-    		, {field:'Id', fixed: 'left', title:'ID', width:80, sort: true, unresize: true}
-            ,{field:'TradeSerialNo', width: 200, title:'交易单号', sort: true}
-,{field:'MerNo', width: 200, title:'商户编号', sort: true}
-,{field:'TradeAmount', width: 200, title:'交易金额', sort: true}
-,{field:'TradeStatus', width: 200, title:'交易状态', sort: true}
-,{field:'TradeDate', width: 200, title:'交易日期', sort: true}
-,{field:'TradeTime', width: 200, title:'交易时间', sort: true}
-,{field:'BankCardType', width: 200, title:'银行卡类型', sort: true}
-,{field:'DigAmt', width: 200, title:'挖款金额', sort: true}
-,{field:'BankCardNo', width: 200, title:'交易卡号', sort: true}
-,{field:'FeeAmount', width: 200, title:'手续费', sort: true}
-,{field:'KqTradeSeq', width: 200, title:'快钱交易流水号', sort: true}
-,{field:'ProductType', width: 200, title:'产品类型', sort: true}
-,{field:'AgentNo', width: 200, title:'代理商编号', sort: true}
-
-            , {field:'Sort', fixed: 'right', title:'排序', width:80, edit: 'text'}
+            , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            , { field: 'TradeSerialNo', width: 200, title: '交易单号', sort: true }
+            // , { field: 'MerNo', width: 200, title: '商户编号', sort: true }
+            // , { field: 'TradeAmount', width: 200, title: '交易金额', sort: true }
+            // , { field: 'TradeStatus', width: 200, title: '交易状态', sort: true }
+            // , { field: 'TradeDate', width: 200, title: '交易日期', sort: true }
+            // , { field: 'TradeTime', width: 200, title: '交易时间', sort: true }
+            // , { field: 'BankCardType', width: 200, title: '银行卡类型', sort: true }
+            // , { field: 'DigAmt', width: 200, title: '挖款金额', sort: true }
+            // , { field: 'BankCardNo', width: 200, title: '交易卡号', sort: true }
+            , { field: 'FeeAmount', width: 200, title: '手续费', sort: true }
+            // , { field: 'KqTradeSeq', width: 200, title: '快钱交易流水号', sort: true }
+            , { field: 'ProductType', width: 200, title: '产品类型', sort: true }
+            // , { field: 'AgentNo', width: 200, title: '代理商编号', sort: true }
+
+            // , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
             , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {
-            
+
         }
         , page: true
         , limit: 30
@@ -105,7 +105,7 @@ layui.config({
                     data: "Id=" + data.Id,
                     dataType: "text",
                     success: function (data) {
-                        if (data == "success") {                            
+                        if (data == "success") {
                             obj.del();
                             layer.close(index);
                         } else {
@@ -128,20 +128,20 @@ layui.config({
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -152,7 +152,7 @@ layui.config({
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/TradeFluxRecord/Edit?r=" + Math.random(1),
@@ -245,20 +245,20 @@ layui.config({
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -269,7 +269,7 @@ layui.config({
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/TradeFluxRecord/Add?r=" + Math.random(1),
@@ -326,9 +326,9 @@ layui.config({
         , Open: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要开启的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";
@@ -355,9 +355,9 @@ layui.config({
         , Close: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要关闭的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";

wwwroot/layuiadmin/modules_sp/TradeRecord_Admin.js

@@ -1,4 +1,4 @@
-var ExcelData,ExcelKind;
+var ExcelData, ExcelKind;
 function ConfirmImport() {
     $.ajax({
         type: "POST",
@@ -30,23 +30,23 @@ layui.config({
 
     //- 筛选条件-日期
     var laydate = layui.laydate;
-    
+
 
     //excel导入
-    excel = layui.excel;        
+    excel = layui.excel;
     $('#ExcelFile').change(function (e) {
         var files = e.target.files;
-        excel.importExcel(files, { }, function (data) {
+        excel.importExcel(files, {}, function (data) {
             ExcelData = data[0].sheet1;
         });
     });
 
     //监听单元格编辑
-    table.on('edit(LAY-list-manage)', function(obj){
+    table.on('edit(LAY-list-manage)', function (obj) {
         var value = obj.value //得到修改后的值
-        ,data = obj.data //得到所在行所有键值
-        ,field = obj.field; //得到字段
-        if(field == "Sort"){
+            , data = obj.data //得到所在行所有键值
+            , field = obj.field; //得到字段
+        if (field == "Sort") {
             $.ajax({
                 type: "POST",
                 url: "/Admin/TradeRecord/Sort?r=" + Math.random(1),
@@ -57,33 +57,33 @@ layui.config({
             });
         }
     });
-    
+
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
         , url: '/Admin/TradeRecord/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-    		, {field:'Id', fixed: 'left', title:'ID', width:80, sort: true, unresize: true}
-            ,{field:'TradeSerialNo', width: 200, title:'交易单号', sort: true}
-,{field:'MerNo', width: 200, title:'商户编号', sort: true}
-,{field:'TradeAmount', width: 200, title:'交易金额', sort: true}
-,{field:'TradeStatus', width: 200, title:'交易状态', sort: true}
-,{field:'TradeDate', width: 200, title:'交易日期', sort: true}
-,{field:'TradeTime', width: 200, title:'交易时间', sort: true}
-,{field:'BankCardType', width: 200, title:'银行卡类型', sort: true}
-,{field:'BankCardNo', width: 200, title:'交易卡号', sort: true}
-,{field:'SettleFee', width: 200, title:'出款手续费', sort: true}
-,{field:'Remark', width: 200, title:'备注', sort: true}
-,{field:'ProductType', width: 200, title:'产品类型', sort: true}
-,{field:'AgentNo', width: 200, title:'代理商编号', sort: true}
-,{field:'ChannelSerial', width: 200, title:'渠道流水号', sort: true}
-
-            , {field:'Sort', fixed: 'right', title:'排序', width:80, edit: 'text'}
+            , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            , { field: 'TradeSerialNo', width: 200, title: '交易单号', sort: true }
+            , { field: 'MerNo', width: 200, title: '商户编号', sort: true }
+            , { field: 'TradeAmount', width: 200, title: '交易金额', sort: true }
+            // , { field: 'TradeStatus', width: 200, title: '交易状态', sort: true }
+            // , { field: 'TradeDate', width: 200, title: '交易日期', sort: true }
+            // , { field: 'TradeTime', width: 200, title: '交易时间', sort: true }
+            , { field: 'BankCardType', width: 200, title: '银行卡类型', sort: true }
+            // , { field: 'BankCardNo', width: 200, title: '交易卡号', sort: true }
+            // , { field: 'SettleFee', width: 200, title: '出款手续费', sort: true }
+            // , { field: 'Remark', width: 200, title: '备注', sort: true }
+            // , { field: 'ProductType', width: 200, title: '产品类型', sort: true }
+            // , { field: 'AgentNo', width: 200, title: '代理商编号', sort: true }
+            // , { field: 'ChannelSerial', width: 200, title: '渠道流水号', sort: true }
+
+            // , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
             , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {
-            
+
         }
         , page: true
         , limit: 30
@@ -105,7 +105,7 @@ layui.config({
                     data: "Id=" + data.Id,
                     dataType: "text",
                     success: function (data) {
-                        if (data == "success") {                            
+                        if (data == "success") {
                             obj.del();
                             layer.close(index);
                         } else {
@@ -128,20 +128,20 @@ layui.config({
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -152,7 +152,7 @@ layui.config({
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/TradeRecord/Edit?r=" + Math.random(1),
@@ -245,20 +245,20 @@ layui.config({
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -269,7 +269,7 @@ layui.config({
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/TradeRecord/Add?r=" + Math.random(1),
@@ -326,9 +326,9 @@ layui.config({
         , Open: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要开启的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";
@@ -355,9 +355,9 @@ layui.config({
         , Close: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要关闭的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";

wwwroot/layuiadmin/modules_sp/UnBindRecord_Admin.js

@@ -1,4 +1,4 @@
-var ExcelData,ExcelKind;
+var ExcelData, ExcelKind;
 function ConfirmImport() {
     $.ajax({
         type: "POST",
@@ -31,49 +31,49 @@ layui.config({
     //- 筛选条件-日期
     var laydate = layui.laydate;
     var layUnBindTime = laydate.render({
-elem: '#UnBindTime',
-trigger: 'click',
-type: 'datetime',
-range: true,
-change: function (value, date, endDate) {
-var op = true;
-if (date.year == endDate.year && endDate.month - date.month <= 1) {
-if (endDate.month - date.month == 1 && endDate.date > date.date) {
-op = false;
-layUnBindTime.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-} else {
-op = false;
-layUnBindTime.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-if (op) {
-$('#UnBindTime').val(value);
-}
-}
-});
+        elem: '#UnBindTime',
+        trigger: 'click',
+        type: 'datetime',
+        range: true,
+        change: function (value, date, endDate) {
+            var op = true;
+            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+                    op = false;
+                    layUnBindTime.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layUnBindTime.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#UnBindTime').val(value);
+            }
+        }
+    });
 
 
     //excel导入
-    excel = layui.excel;        
+    excel = layui.excel;
     $('#ExcelFile').change(function (e) {
         var files = e.target.files;
-        excel.importExcel(files, { }, function (data) {
+        excel.importExcel(files, {}, function (data) {
             ExcelData = data[0].sheet1;
         });
     });
 
     //监听单元格编辑
-    table.on('edit(LAY-list-manage)', function(obj){
+    table.on('edit(LAY-list-manage)', function (obj) {
         var value = obj.value //得到修改后的值
-        ,data = obj.data //得到所在行所有键值
-        ,field = obj.field; //得到字段
-        if(field == "Sort"){
+            , data = obj.data //得到所在行所有键值
+            , field = obj.field; //得到字段
+        if (field == "Sort") {
             $.ajax({
                 type: "POST",
                 url: "/Admin/UnBindRecord/Sort?r=" + Math.random(1),
@@ -84,28 +84,28 @@ $('#UnBindTime').val(value);
             });
         }
     });
-    
+
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
         , url: '/Admin/UnBindRecord/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-    		, {field:'Id', fixed: 'left', title:'ID', width:80, sort: true, unresize: true}
-            ,{field:'AgentName', width: 200, title:'机构名称', sort: true}
-,{field:'MerNo', width: 200, title:'商户编号', sort: true}
-,{field:'MerName', width: 200, title:'商户名称', sort: true}
-,{field:'MerSnNo', width: 200, title:'终端机身号', sort: true}
-,{field:'ProductType', width: 200, title:'产品类型', sort: true}
-,{field:'UnBindTime', width: 200, title:'解绑时间', sort: true}
-,{field:'ChannelSerial', width: 200, title:'渠道流水号', sort: true}
-,{field:'AgentNo', width: 200, title:'机构号', sort: true}
-
-            , {field:'Sort', fixed: 'right', title:'排序', width:80, edit: 'text'}
+            , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            , { field: 'AgentName', width: 200, title: '机构名称', sort: true }
+            , { field: 'MerNo', width: 200, title: '商户编号', sort: true }
+            , { field: 'MerName', width: 200, title: '商户名称', sort: true }
+            , { field: 'MerSnNo', width: 200, title: '终端机身号', sort: true }
+            , { field: 'ProductType', width: 200, title: '产品类型', sort: true }
+            , { field: 'UnBindTime', width: 200, title: '解绑时间', sort: true }
+            // , { field: 'ChannelSerial', width: 200, title: '渠道流水号', sort: true }
+            , { field: 'AgentNo', width: 200, title: '机构号', sort: true }
+
+            // , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
             , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {
-            
+
         }
         , page: true
         , limit: 30
@@ -127,7 +127,7 @@ $('#UnBindTime').val(value);
                     data: "Id=" + data.Id,
                     dataType: "text",
                     success: function (data) {
-                        if (data == "success") {                            
+                        if (data == "success") {
                             obj.del();
                             layer.close(index);
                         } else {
@@ -150,20 +150,20 @@ $('#UnBindTime').val(value);
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -174,7 +174,7 @@ $('#UnBindTime').val(value);
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/UnBindRecord/Edit?r=" + Math.random(1),
@@ -267,20 +267,20 @@ $('#UnBindTime').val(value);
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -291,7 +291,7 @@ $('#UnBindTime').val(value);
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/UnBindRecord/Add?r=" + Math.random(1),
@@ -348,9 +348,9 @@ $('#UnBindTime').val(value);
         , Open: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要开启的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";
@@ -377,9 +377,9 @@ $('#UnBindTime').val(value);
         , Close: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要关闭的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";