授权提示更新（新增定时器文件）

DK.Service/SystemModuleLogic/SystemModuleLogicPartial.cs

@@ -2267,6 +2267,33 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 			}
 		}
 
+		//订单详细信息
+		public static ServiceResultEntity EmpowermentFlag(SUserInfo sUserInfo, ClientRequestEntity cre)
+		{
+			IDBConnection conn = null;
+			try
+			{
+				conn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString);
+
+				string sqlString = @"SELECT EMPOWERMENTFLAG,SHOWINFO FROM TP_SYS_EMPOWERMENTFLAG ";
+
+				ServiceResultEntity sre = new ServiceResultEntity();
+				sre.Data = conn.GetSqlResultToDs(sqlString);
+				return sre;
+			}
+			catch (Exception ex)
+			{
+				throw ex;
+			}
+			finally
+			{
+				if (conn != null &&
+					conn.ConnState == ConnectionState.Open)
+				{
+					conn.Close();
+				}
+			}
+		}
 		#endregion
 	}
 }

IBOSS.PRD/IBOSS.PRD.csproj

@@ -127,6 +127,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="MessageBoxTimeOut.cs" />
     <Compile Include="F_SYS_0101.cs">
       <SubType>Form</SubType>
     </Compile>

IBOSS.PRD/MessageBoxTimeOut.cs

@@ -0,0 +1,137 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using System.Runtime.InteropServices;
+
+namespace Wongoing.Basic
+{
+    /// <summary>
+    /// 自动超时消息提示框
+    /// </summary>
+    public class MessageBoxTimeOut
+    {
+        /// <summary>
+        /// 标题
+        /// </summary>
+        private static string _caption;
+
+        /// <summary>
+        /// 显示消息框
+        /// </summary>
+        /// <param name="text">消息内容</param>
+        /// <param name="caption">标题</param>
+        /// <param name="timeout">超时时间，单位：毫秒</param>
+        public static void Show(string text, string caption, int timeout)
+        {
+            _caption = caption;
+            StartTimer(timeout);
+            MessageBox.Show(text, caption);
+        }
+        /// <summary>
+        /// 显示消息框
+        /// </summary>
+        /// <param name="text">消息内容</param>
+        /// <param name="caption">标题</param>
+        /// <param name="timeout">超时时间，单位：毫秒</param>
+        /// <param name="buttons">消息框上的按钮</param>
+        public static void Show(string text, string caption, int timeout, MessageBoxButtons buttons)
+        {
+            _caption = caption;
+            StartTimer(timeout);
+            MessageBox.Show(text, caption, buttons);
+        }
+        /// <summary>
+        /// 显示消息框
+        /// </summary>
+        /// <param name="text">消息内容</param>
+        /// <param name="caption">标题</param>
+        /// <param name="timeout">超时时间，单位：毫秒</param>
+        /// <param name="buttons">消息框上的按钮</param>
+        /// <param name="icon">消息框上的图标</param>
+        public static void Show(string text, string caption, int timeout, MessageBoxButtons buttons, MessageBoxIcon icon)
+        {
+            _caption = caption;
+            StartTimer(timeout);
+            MessageBox.Show(text, caption, buttons, icon);
+        }
+        /// <summary>
+        /// 显示消息框
+        /// </summary>
+        /// <param name="owner">消息框所有者</param>
+        /// <param name="text">消息内容</param>
+        /// <param name="caption">标题</param>
+        /// <param name="timeout">超时时间，单位：毫秒</param>
+        public static void Show(IWin32Window owner, string text, string caption, int timeout)
+        {
+            _caption = caption;
+            StartTimer(timeout);
+            MessageBox.Show(owner, text, caption);
+        }
+        /// <summary>
+        /// 显示消息框
+        /// </summary>
+        /// <param name="owner">消息框所有者</param>
+        /// <param name="text">消息内容</param>
+        /// <param name="caption">标题</param>
+        /// <param name="timeout">超时时间，单位：毫秒</param>
+        /// <param name="buttons">消息框上的按钮</param>
+        public static void Show(IWin32Window owner, string text, string caption, int timeout, MessageBoxButtons buttons)
+        {
+            _caption = caption;
+            StartTimer(timeout);
+            MessageBox.Show(owner, text, caption, buttons);
+        }
+        /// <summary>
+        /// 显示消息框
+        /// </summary>
+        /// <param name="owner">消息框所有者</param>
+        /// <param name="text">消息内容</param>
+        /// <param name="caption">标题</param>
+        /// <param name="timeout">超时时间，单位：毫秒</param>
+        /// <param name="buttons">消息框上的按钮</param>
+        /// <param name="icon">消息框上的图标</param>
+        public static void Show(IWin32Window owner, string text, string caption, int timeout, MessageBoxButtons buttons, MessageBoxIcon icon)
+        {
+            _caption = caption;
+            StartTimer(timeout);
+            MessageBox.Show(owner, text, caption, buttons, icon);
+        }
+
+        private static void StartTimer(int interval)
+        {
+            Timer timer = new Timer();
+            timer.Interval = interval;
+            timer.Tick += new EventHandler(Timer_Tick);
+            timer.Enabled = true;
+        }
+
+        private static void Timer_Tick(object sender, EventArgs e)
+        {
+            KillMessageBox();
+            //停止计时器
+            ((Timer)sender).Enabled = false;
+        }
+
+        [DllImport("user32.dll", EntryPoint = "FindWindow", CharSet = CharSet.Auto)]
+        private extern static IntPtr FindWindow(string lpClassName, string lpWindowName);
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto)]
+        private extern static int PostMessage(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
+
+        private const int WM_CLOSE = 0x10;
+
+        private static void KillMessageBox()
+        {
+            //查找MessageBox的弹出窗口,注意对应标题
+            IntPtr ptr = FindWindow(null, _caption);
+            if (ptr != IntPtr.Zero)
+            {
+                //查找到窗口则关闭
+                PostMessage(ptr, WM_CLOSE, IntPtr.Zero, IntPtr.Zero);
+            }
+        }
+    }
+}
+

