合并调整

Areas/Admin/Controllers/MainServer/MachineChangeController.cs

@@ -25,6 +25,7 @@ namespace MySystem.Areas.Admin.Controllers
     {
         public MachineChangeController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
         {
+            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
         }
 
         #region 机具转换订单列表
@@ -118,7 +119,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
 
 
-            Dictionary<string, object> obj = new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).IndexData("MachineChange", Fields, "Id desc", "0", page, limit, condition);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("MachineChange", 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)
             {
@@ -196,7 +197,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Add("MachineChange", Fields, 0);
+            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("MachineChange", Fields, 0);
             AddSysLog(data.Id.ToString(), "MachineChange", "add");
             db.SaveChanges();
 
@@ -241,7 +242,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
-            new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("MachineChange", Fields, data.Id);
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("MachineChange", Fields, data.Id);
             AddSysLog(data.Id.ToString(), "MachineChange", "update");
             db.SaveChanges();
 
@@ -265,7 +266,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", -1);
-                new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("MachineChange", Fields, id);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("MachineChange", Fields, id);
             }
             db.SaveChanges();
 
@@ -289,7 +290,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 1);
-                new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("MachineChange", Fields, id);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("MachineChange", Fields, id);
             }
             db.SaveChanges();
             return "success";
@@ -312,7 +313,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 0);
-                new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("MachineChange", Fields, id);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("MachineChange", Fields, id);
             }
             db.SaveChanges();
             return "success";
@@ -327,7 +328,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// <param name="Id"></param>
         public string Sort(int Id, int Sort)
         {
-            new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Sort("MachineChange", Sort, Id);
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Sort("MachineChange", Sort, Id);
 
             AddSysLog(Id.ToString(), "MachineChange", "sort");
             return "success";
@@ -432,7 +433,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
 
 
-            Dictionary<string, object> obj = new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).IndexData("MachineChange", Fields, "Id desc", "0", 1, 20000, condition, "ChangeNo,UserId,BackProductType,ChangeDeviceNum,ChangeTime,AuditBy,AuditResult,AuditRemark,ChangeSnExpand,BackStoreId,Remark,BackStoreUserId,OutProductType,OutStoreId,OutStoreManagerMobile", false);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("MachineChange", Fields, "Id desc", "0", 1, 20000, condition, "ChangeNo,UserId,BackProductType,ChangeDeviceNum,ChangeTime,AuditBy,AuditResult,AuditRemark,ChangeSnExpand,BackStoreId,Remark,BackStoreUserId,OutProductType,OutStoreId,OutStoreManagerMobile", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {

Areas/Admin/Controllers/MainServer/MachineChangeDetailController.cs

@@ -43,11 +43,11 @@ namespace MySystem.Areas.Admin.Controllers
 
             string Condition = "";
             Condition += "ChangeNo:\"" + data.ChangeNo + "\",";
-Condition += "BackProductType:\"" + data.BackProductType + "\",";
-Condition += "BackDeviceStatus:\"" + data.BackDeviceStatus + "\",";
+            Condition += "BackProductType:\"" + data.BackProductType + "\",";
+            Condition += "BackDeviceStatus:\"" + data.BackDeviceStatus + "\",";
 
             if (!string.IsNullOrEmpty(Condition))
-            { 
+            {
                 Condition = Condition.TrimEnd(',');
                 Condition = ", where: {" + Condition + "}";
             }
@@ -65,20 +65,20 @@ Condition += "BackDeviceStatus:\"" + data.BackDeviceStatus + "\",";
         /// <returns></returns>
         public JsonResult IndexData(MachineChangeDetail data, int page = 1, int limit = 30)
         {
-            
+
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             Fields.Add("ChangeId", "1");
 
             Fields.Add("ChangeNo", "2"); //订单号
-Fields.Add("CreateDate", "3"); //时间
-Fields.Add("BackProductType", "1"); //退回产品类型
-Fields.Add("BackDeviceStatus", "1"); //设备状态
+            Fields.Add("CreateDate", "3"); //时间
+            Fields.Add("BackProductType", "1"); //退回产品类型
+            Fields.Add("BackDeviceStatus", "1"); //设备状态
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("MachineChangeDetail", Fields, "Id desc", "0", page, limit, " and Status>-1");
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
-                
+
             }
             return Json(obj);
         }
@@ -116,7 +116,7 @@ Fields.Add("BackDeviceStatus", "1"); //设备状态
             Fields.Add("ChangeId", data.ChangeId);
 
             Fields.Add("BackProductType", data.BackProductType); //退回产品类型
-Fields.Add("Remark", data.Remark); //备注
+            Fields.Add("Remark", data.Remark); //备注
 
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
@@ -124,7 +124,7 @@ Fields.Add("Remark", data.Remark); //备注
             int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("MachineChangeDetail", Fields, 0);
             AddSysLog(data.Id.ToString(), "MachineChangeDetail", "add");
             db.SaveChanges();
-            
+
             return "success";
         }
 
@@ -163,15 +163,15 @@ Fields.Add("Remark", data.Remark); //备注
             Fields.Add("ChangeId", data.ChangeId);
 
             Fields.Add("BackProductType", data.BackProductType); //退回产品类型
-Fields.Add("Remark", data.Remark); //备注
+            Fields.Add("Remark", data.Remark); //备注
 
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
             new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("MachineChangeDetail", Fields, data.Id);
-            AddSysLog(data.Id.ToString(),"MachineChangeDetail","update");
+            AddSysLog(data.Id.ToString(), "MachineChangeDetail", "update");
             db.SaveChanges();
-            
+
             return "success";
         }
 
