diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo index 3288548..cae0c88 100644 Binary files a/shangjian/.vs/BL/v17/.suo and b/shangjian/.vs/BL/v17/.suo differ diff --git a/shangjian/.vs/BL/v17/HierarchyCache.v1.txt b/shangjian/.vs/BL/v17/HierarchyCache.v1.txt index 4ba5166..aab8c4d 100644 Binary files a/shangjian/.vs/BL/v17/HierarchyCache.v1.txt and b/shangjian/.vs/BL/v17/HierarchyCache.v1.txt differ diff --git a/shangjian/CentralControl/bin/Debug/CentralControl.exe b/shangjian/CentralControl/bin/Debug/CentralControl.exe index 25de04f..789ef5b 100644 Binary files a/shangjian/CentralControl/bin/Debug/CentralControl.exe and b/shangjian/CentralControl/bin/Debug/CentralControl.exe differ diff --git a/shangjian/CentralControl/bin/Debug/CentralControl.pdb b/shangjian/CentralControl/bin/Debug/CentralControl.pdb index f93e585..5f41c34 100644 Binary files a/shangjian/CentralControl/bin/Debug/CentralControl.pdb and b/shangjian/CentralControl/bin/Debug/CentralControl.pdb differ diff --git a/shangjian/CentralControl/bin/Debug/CommonFunc.dll b/shangjian/CentralControl/bin/Debug/CommonFunc.dll index b31403d..f591a25 100644 Binary files a/shangjian/CentralControl/bin/Debug/CommonFunc.dll and b/shangjian/CentralControl/bin/Debug/CommonFunc.dll differ diff --git a/shangjian/CentralControl/bin/Debug/CommonFunc.pdb b/shangjian/CentralControl/bin/Debug/CommonFunc.pdb index f1a57f6..9e04a33 100644 Binary files a/shangjian/CentralControl/bin/Debug/CommonFunc.pdb and b/shangjian/CentralControl/bin/Debug/CommonFunc.pdb differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Data.dll b/shangjian/CentralControl/bin/Debug/XGL.Data.dll index 1af8a2c..2bac640 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Data.dll and b/shangjian/CentralControl/bin/Debug/XGL.Data.dll differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Data.pdb b/shangjian/CentralControl/bin/Debug/XGL.Data.pdb index f1e6d68..c03e316 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Data.pdb and b/shangjian/CentralControl/bin/Debug/XGL.Data.pdb differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Models.dll b/shangjian/CentralControl/bin/Debug/XGL.Models.dll index 2f5a0ce..19c3c94 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Models.dll and b/shangjian/CentralControl/bin/Debug/XGL.Models.dll differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Models.pdb b/shangjian/CentralControl/bin/Debug/XGL.Models.pdb index 7f4fd01..d8b6d40 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Models.pdb and b/shangjian/CentralControl/bin/Debug/XGL.Models.pdb differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Thrift.dll b/shangjian/CentralControl/bin/Debug/XGL.Thrift.dll index 51f5a49..8ebf9f7 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Thrift.dll and b/shangjian/CentralControl/bin/Debug/XGL.Thrift.dll differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb b/shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb index 1570f53..b13127b 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb and b/shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb differ diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache index 93b99b2..1ff2256 100644 Binary files a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache and b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache differ diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.CoreCompileInputs.cache b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.CoreCompileInputs.cache index 580e9dc..bd9c3bb 100644 --- a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.CoreCompileInputs.cache +++ b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -0abd85b80046b9258518751daf3009dfc20e23db +65ea42614d5210ce1f76f304a0b99eadc686e4a3 diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.exe b/shangjian/CentralControl/obj/Debug/CentralControl.exe index 25de04f..789ef5b 100644 Binary files a/shangjian/CentralControl/obj/Debug/CentralControl.exe and b/shangjian/CentralControl/obj/Debug/CentralControl.exe differ diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.pdb b/shangjian/CentralControl/obj/Debug/CentralControl.pdb index f93e585..5f41c34 100644 Binary files a/shangjian/CentralControl/obj/Debug/CentralControl.pdb and b/shangjian/CentralControl/obj/Debug/CentralControl.pdb differ diff --git a/shangjian/CentralControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/CentralControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 96da0ef..e453dd1 100644 Binary files a/shangjian/CentralControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/CentralControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/CommonFunc/DataConfig/SqlDataObject.cs b/shangjian/CommonFunc/DataConfig/SqlDataObject.cs index 9682601..26d2a3e 100644 --- a/shangjian/CommonFunc/DataConfig/SqlDataObject.cs +++ b/shangjian/CommonFunc/DataConfig/SqlDataObject.cs @@ -104,10 +104,11 @@ namespace CommonFunc { get { - ConnectionConfig conSetting = DatabaseConfig.GetSettingsDirectory(); + ConnectionConfig conSetting = DatabaseConfig.GetSettingsDirectory(); return CommonFunc.DESProvider.DecryptString(conSetting.MESNetClientConnectionString); } } + /// /// 获取本地业务库 diff --git a/shangjian/CommonFunc/Tools/Utils.cs b/shangjian/CommonFunc/Tools/Utils.cs index a0b9735..6047058 100644 --- a/shangjian/CommonFunc/Tools/Utils.cs +++ b/shangjian/CommonFunc/Tools/Utils.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Collections.Specialized; using System.Configuration; using System.Data; +using System.Data.SqlClient; using System.Drawing; using System.IO; using System.Linq; @@ -27,6 +28,12 @@ namespace CommonFunc.Tools public static SqlServerDBHelper clientDBHelper = new SqlServerDBHelper(SqlDataObject.GetMESClientSqlConnectionString); public static SqlServerDBHelper netClientDBHelper = new SqlServerDBHelper(SqlDataObject.GetMESNetClientSqlConnectionString); + public static string GetServerIP() + { + SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder(SqlDataObject.GetMESNetClientSqlConnectionString); + string serverIp = builder.DataSource.Split(',')[0]; + return serverIp; + } /// /// 鏍规嵁鏃ユ湡鏌ヨ鍛ㄥぉ /// diff --git a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll index b31403d..f591a25 100644 Binary files a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll and b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll differ diff --git a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb index f1a57f6..9e04a33 100644 Binary files a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb and b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb differ diff --git a/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll b/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll index 2f5a0ce..19c3c94 100644 Binary files a/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll and b/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll differ diff --git a/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb b/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb index 7f4fd01..d8b6d40 100644 Binary files a/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb and b/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb differ diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache index d10243b..1f8ef51 100644 Binary files a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache and b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache differ diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.CoreCompileInputs.cache b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.CoreCompileInputs.cache index a364b84..254535a 100644 --- a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.CoreCompileInputs.cache +++ b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -e89598d9122e10f3091f61c8bf70d5db84bb9e79 +0d3a19775b762537c0ccc61ba08dfd5625bd5f96 diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll index b31403d..f591a25 100644 Binary files a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll and b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll differ diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb index f1a57f6..9e04a33 100644 Binary files a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb and b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb differ diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.cache b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.cache index 9b1985a..7036cf7 100644 --- a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.cache +++ b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.cache @@ -4,7 +4,7 @@ library C# .cs -E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\ +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\ CommonFunc none false @@ -13,7 +13,7 @@ DEBUG;TRACE 12023204370 2-1355062061 241494203934 -44196576213 +44-550732465 HMessageBox.xaml; False diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.lref b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.lref index ff7c908..da2c703 100644 --- a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.lref +++ b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.lref @@ -1,4 +1,4 @@ 锘 -FE:\workspace\LanJu\client\shangjian\CommonFunc\HMessageBox.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\HMessageBox.xaml;; diff --git a/shangjian/CommonFunc/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/CommonFunc/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 1395cef..76a7005 100644 Binary files a/shangjian/CommonFunc/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/CommonFunc/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/LanJu/bin/Debug/LanJu.exe b/shangjian/LanJu/bin/Debug/LanJu.exe index 462c818..7587aba 100644 Binary files a/shangjian/LanJu/bin/Debug/LanJu.exe and b/shangjian/LanJu/bin/Debug/LanJu.exe differ diff --git a/shangjian/LanJu/bin/Debug/LanJu.pdb b/shangjian/LanJu/bin/Debug/LanJu.pdb index 9611020..8e82317 100644 Binary files a/shangjian/LanJu/bin/Debug/LanJu.pdb and b/shangjian/LanJu/bin/Debug/LanJu.pdb differ diff --git a/shangjian/LanJu/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/LanJu/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 738a6e9..0e7e93d 100644 Binary files a/shangjian/LanJu/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/LanJu/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/LanJu/obj/Debug/LanJu.csproj.AssemblyReference.cache b/shangjian/LanJu/obj/Debug/LanJu.csproj.AssemblyReference.cache index 8d7474d..419e11d 100644 Binary files a/shangjian/LanJu/obj/Debug/LanJu.csproj.AssemblyReference.cache and b/shangjian/LanJu/obj/Debug/LanJu.csproj.AssemblyReference.cache differ diff --git a/shangjian/LanJu/obj/Debug/LanJu.csproj.CoreCompileInputs.cache b/shangjian/LanJu/obj/Debug/LanJu.csproj.CoreCompileInputs.cache index 7f1439f..a0fb44e 100644 --- a/shangjian/LanJu/obj/Debug/LanJu.csproj.CoreCompileInputs.cache +++ b/shangjian/LanJu/obj/Debug/LanJu.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -bc174b8fc67ac08f66a67e37a513d69b6869cfa6 +51790d22c3b0468f4e446c933001b592c3e5c2c3 diff --git a/shangjian/LanJu/obj/Debug/LanJu.csproj.GenerateResource.cache b/shangjian/LanJu/obj/Debug/LanJu.csproj.GenerateResource.cache index bdf8a26..a73f463 100644 Binary files a/shangjian/LanJu/obj/Debug/LanJu.csproj.GenerateResource.cache and b/shangjian/LanJu/obj/Debug/LanJu.csproj.GenerateResource.cache differ diff --git a/shangjian/LanJu/obj/Debug/LanJu.exe b/shangjian/LanJu/obj/Debug/LanJu.exe index 462c818..7587aba 100644 Binary files a/shangjian/LanJu/obj/Debug/LanJu.exe and b/shangjian/LanJu/obj/Debug/LanJu.exe differ diff --git a/shangjian/LanJu/obj/Debug/LanJu.pdb b/shangjian/LanJu/obj/Debug/LanJu.pdb index 9611020..8e82317 100644 Binary files a/shangjian/LanJu/obj/Debug/LanJu.pdb and b/shangjian/LanJu/obj/Debug/LanJu.pdb differ diff --git a/shangjian/LanJu/obj/Debug/LanJu_MarkupCompile.cache b/shangjian/LanJu/obj/Debug/LanJu_MarkupCompile.cache index f44f5d0..6a5ba16 100644 --- a/shangjian/LanJu/obj/Debug/LanJu_MarkupCompile.cache +++ b/shangjian/LanJu/obj/Debug/LanJu_MarkupCompile.cache @@ -4,12 +4,12 @@ winexe C# .cs -E:\workspace\LanJu\client\shangjian\LanJu\obj\Debug\ +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\obj\Debug\ LanJu none false DEBUG;TRACE -E:\workspace\LanJu\client\shangjian\LanJu\App.xaml +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\App.xaml 9-1725419280 131720844138 diff --git a/shangjian/LanJu/obj/Debug/LanJu_MarkupCompile.lref b/shangjian/LanJu/obj/Debug/LanJu_MarkupCompile.lref index ea23b0e..95a3601 100644 --- a/shangjian/LanJu/obj/Debug/LanJu_MarkupCompile.lref +++ b/shangjian/LanJu/obj/Debug/LanJu_MarkupCompile.lref @@ -1,12 +1,12 @@ 锘 -FE:\workspace\LanJu\client\shangjian\LanJu\MainWindow.xaml;; -FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Complete.xaml;; -FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_DeviceItems.xaml;; -FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Flow.xaml;; -FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Index.xaml;; -FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Material.xaml;; -FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Operator.xaml;; -FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Paused.xaml;; -FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Prepare.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\MainWindow.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Complete.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_DeviceItems.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Flow.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Index.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Material.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Operator.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Paused.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Prepare.xaml;; diff --git a/shangjian/LanJuControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/LanJuControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index cb9a280..99de0be 100644 Binary files a/shangjian/LanJuControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/LanJuControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/LanJuControl/obj/Debug/LanJuControl.csproj.AssemblyReference.cache b/shangjian/LanJuControl/obj/Debug/LanJuControl.csproj.AssemblyReference.cache index b7c22d6..e653b41 100644 Binary files a/shangjian/LanJuControl/obj/Debug/LanJuControl.csproj.AssemblyReference.cache and b/shangjian/LanJuControl/obj/Debug/LanJuControl.csproj.AssemblyReference.cache differ diff --git a/shangjian/LanJuLib/bin/Debug/CommonFunc.dll b/shangjian/LanJuLib/bin/Debug/CommonFunc.dll index b31403d..f591a25 100644 Binary files a/shangjian/LanJuLib/bin/Debug/CommonFunc.dll and b/shangjian/LanJuLib/bin/Debug/CommonFunc.dll differ diff --git a/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb b/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb index f1a57f6..9e04a33 100644 Binary files a/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb and b/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb differ diff --git a/shangjian/LanJuLib/bin/Debug/LanJuLib.dll b/shangjian/LanJuLib/bin/Debug/LanJuLib.dll index d6b2065..26b49a0 100644 Binary files a/shangjian/LanJuLib/bin/Debug/LanJuLib.dll and b/shangjian/LanJuLib/bin/Debug/LanJuLib.dll differ diff --git a/shangjian/LanJuLib/bin/Debug/LanJuLib.pdb b/shangjian/LanJuLib/bin/Debug/LanJuLib.pdb index 2c98b2c..a6ba9df 100644 Binary files a/shangjian/LanJuLib/bin/Debug/LanJuLib.pdb and b/shangjian/LanJuLib/bin/Debug/LanJuLib.pdb differ diff --git a/shangjian/LanJuLib/bin/Debug/XGL.Models.dll b/shangjian/LanJuLib/bin/Debug/XGL.Models.dll index 2f5a0ce..19c3c94 100644 Binary files a/shangjian/LanJuLib/bin/Debug/XGL.Models.dll and b/shangjian/LanJuLib/bin/Debug/XGL.Models.dll differ diff --git a/shangjian/LanJuLib/bin/Debug/XGL.Models.pdb b/shangjian/LanJuLib/bin/Debug/XGL.Models.pdb index 7f4fd01..d8b6d40 100644 Binary files a/shangjian/LanJuLib/bin/Debug/XGL.Models.pdb and b/shangjian/LanJuLib/bin/Debug/XGL.Models.pdb differ diff --git a/shangjian/LanJuLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/LanJuLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 43b5a5e..b37635e 100644 Binary files a/shangjian/LanJuLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/LanJuLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache index 39ef70e..9aa1a51 100644 Binary files a/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache and b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache differ diff --git a/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.CoreCompileInputs.cache b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.CoreCompileInputs.cache index ad46bb4..cc8d6fc 100644 --- a/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.CoreCompileInputs.cache +++ b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -93e6bdf40a6f5d4b88993bae3e272b7f08763f68 +75b64367c22655afbbe469bfdef148da7e480363 diff --git a/shangjian/LanJuLib/obj/Debug/LanJuLib.dll b/shangjian/LanJuLib/obj/Debug/LanJuLib.dll index d6b2065..26b49a0 100644 Binary files a/shangjian/LanJuLib/obj/Debug/LanJuLib.dll and b/shangjian/LanJuLib/obj/Debug/LanJuLib.dll differ diff --git a/shangjian/LanJuLib/obj/Debug/LanJuLib.pdb b/shangjian/LanJuLib/obj/Debug/LanJuLib.pdb index 2c98b2c..a6ba9df 100644 Binary files a/shangjian/LanJuLib/obj/Debug/LanJuLib.pdb and b/shangjian/LanJuLib/obj/Debug/LanJuLib.pdb differ diff --git a/shangjian/XGL.Data/DBService/DBService.cs b/shangjian/XGL.Data/DBService/DBService.cs index cbb43b4..5abfee1 100644 --- a/shangjian/XGL.Data/DBService/DBService.cs +++ b/shangjian/XGL.Data/DBService/DBService.cs @@ -652,7 +652,7 @@ wetDetail.product_name,wet.shift_desc,prod_line_code,workorder.status,sync_flag from pro_wet_material_plan wet LEFT JOIN pro_wet_material_plan_detail wetDetail on wet.id = wetDetail.wet_material_plan_id -left join pro_order_workorder workorder on workorder.workorder_id = wetDetail.workorder_id +left join pro_order_workorder workorder on workorder.workorder_id = wetDetail.workorder_id where 1=1 and workorder.status = 'w1' "; //where CONVERT(VARCHAR(10), wet.plan_time , 120)= CONVERT(VARCHAR(10), GetDate() , 120) DataSet dtset = Utils.netClientDBHelper.getDataSet(sql); if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) @@ -697,7 +697,7 @@ left join pro_order_workorder workorder on workorder.workorder_id = wetDetail.wo /// public DataTable GetCXJList(string workOrderNo) { - string sql = $@"select prod_line_code + string sql = $@"select prod_line_code,bucket_code from pro_wet_material_plan wet LEFT JOIN pro_wet_material_plan_detail wetDetail on wet.id = wetDetail.wet_material_plan_id diff --git a/shangjian/XGL.Data/DBService/DringRoomService.cs b/shangjian/XGL.Data/DBService/DringRoomService.cs index af243a7..528302b 100644 --- a/shangjian/XGL.Data/DBService/DringRoomService.cs +++ b/shangjian/XGL.Data/DBService/DringRoomService.cs @@ -41,9 +41,9 @@ namespace XGL.Data.DBService { //鑾峰彇缁戝畾涓紝涓擱FID娌℃湁鍑虹儤鎴匡紙鍦ㄧ儤鎴垮唴锛夌殑鏁版嵁 string sql = $@"SELECT rfid,workorder_code,product_name,product_code,isnull(car_num,0) as car_num,isnull([begin],'1900-01-01 08:00:00') as [begin],ord.status FROM [dbo].[mes_material_transfer_result] res -LEFT JOIN pro_order_workorder ord on res.OrderCode = ord.workorder_id -where rfid !=null and equipmentCode = '{devicecode}' and rfid_status = '1' and rfid not in(select rfid from mes_material_transfer_result where taskcode = '1' and rfid_status = '1') -"; +LEFT JOIN pro_order_workorder ord on res.OrderCode = ord.workorder_id"; + //where rfid !=null and equipmentCode = '{devicecode}' and rfid_status = '1' and rfid not in(select rfid from mes_material_transfer_result where taskcode = '1' and rfid_status = '1') + DataSet dtset = Utils.netClientDBHelper.getDataSet(sql); if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) diff --git a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll index b31403d..f591a25 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll and b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb index f1a57f6..9e04a33 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb and b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/LanJu.exe b/shangjian/XGL.Data/bin/x86/Debug/LanJu.exe index 462c818..7587aba 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/LanJu.exe and b/shangjian/XGL.Data/bin/x86/Debug/LanJu.exe differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/LanJu.pdb b/shangjian/XGL.Data/bin/x86/Debug/LanJu.pdb index 9611020..8e82317 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/LanJu.pdb and b/shangjian/XGL.Data/bin/x86/Debug/LanJu.pdb differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.dll b/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.dll index d6b2065..26b49a0 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.dll and b/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.dll differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.pdb b/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.pdb index 2c98b2c..a6ba9df 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.pdb and b/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.pdb differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll index 1af8a2c..2bac640 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll and b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb index f1e6d68..c03e316 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb and b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll b/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll index 2f5a0ce..19c3c94 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll and b/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb b/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb index 7f4fd01..d8b6d40 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb and b/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb differ diff --git a/shangjian/XGL.Data/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/XGL.Data/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 8a912f5..17c5389 100644 Binary files a/shangjian/XGL.Data/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/XGL.Data/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache index 20adc37..ea9fa3d 100644 Binary files a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache and b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache differ diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.CoreCompileInputs.cache b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.CoreCompileInputs.cache index dd0a787..da343cf 100644 --- a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.CoreCompileInputs.cache +++ b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.CoreCompileInputs.cache @@ -1,5 +1 @@ -<<<<<<< HEAD -fbc0cc7e40c5cf1726e3b3ecaa740b610d52f69f -======= 79f02adf94b81a462e2d021ffaeb806c569f29e2 ->>>>>>> babf7ea9e37642c626439584d080cf06049abc5f diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll index 1af8a2c..2bac640 100644 Binary files a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll and b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll differ diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb index f1e6d68..c03e316 100644 Binary files a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb and b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb differ diff --git a/shangjian/XGL.Model/bin/Debug/XGL.Models.dll b/shangjian/XGL.Model/bin/Debug/XGL.Models.dll index 2f5a0ce..19c3c94 100644 Binary files a/shangjian/XGL.Model/bin/Debug/XGL.Models.dll and b/shangjian/XGL.Model/bin/Debug/XGL.Models.dll differ diff --git a/shangjian/XGL.Model/bin/Debug/XGL.Models.pdb b/shangjian/XGL.Model/bin/Debug/XGL.Models.pdb index 7f4fd01..d8b6d40 100644 Binary files a/shangjian/XGL.Model/bin/Debug/XGL.Models.pdb and b/shangjian/XGL.Model/bin/Debug/XGL.Models.pdb differ diff --git a/shangjian/XGL.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/XGL.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index aa73f2f..1a962e1 100644 Binary files a/shangjian/XGL.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/XGL.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.AssemblyReference.cache b/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.AssemblyReference.cache index 1fa3a3f..709a5dc 100644 Binary files a/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.AssemblyReference.cache and b/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.AssemblyReference.cache differ diff --git a/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache b/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache index 8734ccc..0d14476 100644 --- a/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache +++ b/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache @@ -1,5 +1 @@ -<<<<<<< HEAD -447124d86454b5028e0096d5af8102cbe476aa0c -======= 15e0079c678473a5e3606350c39806472a1461a2 ->>>>>>> babf7ea9e37642c626439584d080cf06049abc5f diff --git a/shangjian/XGL.Model/obj/Debug/XGL.Models.dll b/shangjian/XGL.Model/obj/Debug/XGL.Models.dll index 2f5a0ce..19c3c94 100644 Binary files a/shangjian/XGL.Model/obj/Debug/XGL.Models.dll and b/shangjian/XGL.Model/obj/Debug/XGL.Models.dll differ diff --git a/shangjian/XGL.Model/obj/Debug/XGL.Models.pdb b/shangjian/XGL.Model/obj/Debug/XGL.Models.pdb index 7f4fd01..d8b6d40 100644 Binary files a/shangjian/XGL.Model/obj/Debug/XGL.Models.pdb and b/shangjian/XGL.Model/obj/Debug/XGL.Models.pdb differ diff --git a/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll b/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll index 51f5a49..8ebf9f7 100644 Binary files a/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll and b/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll differ diff --git a/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb b/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb index 1570f53..b13127b 100644 Binary files a/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb and b/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb differ diff --git a/shangjian/XGL.Thrift/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/XGL.Thrift/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 12e4358..44594cb 100644 Binary files a/shangjian/XGL.Thrift/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/XGL.Thrift/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.csproj.AssemblyReference.cache b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.csproj.AssemblyReference.cache index 7cc9889..cf52ee4 100644 Binary files a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.csproj.AssemblyReference.cache and b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.csproj.AssemblyReference.cache differ diff --git a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.csproj.CoreCompileInputs.cache b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.csproj.CoreCompileInputs.cache index 64a63a1..ffad49a 100644 --- a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.csproj.CoreCompileInputs.cache +++ b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -da04babf50ef3035790f6c85a018240439a4cf82 +4c1eda63a6eb933282d4915d9cfa5b18a18739b1 diff --git a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll index 51f5a49..8ebf9f7 100644 Binary files a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll and b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll differ diff --git a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb index 1570f53..b13127b 100644 Binary files a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb and b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb differ diff --git a/shangjian/XGL/App.config b/shangjian/XGL/App.config index ada0642..290378f 100644 --- a/shangjian/XGL/App.config +++ b/shangjian/XGL/App.config @@ -11,8 +11,8 @@ - - + + diff --git a/shangjian/XGL/FormItem/Main.xaml b/shangjian/XGL/FormItem/Main.xaml index e845632..6769236 100644 --- a/shangjian/XGL/FormItem/Main.xaml +++ b/shangjian/XGL/FormItem/Main.xaml @@ -6,6 +6,7 @@ xmlns:local="clr-namespace:XGL.FormItem" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" Title="Main" + xmlns:convert="clr-namespace:XGL.Tools" Width="1920" Height="1080" Closed="Close" @@ -194,6 +195,7 @@ + @@ -473,20 +475,22 @@ HorizontalAlignment="Left" Content="缃戠粶鐘舵" FontSize="20px" - Foreground="Black" /> + Foreground="Black" VerticalContentAlignment="Center"/> + + + + + -