IBOSS.PRD/Program.cs

@@ -14,6 +14,7 @@ using System.IO;
 using System.Reflection;
 using System.Threading;
 using System.Windows.Forms;
+using System.Runtime.InteropServices;
 
 using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Basics.Library;
@@ -21,276 +22,302 @@ using Dongke.IBOSS.PRD.Client.CommonModule;
 using Dongke.IBOSS.PRD.Client.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
 using Dongke.IBOSS.PRD.WCF.Proxys;
+using Timer = System.Windows.Forms.Timer;
+using Wongoing.Basic;
 
 namespace Dongke.IBOSS.PRD.Client
 {
-    /// <summary>
-    /// 系统启动主程序
-    /// </summary>
-    static class Program
-    {
-        #region 成员变量
+	/// <summary>
+	/// 系统启动主程序
+	/// </summary>
+	static class Program
+	{
+		#region 成员变量
 
-        // 系统登录窗体
-        private static F_SYS_0101 _frmLogin = null;
-        // 主窗体title
-        private static string _mainFormTitle = null;
-        private static string _loginFormTitle = null;
-        private static FileVersionInfo _info = null;
-        // 程序是否已经登录
-        private static bool _isLogin = false;
-        // 配置文件的全路径
-        private static string _iniFilePath = LocalPath.RootPath + Constant.INI_FILE_NAME;
+		// 系统登录窗体
+		private static F_SYS_0101 _frmLogin = null;
+		// 主窗体title
+		private static string _mainFormTitle = null;
+		private static string _loginFormTitle = null;
+		private static FileVersionInfo _info = null;
+		// 程序是否已经登录
+		private static bool _isLogin = false;
+		// 配置文件的全路径
+		private static string _iniFilePath = LocalPath.RootPath + Constant.INI_FILE_NAME;
 
-        #endregion
+		#endregion
 
-        #region 属性
+		#region 属性
 
-        /// <summary>
-        /// 已经登录标识
-        /// </summary>
-        internal static bool IsLogin
-        {
-            get
-            {
-                return _isLogin;
-            }
-            set
-            {
-                _isLogin = value;
-            }
-        }
+		/// <summary>
+		/// 已经登录标识
+		/// </summary>
+		internal static bool IsLogin
+		{
+			get
+			{
+				return _isLogin;
+			}
+			set
+			{
+				_isLogin = value;
+			}
+		}
 
-        #endregion
+		#endregion
 
-        /// <summary>
-        /// 应用程序的主入口点。
-        /// </summary>
-        [STAThread]
-        static void Main(string[] args)
-        {
-            Curtain.Log.Logger.DefaultLogDirectory = LocalPath.LogRootPath;
+		/// <summary>
+		/// 应用程序的主入口点。
+		/// </summary>
+		[STAThread]
+		static void Main(string[] args)
+		{
+			Curtain.Log.Logger.DefaultLogDirectory = LocalPath.LogRootPath;
 
-            // 检查程序是否已经在运行中
-            bool isCreatedNew = true;
-            Mutex ibossMutex = null;
-            //#if DEBUG
-            //#else
-            //            string ibossMutexName = SystemAPI.UserName + "-iboss.mes-";
-            //            ibossMutex = new Mutex(true, ibossMutexName, out isCreatedNew);
-            //#endif
-            // 取得程序的版本
-            _info = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location);
-            _mainFormTitle = Constant.M_SYSTEM_NAME + " - " + Constant.M_SYSTEM_CHINESE_SERIES + " - ver " + _info.FileVersion;
-            _loginFormTitle = Constant.M_SYSTEM_CHINESE_NAME + " - ver " + _info.FileVersion;
+			// 检查程序是否已经在运行中
+			bool isCreatedNew = true;
+			Mutex ibossMutex = null;
+			//#if DEBUG
+			//#else
+			//            string ibossMutexName = SystemAPI.UserName + "-iboss.mes-";
+			//            ibossMutex = new Mutex(true, ibossMutexName, out isCreatedNew);
+			//#endif
+			// 取得程序的版本
+			_info = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location);
+			_mainFormTitle = Constant.M_SYSTEM_NAME + " - " + Constant.M_SYSTEM_CHINESE_SERIES + " - ver " + _info.FileVersion;
+			_loginFormTitle = Constant.M_SYSTEM_CHINESE_NAME + " - ver " + _info.FileVersion;
 
-            if (isCreatedNew)
-            {
-                try
-                {
-                    Application.EnableVisualStyles();
-                    Application.SetCompatibleTextRenderingDefault(false);
+			if (isCreatedNew)
+			{
+				try
+				{
+					Application.EnableVisualStyles();
+					Application.SetCompatibleTextRenderingDefault(false);
 
-                    Application.ThreadException += Application_ThreadException;
+					Application.ThreadException += Application_ThreadException;
 
-                    {
-                        // 更新自动更新程序
-                        if (Directory.Exists(LocalPath.InstallerDownloadPath))
-                        {
-                            string[] downFiles = Directory.GetFiles(LocalPath.InstallerDownloadPath);
-                            if (downFiles.Length > 0)
-                            {
-                                if (args != null)
-                                {
-                                    System.Threading.Thread.Sleep(3000);
-                                }
-                                try
-                                {
-                                    foreach (string name in downFiles)
-                                    {
-                                        string filename = Path.GetFileName(name);
-                                        if (filename.StartsWith("AutoUpgrade")
-                                            || "SharpZipLib.dll".Equals(filename))
-                                        {
-                                            string localFile = System.Environment.CurrentDirectory + @"\" + filename;
+					{
+						// 更新自动更新程序
+						if (Directory.Exists(LocalPath.InstallerDownloadPath))
+						{
+							string[] downFiles = Directory.GetFiles(LocalPath.InstallerDownloadPath);
+							if (downFiles.Length > 0)
+							{
+								if (args != null)
+								{
+									System.Threading.Thread.Sleep(3000);
+								}
+								try
+								{
+									foreach (string name in downFiles)
+									{
+										string filename = Path.GetFileName(name);
+										if (filename.StartsWith("AutoUpgrade")
+											|| "SharpZipLib.dll".Equals(filename))
+										{
+											string localFile = System.Environment.CurrentDirectory + @"\" + filename;
 
-                                            if (File.Exists(localFile))
-                                            {
-                                                File.Delete(localFile);
-                                            }
-                                            File.Copy(name, localFile);
-                                            File.Delete(name);
-                                        }
-                                        else
-                                        {
-                                            File.Delete(name);
-                                        }
-                                    }
-                                }
-                                catch (Exception ex)
-                                {
-                                    Curtain.Log.Logger.Error(ex);
-                                }
-                            }
-                        }
-                    }
-                    // 系统登录
-                    Login(args);
-                    if (_isLogin)
-                    {
-                        //#if DEBUG
-                        // 如果升级版本发布错误，导致客户端都不能升级了。
-                        // 主程序
-                        //using (F_SYS_0201 main = new F_SYS_0201())
-                        //{
-                        //    main.Text = _mainFormTitle;
-                        //    Application.Run(main);
-                        //}
-                        //#else
-                        // 自动更新
-                        NeedUpgradeResultEntity needUpgradeInfo = DKIBOSSPRDProxy.Service.IsNeedUpgrade(_info.FileVersion);
+											if (File.Exists(localFile))
+											{
+												File.Delete(localFile);
+											}
+											File.Copy(name, localFile);
+											File.Delete(name);
+										}
+										else
+										{
+											File.Delete(name);
+										}
+									}
+								}
+								catch (Exception ex)
+								{
+									Curtain.Log.Logger.Error(ex);
+								}
+							}
+						}
+					}
+					// 系统登录
+					Login(args);
+					if (_isLogin)
+					{
+						//#if DEBUG
+						// 如果升级版本发布错误，导致客户端都不能升级了。
+						// 主程序
+						//using (F_SYS_0201 main = new F_SYS_0201())
+						//{
+						//    main.Text = _mainFormTitle;
+						//    Application.Run(main);
+						//}
+						//#else
+						// 自动更新
+						NeedUpgradeResultEntity needUpgradeInfo = DKIBOSSPRDProxy.Service.IsNeedUpgrade(_info.FileVersion);
 
-                        if (needUpgradeInfo.UpgradeState)
-                        {
-                            MessageBox.Show("检测到服务器上有最新版本，需要自动更新。",
-                                Messages.MSG_TITLE_I01,
-                                MessageBoxButtons.OK,
-                                MessageBoxIcon.Information);
+						#region 版本到期提示      2023-05-26 fenglinyong ADD start
+						//查询后台授权标识
+						//EMPOWERMENTFLAG授权（1：提示授权到期，2：不提示）
+						ClientRequestEntity cre = new ClientRequestEntity();
+						cre.NameSpace = "EMPOWERMENTFLAG";
+						cre.Name = "EMPOWERMENTFLAG";
+						ServiceResultEntity sre = SystemModuleProxy.Service.DoRequest(cre);
+						if (sre.Status == Basics.BaseResources.Constant.ServiceResultStatus.Success)
+						{
+							if (sre.Data != null && sre.Data.Tables.Count > 0 && sre.Data.Tables[0].Rows.Count > 0)
+							{
+								if (sre.Data.Tables[0].Rows[0]["EMPOWERMENTFLAG"].ToString() == "1")
+								{
+									MessageBoxTimeOut.Show(sre.Data.Tables[0].Rows[0]["SHOWINFO"].ToString(), "提示", 3000);
+									//MessageBox.Show(sre.Data.Tables[0].Rows[0]["SHOWINFO"].ToString(),
+									//Messages.MSG_TITLE_I01,
+									//MessageBoxButtons.OK,
+									//MessageBoxIcon.Information);
+								}
+							}
+						}
 
-                            needUpgradeInfo.GradeInfo =
-                                string.Format("本地程序版本：{0}\r\n最新程序版本：{1}",
-                                _info.FileVersion, needUpgradeInfo.ServerVersion);
+						#endregion                   2023-05-26 fenglinyong ADD END
 
-                            // 如果有提示信息提示，没有就跳过
-                            if (!string.IsNullOrEmpty(needUpgradeInfo.GradeInfo))
-                            {
-                                F_SYS_0103 frmAutoUpgradeInfo = new F_SYS_0103(needUpgradeInfo.GradeInfo);
-                                DialogResult dialogResult = frmAutoUpgradeInfo.ShowDialog();
-                                if (dialogResult != DialogResult.OK)
-                                {
-                                    Application.Exit();
-                                }
-                                else
-                                {
-                                    Application.Exit();
-                                    //Process.Start("AutoUpgrade.exe");
-                                    Process.Start(System.AppDomain.CurrentDomain.BaseDirectory + "AutoUpgrade.exe", "IBOSSPRD.exe " + _frmLogin.Password);
-                                }
-                            }
-                            else
-                            {
-                                Application.Exit();
-                                //Process.Start("AutoUpgrade.exe");
-                                Process.Start(System.AppDomain.CurrentDomain.BaseDirectory + "AutoUpgrade.exe", "IBOSSPRD.exe " + _frmLogin.Password);
-                            }
-                        }
-                        // 如果有提示信息，不能连接服务器
-                        else if (!string.IsNullOrEmpty(needUpgradeInfo.GradeInfo))
-                        {
-                            MessageBox.Show(needUpgradeInfo.GradeInfo,
-                                Messages.MSG_TITLE_I01,
-                                MessageBoxButtons.OK,
-                                MessageBoxIcon.Warning);
-                            Application.Exit();
-                        }
-                        else
-                        {
-                            // 主程序
-                            using (F_SYS_0201 main = new F_SYS_0201())
-                            {
-                                main.Text = _mainFormTitle;
-                                Application.Run(main);
-                            }
-                        }
-                        //#endif
-                    }
-                }
-                catch (Exception ex)
-                {
-                    // 对异常进行共通处理
-                    ExceptionManager.HandleEventException("Program.cs", "Main()", Messages.MSG_TITLE_E01, ex);
-                }
-                finally
-                {
-                    if (_isLogin)
-                    {
-                        try
-                        {
-                            // 退出系统
-                            DKIBOSSPRDProxy.Service.Logout(LogInUserInfo.CurrentUser.UserID);
-                        }
-                        catch { }
-                    }
-                    if (ibossMutex != null)
-                    {
-                        ibossMutex.Close();
-                    }
-                }
-            }
-            else
-            {
-                IntPtr iptWndMain = Utility.FindWindow(null, _mainFormTitle);
-                if (iptWndMain == IntPtr.Zero)
-                {
-                    IntPtr iptWndLogin = Utility.FindWindow(null, _loginFormTitle);
-                    if (iptWndLogin != IntPtr.Zero)
-                    {
-                        Utility.WakeupWindow(iptWndLogin);
-                    }
-                }
-                else
-                {
-                    Utility.WakeupWindow(iptWndMain);
-                }
-            }
-        }
+						if (needUpgradeInfo.UpgradeState)
+						{
+							MessageBox.Show("检测到服务器上有最新版本，需要自动更新。",
+								Messages.MSG_TITLE_I01,
+								MessageBoxButtons.OK,
+								MessageBoxIcon.Information);
 
-        static void Application_ThreadException(object sender, ThreadExceptionEventArgs e)
-        {
-            //throw new NotImplementedException();
-            ExceptionManager.HandleEventException(
-                "Program.cs",
-                "Application_ThreadException()",
-                Messages.MSG_TITLE_E01,
-                e.Exception);
-        }
+							needUpgradeInfo.GradeInfo =
+								string.Format("本地程序版本：{0}\r\n最新程序版本：{1}",
+								_info.FileVersion, needUpgradeInfo.ServerVersion);
 
-        #region 私有方法
+							// 如果有提示信息提示，没有就跳过
+							if (!string.IsNullOrEmpty(needUpgradeInfo.GradeInfo))
+							{
+								F_SYS_0103 frmAutoUpgradeInfo = new F_SYS_0103(needUpgradeInfo.GradeInfo);
+								DialogResult dialogResult = frmAutoUpgradeInfo.ShowDialog();
+								if (dialogResult != DialogResult.OK)
+								{
+									Application.Exit();
+								}
+								else
+								{
+									Application.Exit();
+									//Process.Start("AutoUpgrade.exe");
+									Process.Start(System.AppDomain.CurrentDomain.BaseDirectory + "AutoUpgrade.exe", "IBOSSPRD.exe " + _frmLogin.Password);
+								}
+							}
+							else
+							{
+								Application.Exit();
+								//Process.Start("AutoUpgrade.exe");
+								Process.Start(System.AppDomain.CurrentDomain.BaseDirectory + "AutoUpgrade.exe", "IBOSSPRD.exe " + _frmLogin.Password);
+							}
+						}
+						// 如果有提示信息，不能连接服务器
+						else if (!string.IsNullOrEmpty(needUpgradeInfo.GradeInfo))
+						{
+							MessageBox.Show(needUpgradeInfo.GradeInfo,
+								Messages.MSG_TITLE_I01,
+								MessageBoxButtons.OK,
+								MessageBoxIcon.Warning);
+							Application.Exit();
+						}
+						else
+						{
+							// 主程序
+							using (F_SYS_0201 main = new F_SYS_0201())
+							{
+								main.Text = _mainFormTitle;
+								Application.Run(main);
+							}
+						}
+						//#endif
+					}
+				}
+				catch (Exception ex)
+				{
+					// 对异常进行共通处理
+					ExceptionManager.HandleEventException("Program.cs", "Main()", Messages.MSG_TITLE_E01, ex);
+				}
+				finally
+				{
+					if (_isLogin)
+					{
+						try
+						{
+							// 退出系统
+							DKIBOSSPRDProxy.Service.Logout(LogInUserInfo.CurrentUser.UserID);
+						}
+						catch { }
+					}
+					if (ibossMutex != null)
+					{
+						ibossMutex.Close();
+					}
+				}
+			}
+			else
+			{
+				IntPtr iptWndMain = Utility.FindWindow(null, _mainFormTitle);
+				if (iptWndMain == IntPtr.Zero)
+				{
+					IntPtr iptWndLogin = Utility.FindWindow(null, _loginFormTitle);
+					if (iptWndLogin != IntPtr.Zero)
+					{
+						Utility.WakeupWindow(iptWndLogin);
+					}
+				}
+				else
+				{
+					Utility.WakeupWindow(iptWndMain);
+				}
+			}
+		}
 
-        /// <summary>
-        /// 调取系统登录页面进行登录验证
-        /// </summary>
-        /// <returns></returns>
-        private static bool Login(string[] args)
-        {
-            _frmLogin = new F_SYS_0101();
-            _frmLogin.Text = _loginFormTitle;
-            if (args != null)
-            {
-                int argsLength = args.Length;
-                if (argsLength == 1)
-                {
-                    if ("IsChangedUser" == args[0])
-                    {
-                        _frmLogin.IsChangedUser = true;
-                    }
-                }
-                if (argsLength == 2)
-                {
-                    if ("IBOSSPRD.exe" == args[0])
-                    {
-                        _frmLogin.Password = args[1];
-                    }
-                }
-            }
-            DialogResult dialogResult = _frmLogin.ShowDialog();
-            if (dialogResult == DialogResult.OK)
-            {
-                return true;
-            }
-            return false;
-        }
+		static void Application_ThreadException(object sender, ThreadExceptionEventArgs e)
+		{
+			//throw new NotImplementedException();
+			ExceptionManager.HandleEventException(
+				"Program.cs",
+				"Application_ThreadException()",
+				Messages.MSG_TITLE_E01,
+				e.Exception);
+		}
 
-        #endregion
-    }
+		#region 私有方法
+
+		/// <summary>
+		/// 调取系统登录页面进行登录验证
+		/// </summary>
+		/// <returns></returns>
+		private static bool Login(string[] args)
+		{
+			_frmLogin = new F_SYS_0101();
+			_frmLogin.Text = _loginFormTitle;
+			if (args != null)
+			{
+				int argsLength = args.Length;
+				if (argsLength == 1)
+				{
+					if ("IsChangedUser" == args[0])
+					{
+						_frmLogin.IsChangedUser = true;
+					}
+				}
+				if (argsLength == 2)
+				{
+					if ("IBOSSPRD.exe" == args[0])
+					{
+						_frmLogin.Password = args[1];
+					}
+				}
+			}
+			DialogResult dialogResult = _frmLogin.ShowDialog();
+			if (dialogResult == DialogResult.OK)
+			{
+				return true;
+			}
+			return false;
+		}
+		
+		#endregion
+	}
 }

IBOSS.PRD/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.22.0624")]
-[assembly: AssemblyFileVersion("1.2.22.0624")]
+[assembly: AssemblyVersion("1.2.22.0625")]
+[assembly: AssemblyFileVersion("1.2.22.0625")]

WCF.Service/WCF.Hosting/Config.ini

@@ -40,7 +40,7 @@ ServerName=Debug
 [VersionSetting]
 PublicClientVersion=1.0.0.7
 AndroidVersion=1.2.21.1215
-ClientVersion=1.2.22.0624
+ClientVersion=1.2.22.0625
 
 [PathSetting]
 ;客户端升级，下载文件路径

WCF.Service/WCF.Services/SystemModuleService.cs

@@ -2751,6 +2751,16 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                         return result;
                     }
                 }
+                else if ("EMPOWERMENTFLAG" == cre.NameSpace)
+                {
+                    if ("EMPOWERMENTFLAG" == cre.Name)
+                    {
+                        ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
+                            () => SystemModuleLogic.EmpowermentFlag(SUserInfo, cre));
+                        return result;
+                    }
+                    return null;
+                }
                 return null;
             }
             catch (Exception ex)