From 4ead01a2f164a03fc95019e4686c5bf42a793194 Mon Sep 17 00:00:00 2001 From: qian Date: Wed, 3 Apr 2024 15:19:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E6=8C=89ErpSite=E5=8C=BA?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 北京北汽/Controller/SCP_ASK_CONTROLLER.cs | 5 ++++- 北京北汽/Controller/SCP_PO_CONTROLLER.cs | 4 ++++ 北京北汽/Models/AppBoxEntity/User.cs | 4 ++++ .../SCP/Views/PlanData/SCP_ASK.aspx.cs | 3 ++- .../SCP/Views/PlanData/SCP_PO.aspx.cs | 1 + 北京北汽/SCP/default_hb.aspx.cs | 21 +++++++++++++++---- 北京北汽/SCP/main.aspx.cs | 2 +- 7 files changed, 33 insertions(+), 7 deletions(-) diff --git a/北京北汽/Controller/SCP_ASK_CONTROLLER.cs b/北京北汽/Controller/SCP_ASK_CONTROLLER.cs index 7adf117..d15aeef 100644 --- a/北京北汽/Controller/SCP_ASK_CONTROLLER.cs +++ b/北京北汽/Controller/SCP_ASK_CONTROLLER.cs @@ -97,7 +97,10 @@ namespace CK.SCP.Controller { q = q.Where(p => p.CreateUser == p_entity.CreateUser); } - + if (!string.IsNullOrEmpty( p_entity.SubSite)) + { + q = q.Where(p => p.SubSite == p_entity.SubSite); + } if (p_entity.UserInVendIds != null && p_entity.UserInVendIds.Count > 0) { q = q.Where(p => p_entity.UserInVendIds.Contains(p.VendId)); diff --git a/北京北汽/Controller/SCP_PO_CONTROLLER.cs b/北京北汽/Controller/SCP_PO_CONTROLLER.cs index 682aedb..3d3e1f1 100644 --- a/北京北汽/Controller/SCP_PO_CONTROLLER.cs +++ b/北京北汽/Controller/SCP_PO_CONTROLLER.cs @@ -108,6 +108,10 @@ namespace CK.SCP.Controller { q = q.Where(p => p_entity.UserInSubSite.Contains(p.SubSite)); } + if (!string.IsNullOrEmpty(p_entity.SubSite)) + { + q = q.Where(p => p.SubSite == p_entity.SubSite); + } if (!string.IsNullOrEmpty(p_entity.PartCode)) { var _po = db.TB_PO_DETAIL.Where(p => p.PartCode == p_entity.PartCode && p.IsDeleted == false); diff --git a/北京北汽/Models/AppBoxEntity/User.cs b/北京北汽/Models/AppBoxEntity/User.cs index adccd72..6a57488 100644 --- a/北京北汽/Models/AppBoxEntity/User.cs +++ b/北京北汽/Models/AppBoxEntity/User.cs @@ -101,6 +101,10 @@ namespace CK.SCP.Models.AppBoxEntity public List SubSiteList { set; get; } [NotMapped] public string UsedDomain { set; get; } + /// + /// 首页选的地点 + /// + public string UserdSite { set; get; } diff --git a/北京北汽/SCP/Views/PlanData/SCP_ASK.aspx.cs b/北京北汽/SCP/Views/PlanData/SCP_ASK.aspx.cs index 81962a4..1b6fb9b 100644 --- a/北京北汽/SCP/Views/PlanData/SCP_ASK.aspx.cs +++ b/北京北汽/SCP/Views/PlanData/SCP_ASK.aspx.cs @@ -178,7 +178,8 @@ namespace SCP.PlanData _entity.UserInVendIds = CurrentUser.VenderList; } - _entity.UserInSubSite = CurrentUser.SubSiteList; + //_entity.UserInSubSite = CurrentUser.SubSiteList; + _entity.SubSite = CurrentUser.UserdSite; SCP_ASK_CONTROLLER.Get_V_TB_ASK_List(_entity, (_ret) => { if (_ret.State == ReturnStatus.Succeed) diff --git a/北京北汽/SCP/Views/PlanData/SCP_PO.aspx.cs b/北京北汽/SCP/Views/PlanData/SCP_PO.aspx.cs index cbcb8a6..89b34e2 100644 --- a/北京北汽/SCP/Views/PlanData/SCP_PO.aspx.cs +++ b/北京北汽/SCP/Views/PlanData/SCP_PO.aspx.cs @@ -104,6 +104,7 @@ namespace SCP.PlanData _entity.UserInVendIds = CurrentUser.VenderList; _entity.UserInSubSite = CurrentUser.SubSiteList; _entity.PartCode = TXT_PartCode.Text; + _entity.SubSite = CurrentUser.UserdSite; SCP_PO_CONTROLLER.Get_V_TB_PO_List(_entity, (_ret) => { if (_ret.State == ReturnStatus.Succeed) diff --git a/北京北汽/SCP/default_hb.aspx.cs b/北京北汽/SCP/default_hb.aspx.cs index ab5a3e8..ccabe5b 100644 --- a/北京北汽/SCP/default_hb.aspx.cs +++ b/北京北汽/SCP/default_hb.aspx.cs @@ -19,6 +19,7 @@ using CK.SCP.Models.Enums; using System.Drawing; using static CK.SCP.Common.MyWebSmtpMail; using MailKit.Security; +using System.Collections; namespace SCP { @@ -48,7 +49,10 @@ namespace SCP else { User user = DB.Users.Where(u => u.Name == _name && u.Email == _mail).FirstOrDefault(); - user.UsedDomain = factoryValue.Value; + var _list = SCPDB.TB_FACTORY.ToList(); + var erpdomain = _list.FirstOrDefault(q => q.ErpSite == factoryValue.Value).ErpDomain; + user.UsedDomain = erpdomain; + user.UserdSite = factoryValue.Value; if (user != null) { if (!user.Enabled) @@ -87,7 +91,7 @@ namespace SCP factory.DataTextField = "FactoryName"; - factory.DataValueField = "ErpDomain"; + factory.DataValueField = "ErpSite"; factory.DataSource = _list; factory.DataBind(); @@ -119,6 +123,7 @@ namespace SCP } private void Login(string p_userName, string p_password) { + var _list = SCPDB.TB_FACTORY.ToList(); if (string.IsNullOrEmpty(textUserName.Value) || string.IsNullOrEmpty(textPassword.Value)) { Alert.Show(GetResourceKey("用户名或密码不能为空!")); @@ -190,8 +195,15 @@ namespace SCP } var _factoryList = DB.Users.Where(itm => itm.Name == user.Name).FirstOrDefault().TA_FACTORY.Select(p => p.FactoryId).ToList(); var fac = DB.TA_FACTORY.Select(p => p.FactoryId).ToList(); - user.UsedDomain = factoryValue.Value; - if (_factoryList.Contains(factoryValue.Value)) + if (string.IsNullOrEmpty( factoryValue.Value)) + { + factoryValue.Value = SCPDB.TB_FACTORY.ToList().FirstOrDefault().ErpSite; + } + var erpdomain = _list.FirstOrDefault(q => q.ErpSite == factoryValue.Value).ErpDomain; + user.UsedDomain = erpdomain; + user.UserdSite = factoryValue.Value; + + if (_factoryList.Contains(erpdomain)) { string date = DateTime.Now.ToShortDateString(); var ret = SCP_LOGINNUMBER_CONTROLLER.Save_TA_LOGINNUMBER(p_userName, LoginNumer.Sussess, date); @@ -296,6 +308,7 @@ namespace SCP if (first != null) { first.Remark = user.UsedDomain; + first.UserdSite = user.UserdSite; DB.SaveChanges(); } img.ImageUrl = DrawToBase64(4); diff --git a/北京北汽/SCP/main.aspx.cs b/北京北汽/SCP/main.aspx.cs index 3f6c917..813316e 100644 --- a/北京北汽/SCP/main.aspx.cs +++ b/北京北汽/SCP/main.aspx.cs @@ -63,7 +63,7 @@ namespace SCP JObject ids = GetClientIDS(regionPanel, regionTop, mainTabStrip, txtUser, txtOnlineUserCount, txtCurrentTime, btnRefresh); ids.Add("userName", GetIdentityName()); - var factoryModel = DB.TA_FACTORY.FirstOrDefault(p => p.FactoryId == CurrentUser.UsedDomain); + var factoryModel = DB.TA_FACTORY.FirstOrDefault(p => p.ErpSite == CurrentUser.UserdSite); ids.Add("userIP", factoryModel != null ? factoryModel.FactoryName : Request.UserHostAddress); // ids.Add("onlineUserCount", GetOnlineCount());