@@ -186,7 +186,7 @@ Fields.Add("Remark", data.Remark); //备注
         public string Delete(string Id)
         {
             string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"MachineChangeDetail","del");
+            AddSysLog(Id, "MachineChangeDetail", "del");
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
@@ -195,7 +195,7 @@ Fields.Add("Remark", data.Remark); //备注
                 new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("MachineChangeDetail", Fields, id);
             }
             db.SaveChanges();
-            
+
             return "success";
         }
 
@@ -210,7 +210,7 @@ Fields.Add("Remark", data.Remark); //备注
         public string Open(string Id)
         {
             string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"MachineChangeDetail","open");
+            AddSysLog(Id, "MachineChangeDetail", "open");
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
@@ -233,7 +233,7 @@ Fields.Add("Remark", data.Remark); //备注
         public string Close(string Id)
         {
             string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"MachineChangeDetail","close");
+            AddSysLog(Id, "MachineChangeDetail", "close");
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
@@ -255,7 +255,7 @@ Fields.Add("Remark", data.Remark); //备注
         public string Sort(int Id, int Sort)
         {
             new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Sort("MachineChangeDetail", Sort, Id);
-            
+
             AddSysLog(Id.ToString(), "MachineChangeDetail", "sort");
             return "success";
         }
@@ -270,15 +270,15 @@ Fields.Add("Remark", data.Remark); //备注
         {
             ExcelData = HttpUtility.UrlDecode(ExcelData);
             JsonData list = JsonMapper.ToObject(ExcelData);
-            for (int i = 1; i < list.Count;i++ )
+            for (int i = 1; i < list.Count; i++)
             {
                 JsonData dr = list[i];
-                
+
                 db.MachineChangeDetail.Add(new MachineChangeDetail()
                 {
                     CreateDate = DateTime.Now,
                     UpdateDate = DateTime.Now,
-                    
+
                 });
                 db.SaveChanges();
             }
@@ -297,15 +297,15 @@ Fields.Add("Remark", data.Remark); //备注
         {
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             Fields.Add("ChangeNo", "2"); //订单号
-Fields.Add("CreateDate", "3"); //时间
-Fields.Add("BackProductType", "1"); //退回产品类型
-Fields.Add("BackDeviceStatus", "1"); //设备状态
+            Fields.Add("CreateDate", "3"); //时间
+            Fields.Add("BackProductType", "1"); //退回产品类型
+            Fields.Add("BackDeviceStatus", "1"); //设备状态
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("MachineChangeDetail", Fields, "Id desc", "0", 1, 20000, "", "", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
-                
+
             }
 
             Dictionary<string, object> result = new Dictionary<string, object>();
@@ -313,7 +313,7 @@ Fields.Add("BackDeviceStatus", "1"); //设备状态
             result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
             result.Add("Obj", diclist);
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-            
+
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "MachineChangeDetail", "ExportExcel");
             return Json(result);

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -580,6 +580,16 @@ namespace MySystem.Areas.Admin.Controllers
                 sCreateDate = datelist[0] + " 00:00:00";
                 eCreateDate = datelist[1] + " 23:59:59";
             }
