提交当前本机整理版本

插件库/Lskj.Notice2/FrmMain.cs

@@ -760,4 +760,31 @@ namespace Lskj.Notice
         /// <para>修改备注：</para>
         /// <para>版本：1.0</para>
         /// </summary>
-        private v
+        private void SetDelphiDllParams()
+        {
+            try
+            {
+                StringBuilder sb1 = new StringBuilder();
+                sb1.Append(ERPInfo.Instance.UserName);
+
+                StringBuilder sb2 = new StringBuilder();
+                sb2.Append(ERPInfo.Instance.WindowName);
+
+                StringBuilder sb3 = new StringBuilder();
+                sb3.Append(ERPInfo.Instance.SkinName);
+
+                //给delphi库设置参数(用户id、子系统id、操作员名称、计算机名称)
+                DelphiHelper.Delphi_SetParams(Convert.ToInt32(ERPInfo.Instance.UserId), Convert.ToInt32(ERPInfo.Instance.SubSysId), sb1, sb2, sb3);
+            }
+            catch (Exception ex)
+            {
+                string Message = ErrorMessage.PromptErrorMessage(ex);
+                MessageUtil.Show(Message, ex.Message);
+                LogHelper.Instance.WriteError(ex);
+                //LogUtil.WriteError("设置delphi参数错误", ex);
+            }
+        }
+
+
+    }
+}

插件库/Lskj.Notice2/Lskj.Notice.csproj

@@ -152,11 +152,11 @@
     </PostBuildEvent>
   </PropertyGroup>
 	<!--添加大内存处理-->
-	<!--
+
 	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
 		<Exec Command="&quot;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64\editbin.exe&quot; /largeaddressaware &quot;$(TargetPath)&quot;" />
 	</Target>
-	-->
+
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

插件库/Lskj.Notice2/Program.cs

@@ -99,4 +99,29 @@ namespace Lskj.Notice
         class SingleApplication
         {
             [DllImport("Kernel32.dll", CharSet = CharSet.Auto)]
-            private static extern IntPtr OpenMutex(
+            private static extern IntPtr OpenMutex(uint dwDesiredAccess, int bInheritHandle, string lpName);
+            [DllImport("Kernel32.dll", CharSet = CharSet.Auto)]
+            private static extern IntPtr CreateMutex(IntPtr lpMutexAttributes, int bInitialOwner, string lpName);
+
+            public static bool IsRunning(string appID)
+            {
+                bool running = false;
+                if (OpenMutex(0x1F0001, 0, appID) == IntPtr.Zero)
+                {
+                    CreateMutex(IntPtr.Zero, 0, appID);
+                    running = true;
+                }
+                return running;
+            }
+        }
+
+        internal sealed class DemoApp : CefApp
+        {
+            protected override void OnBeforeCommandLineProcessing(string processType, CefCommandLine commandLine)
+            {
+                commandLine.AppendSwitch("ppapi-flash-version", "28.0.0.137");
+                commandLine.AppendSwitch("ppapi-flash-path", @"D:\测试\LSERP\Debug\pepflashplayer.dll");
+            }
+        }
+    }
+}

插件库/Lskj.Notice2/Properties/licenses.licx

@@ -0,0 +1,2 @@
+DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v15.2, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a