diff --git a/AutoWeightServer/App.config b/AutoWeightServer/App.config index d4f8681..fc9af38 100644 --- a/AutoWeightServer/App.config +++ b/AutoWeightServer/App.config @@ -58,7 +58,7 @@ - + diff --git a/AutoWeightServer/Program.cs b/AutoWeightServer/Program.cs index b7a04bf..35d240d 100644 --- a/AutoWeightServer/Program.cs +++ b/AutoWeightServer/Program.cs @@ -27,7 +27,7 @@ namespace EC.AutoWeightServer // 在应用程序启动时运行的代码 log4net.Config.XmlConfigurator.Configure(); - _mutex = new Mutex(false, "FrmServer", out var bCreatedNew); + _mutex = new Mutex(false, "AutoWeightServer", out var bCreatedNew); if (bCreatedNew) { diff --git a/AutoWeightServer/UI/FrmMainServer.cs b/AutoWeightServer/UI/FrmMainServer.cs index cca1bf0..9deb630 100644 --- a/AutoWeightServer/UI/FrmMainServer.cs +++ b/AutoWeightServer/UI/FrmMainServer.cs @@ -36,7 +36,7 @@ namespace EC.AutoWeightServer.UI DeviceCenter = new DeviceCenter(this); LocalAttrCenter.CheckSiteConfig(); - //DeviceCenter.OpenDevices(); + DeviceCenter.OpenDevices(); DeviceCenter.CheckDevicesConnect(); LoadDevicesCallBack(); diff --git a/AutoWeightServer/UI/UC/UCCarIn.cs b/AutoWeightServer/UI/UC/UCCarIn.cs index 3ed2f7e..39f7925 100644 --- a/AutoWeightServer/UI/UC/UCCarIn.cs +++ b/AutoWeightServer/UI/UC/UCCarIn.cs @@ -190,7 +190,6 @@ namespace EC.AutoWeightServer.UI.UC { return; } - //comboBoxTrailer.ItemHeight = 40; e.DrawBackground(); e.DrawFocusRectangle(); e.Graphics.DrawString(comboBoxTrailer.Items[e.Index].ToString(), e.Font, new SolidBrush(e.ForeColor), e.Bounds.X, e.Bounds.Y + 5); diff --git a/dll/Led显示屏/Led5kSDK.dll b/dll/Led显示屏/Led5kSDK.dll new file mode 100644 index 0000000..12d4fc5 Binary files /dev/null and b/dll/Led显示屏/Led5kSDK.dll differ diff --git a/dll/打印机/YkPosdll.dll b/dll/打印机/YkPosdll.dll new file mode 100644 index 0000000..0fbe826 Binary files /dev/null and b/dll/打印机/YkPosdll.dll differ diff --git a/dll/TesoLive.dll b/dll/指纹识别/TesoLive.dll similarity index 100% rename from dll/TesoLive.dll rename to dll/指纹识别/TesoLive.dll