+            else
+            {
+                Dictionary<string, object> nodata = new Dictionary<string, object>();
+                nodata.Add("code", 0);
+                nodata.Add("msg", "");
+                nodata.Add("count", 0);
+                nodata.Add("data", new List<Dictionary<string, object>>());
+                
+                return Json(nodata);
+            }
             string minId = "0";
             string maxId = "0";
             string minPosId = "0";
@@ -683,6 +693,25 @@ namespace MySystem.Areas.Admin.Controllers
                 sCreateDate = datelist[0] + " 00:00:00";
                 eCreateDate = datelist[1] + " 23:59:59";
             }
+            else
+            {
+                Dictionary<string, object> nodata = new Dictionary<string, object>();
+                nodata.Add("Status", "1");
+                nodata.Add("Info", "分仓统计数据报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
+                nodata.Add("Obj", new List<Dictionary<string, object>>());
+                Dictionary<string, object> NoDataReturnFields = new Dictionary<string, object>();
+                NoDataReturnFields.Add("StoreName", "仓库名称");
+                NoDataReturnFields.Add("StoreNo", "仓库编号");
+                NoDataReturnFields.Add("Mobile", "仓库所属人手机号");
+                NoDataReturnFields.Add("RealName", "仓库所属人名称");
+                NoDataReturnFields.Add("Name", "品牌");
+                NoDataReturnFields.Add("LaveNum", "当前库存");
+                NoDataReturnFields.Add("c1", "出库(调拨)量");
+                NoDataReturnFields.Add("c2", "出货(发货到创客)量");
+                NoDataReturnFields.Add("c3", "激活量");
+                nodata.Add("Fields", NoDataReturnFields);
+                return Json(nodata);
+            }
             string minId = "0";
             string maxId = "0";
             string minPosId = "0";

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1364,6 +1364,7 @@ namespace MySystem.Areas.Admin.Controllers
                 ApplyNo = "U" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8),
             });
             pos.BindMerchantId = 0;
+            pos.Status = -2;
             pos.BindingState = 0;
             pos.BindingTime = DateTime.Parse("1900-01-01");
             pos.UserId = pos.BuyUserId;
@@ -1703,12 +1704,4 @@ namespace MySystem.Areas.Admin.Controllers
         #endregion
 
     }
-}
-
-
-// 关联上下级
-// 机具激活了，不展示数据
-// 后台调拨，需确认仓库是否存在机具编号
-// 后台划拨给创客，需确认仓库是否存在机具编号，并且未划拨
-// 循环机具申请，订单未关联或丢失
-// 后台机具管理开放权限，可以看到刷卡金额
+}

Areas/Admin/Controllers/MainServer/UserCashRecordController.cs

@@ -87,7 +87,6 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and Status=" + StatusSelect;
             }
-
             if(!string.IsNullOrEmpty(data.CashOrderNo))
             {
                 condition += " and CashOrderNo='" + data.CashOrderNo + "'";
@@ -96,8 +95,14 @@ namespace MySystem.Areas.Admin.Controllers
             { 
                 condition += " and TradeType=" + data.TradeType;
             }
+            //提交到代付状态
             if (!string.IsNullOrEmpty(QueryCountSelect))
             { 
+                int QueryCount = int.Parse(function.CheckInt(QueryCountSelect));
+                if (QueryCount == 2)
+                {
+                    QueryCount = 0;
+                }
                 condition += " and QueryCount=" + QueryCountSelect;
             }
             if (data.Status > -1)
@@ -370,7 +375,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 导出Excel
         /// </summary>
         /// <returns></returns>
-        public JsonResult ExportExcel(UserCashRecord data, string MakerCode, string RealName, string StatusSelect)
+        public JsonResult ExportExcel(UserCashRecord data, string MakerCode, string RealName, string StatusSelect, string PayStatus)
         {
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             Fields.Add("CashOrderNo", "1"); //提现单号
@@ -393,6 +398,16 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and Status=" + StatusSelect;
             }
+            //提交到代付状态
+            if (!string.IsNullOrEmpty(PayStatus))
+            {
+                int QueryCount = int.Parse(function.CheckInt(PayStatus));
+                if (QueryCount == 2)
+                {
+                    QueryCount = 0;
+                }
+                condition += " and QueryCount=" + QueryCount;
+            }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("UserCashRecord", Fields, "Id desc", "0", 1, 20000, condition, "CashOrderNo,UserId,IdCardNo,ActualTradeAmount,Remark,Status,QueryCount", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;