diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo index 6ed61d7..3f8555b 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 7b0b58e..28cb238 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/AutoUpdate/AutoUpdate.csproj b/shangjian/AutoUpdate/AutoUpdate.csproj index 4935b8d..8deb773 100644 --- a/shangjian/AutoUpdate/AutoUpdate.csproj +++ b/shangjian/AutoUpdate/AutoUpdate.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -10,7 +10,7 @@ Properties AutoUpdate AutoUpdate - v4.0 + v4.8 512 @@ -40,6 +40,7 @@ DEBUG;TRACE prompt 4 + false x86 @@ -49,6 +50,7 @@ TRACE prompt 4 + false B79830EB53749E3CA010339FCCAE937893ABE790 diff --git a/shangjian/AutoUpdate/Properties/Resources.Designer.cs b/shangjian/AutoUpdate/Properties/Resources.Designer.cs index 145de91..dd18b6a 100644 --- a/shangjian/AutoUpdate/Properties/Resources.Designer.cs +++ b/shangjian/AutoUpdate/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace AutoUpdate.Properties { // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // (以 /str 作为命令选项)，或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -47,8 +47,8 @@ namespace AutoUpdate.Properties { } /// - /// 使用此强类型资源类，为所有资源查找 - /// 重写当前线程的 CurrentUICulture 属性。 + /// 重写当前线程的 CurrentUICulture 属性，对 + /// 使用此强类型资源类的所有资源查找执行重写。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { diff --git a/shangjian/AutoUpdate/Properties/Settings.Designer.cs b/shangjian/AutoUpdate/Properties/Settings.Designer.cs index 12f1481..c639f19 100644 --- a/shangjian/AutoUpdate/Properties/Settings.Designer.cs +++ b/shangjian/AutoUpdate/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace AutoUpdate.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.2.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -26,7 +26,7 @@ namespace AutoUpdate.Properties { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)] - [global::System.Configuration.DefaultSettingValueAttribute("http://localhost/WebService/AutoUpdate.asmx")] + [global::System.Configuration.DefaultSettingValueAttribute("http://192.168.0.66/WebService/AutoUpdate.asmx")] public string AutoUpdate_autoUpdateVersion_WebService { get { return ((string)(this["AutoUpdate_autoUpdateVersion_WebService"])); diff --git a/shangjian/AutoUpdate/Web References/autoUpdateVersion/Reference.cs b/shangjian/AutoUpdate/Web References/autoUpdateVersion/Reference.cs index 7b316a3..4442dfb 100644 --- a/shangjian/AutoUpdate/Web References/autoUpdateVersion/Reference.cs +++ b/shangjian/AutoUpdate/Web References/autoUpdateVersion/Reference.cs @@ -14,16 +14,16 @@ #pragma warning disable 1591 namespace AutoUpdate.autoUpdateVersion { - using System; - using System.Web.Services; using System.Diagnostics; - using System.Web.Services.Protocols; + using System; using System.Xml.Serialization; using System.ComponentModel; + using System.Web.Services.Protocols; + using System.Web.Services; /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2046.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Web.Services.WebServiceBindingAttribute(Name="AutoUpdateSoap", Namespace="http://tempuri.org/")] @@ -39,7 +39,7 @@ namespace AutoUpdate.autoUpdateVersion { /// public AutoUpdate() { - this.Url = global::AutoUpdate.Properties.Settings.Default.AutoUpdate_autoUpdateVersion_WebService; + this.Url = "http://localhost:800/WebService/AutoUpdate.asmx"; if ((this.IsLocalFileSystemWebService(this.Url) == true)) { this.UseDefaultCredentials = true; this.useDefaultCredentialsSetExplicitly = false; @@ -184,11 +184,11 @@ namespace AutoUpdate.autoUpdateVersion { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2046.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] public delegate void ZipFileCompletedEventHandler(object sender, ZipFileCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2046.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class ZipFileCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -210,15 +210,15 @@ namespace AutoUpdate.autoUpdateVersion { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2046.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] public delegate void deleteFileCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2046.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] public delegate void getFileVersionCompletedEventHandler(object sender, getFileVersionCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2046.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class getFileVersionCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { diff --git a/shangjian/AutoUpdate/app.config b/shangjian/AutoUpdate/app.config index 638198d..8e391f3 100644 --- a/shangjian/AutoUpdate/app.config +++ b/shangjian/AutoUpdate/app.config @@ -19,4 +19,4 @@ - + diff --git a/shangjian/AutoUpdate/obj/x86/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs b/shangjian/AutoUpdate/obj/x86/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs new file mode 100644 index 0000000..15efebf --- /dev/null +++ b/shangjian/AutoUpdate/obj/x86/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")] diff --git a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.AssemblyReference.cache b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.AssemblyReference.cache new file mode 100644 index 0000000..5b62898 Binary files /dev/null and b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.AssemblyReference.cache differ diff --git a/shangjian/AutoUpdate/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/shangjian/AutoUpdate/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache new file mode 100644 index 0000000..005e4f6 Binary files /dev/null and b/shangjian/AutoUpdate/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/shangjian/AutoUpdate/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/AutoUpdate/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index d56dda8..946926c 100644 Binary files a/shangjian/AutoUpdate/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/AutoUpdate/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/AutoUpdate/obj/x86/Debug/TempPE/Properties.Resources.Designer.cs.dll b/shangjian/AutoUpdate/obj/x86/Debug/TempPE/Properties.Resources.Designer.cs.dll index 08965c4..b1818f1 100644 Binary files a/shangjian/AutoUpdate/obj/x86/Debug/TempPE/Properties.Resources.Designer.cs.dll and b/shangjian/AutoUpdate/obj/x86/Debug/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/shangjian/AutoUpdate/obj/x86/Debug/TempPE/Web References.autoUpdateVersion.Reference.cs.dll b/shangjian/AutoUpdate/obj/x86/Debug/TempPE/Web References.autoUpdateVersion.Reference.cs.dll index fa26dd0..9049269 100644 Binary files a/shangjian/AutoUpdate/obj/x86/Debug/TempPE/Web References.autoUpdateVersion.Reference.cs.dll and b/shangjian/AutoUpdate/obj/x86/Debug/TempPE/Web References.autoUpdateVersion.Reference.cs.dll differ diff --git a/shangjian/BL.sln b/shangjian/BL.sln index 4c80daf..80d1592 100644 --- a/shangjian/BL.sln +++ b/shangjian/BL.sln @@ -21,6 +21,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanJuControl", "LanJuContro EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanJuLib", "LanJuLib\LanJuLib.csproj", "{215B04E3-57B4-40B2-BA23-532DCEA86E1F}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoUpdate", "AutoUpdate\AutoUpdate.csproj", "{341AD485-E4A2-4A2C-9E93-9D4E360D692C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -253,6 +255,30 @@ Global {215B04E3-57B4-40B2-BA23-532DCEA86E1F}.Release|x64.Build.0 = Release|Any CPU {215B04E3-57B4-40B2-BA23-532DCEA86E1F}.Release|x86.ActiveCfg = Release|Any CPU {215B04E3-57B4-40B2-BA23-532DCEA86E1F}.Release|x86.Build.0 = Release|Any CPU + {341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Debug|Any CPU.ActiveCfg = Debug|x86 + {341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Debug|Any CPU.Build.0 = Debug|x86 + {341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Debug|ARM.ActiveCfg = Debug|x86 + {341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Debug|ARM.Build.0 = Debug|x86 + {341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Debug|ARM64.ActiveCfg = Debug|x86 + {341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Debug|ARM64.Build.0 = Debug|x86 + {341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Debug|x64.ActiveCfg = Debug|x86 + {341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Debug|x64.Build.0 = Debug|x86 + {341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Debug|x86.ActiveCfg = Debug|x86 + {341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Debug|x86.Build.0 = Debug|x86 + {341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Release|Any CPU.ActiveCfg = Release|x86 + {341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Release|Any CPU.Build.0 = Release|x86 + {341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Release|ARM.ActiveCfg = Release|x86 + {341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Release|ARM.Build.0 = Release|x86 + {341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Release|ARM64.ActiveCfg = Release|x86 + {341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Release|ARM64.Build.0 = Release|x86 + {341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Release|Mixed Platforms.ActiveCfg = Release|x86 + {341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Release|Mixed Platforms.Build.0 = Release|x86 + {341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Release|x64.ActiveCfg = Release|x86 + {341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Release|x64.Build.0 = Release|x86 + {341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Release|x86.ActiveCfg = Release|x86 + {341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/shangjian/CentralControl/bin/Debug/CentralControl.exe b/shangjian/CentralControl/bin/Debug/CentralControl.exe index 4e785d2..fcb9bfa 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 c227995..83bc444 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 2184338..f7152c1 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 58f85d5..65e2e5e 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 2be1b87..5c898fa 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 abad8de..3d0d023 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 08b7ea3..5c25e29 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 d91e903..fa77292 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/obj/Debug/CentralControl.csproj.AssemblyReference.cache b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache index 1a86455..a03a044 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.exe b/shangjian/CentralControl/obj/Debug/CentralControl.exe index 4e785d2..fcb9bfa 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 c227995..83bc444 100644 Binary files a/shangjian/CentralControl/obj/Debug/CentralControl.pdb and b/shangjian/CentralControl/obj/Debug/CentralControl.pdb differ diff --git a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll index 2184338..f7152c1 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 58f85d5..65e2e5e 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 08b7ea3..5c25e29 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 d91e903..fa77292 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 4c3caed..2ce9f55 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.dll b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll index 2184338..f7152c1 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 58f85d5..65e2e5e 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/LanJuLib/bin/Debug/CommonFunc.dll b/shangjian/LanJuLib/bin/Debug/CommonFunc.dll index 2184338..f7152c1 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 58f85d5..65e2e5e 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/XGL.Models.dll b/shangjian/LanJuLib/bin/Debug/XGL.Models.dll index 08b7ea3..5c25e29 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 d91e903..fa77292 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/LanJuLib.csproj.AssemblyReference.cache b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache index 0df669c..05e1132 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/XGL.Data/DBService/FormingMachineService.cs b/shangjian/XGL.Data/DBService/FormingMachineService.cs index 60d4a81..c9817db 100644 --- a/shangjian/XGL.Data/DBService/FormingMachineService.cs +++ b/shangjian/XGL.Data/DBService/FormingMachineService.cs @@ -19,12 +19,13 @@ namespace XGL.Data.DBService /// public DataTable GetFormingMachineInfo(string devicecode) { - string sql = $@"SELECT ord.workorder_id,ord.workorder_code,res.OrderCode,product_name,product_code,isnull(car_num,0) as car_num, -isnull([begin],'1900-01-01 08:00:00') as [begin],ord.status ,ord.route_code,ord.attr1,work_batch_code,res.taskcode,res.rfid -FROM [dbo].[mes_material_transfer_result] res -LEFT JOIN pro_order_workorder ord on res.OrderCode = ord.workorder_id + string sql = $@"SELECT DISTINCT ord.workorder_id,ord.workorder_code,res.OrderCode,ord.product_name,product_code,isnull(car_num,0) as car_num, +isnull(plan_time,'1900-01-01 08:00:00') as plan_time,ord.status ,ord.route_code,ord.attr1,COUNT(*) OVER () AS totalCount +FROM pro_order_workorder ord +left JOIN pro_wet_material_plan_detail wet on wet.workorder_id = ord.workorder_id +LEFT JOIN mes_material_transfer_result res on ord.workorder_id = res.OrderCode LEFT JOIN pro_rfid_process_detail rfid on rfid.workorder_code = ord.workorder_code and rfid.rfid = res.rfid -where equipmentCode = '{devicecode}' and rfid_status = '1'; "; +where equipmentCode = '{devicecode}' and CONVERT(VARCHAR(10), res.update_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) @@ -61,9 +62,13 @@ where equipmentCode = '{devicecode}' and rfid_status = '1'; "; /// public DataTable GetInOutHistoryList(string devicecode) { - string sql = $@"SELECT workorder_code,product_name,product_code,isnull(car_num,0) as car_num,isnull([begin],'1900-00-00') as [begin],isnull([beout],'1900-00-00') as [beout],ord.status,product_date,ord.create_time,create_by FROM [dbo].[mes_material_transfer_result] res + string sql = $@"SELECT ord.workorder_id,ord.workorder_code,res.OrderCode,ord.product_name,product_code,isnull(car_num,0) as car_num, +isnull([begin],'1900-01-01 08:00:00') as [begin],ord.status,ord.route_code,ord.attr1,work_batch_code,res.taskcode,res.rfid,plan_time ,res.update_time +FROM [dbo].[mes_material_transfer_result] res LEFT JOIN pro_order_workorder ord on res.OrderCode = ord.workorder_id -where equipmentCode = '{devicecode}'; "; +left JOIN pro_wet_material_plan_detail wet on wet.workorder_id = ord.workorder_id +LEFT JOIN pro_rfid_process_detail rfid on rfid.workorder_code = ord.workorder_code and rfid.rfid = res.rfid +where equipmentCode = '{devicecode}' and res.OrderCode is not null ORDER BY plan_time desc; "; DataSet dtset = Utils.netClientDBHelper.getDataSet(sql); if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) @@ -82,9 +87,16 @@ where equipmentCode = '{devicecode}'; "; public DataTable GetCompleteHistoryList(string devicecode) { //taskcode=1,当前机台完成，ord.status = 'w3'当前工单完成 - string sql = $@"SELECT workorder_code,product_name,product_code,isnull(car_num,0) as car_num,isnull([begin],'1900-00-00') as [begin],beout,ord.status,product_date,ord.create_time FROM [dbo].[mes_material_transfer_result] res + // string sql = $@"SELECT workorder_code,product_name,product_code,isnull(car_num,0) as car_num,isnull([begin],'1900-00-00') as [begin],beout,ord.status,product_date,ord.create_time FROM [dbo].[mes_material_transfer_result] res + //LEFT JOIN pro_order_workorder ord on res.OrderCode = ord.workorder_id + //where res.taskcode = '1' and equipmentCode = '{devicecode}'; "; + string sql = $@"SELECT ord.workorder_id,ord.workorder_code,res.OrderCode,ord.product_name,product_code,isnull(car_num,0) as car_num, +isnull([begin],'1900-01-01 08:00:00') as [begin],ord.status ,ord.route_code,ord.attr1,work_batch_code,res.taskcode,res.rfid,plan_time ,res.update_time +FROM [dbo].[mes_material_transfer_result] res LEFT JOIN pro_order_workorder ord on res.OrderCode = ord.workorder_id -where res.taskcode = '1' and equipmentCode = '{devicecode}'; "; +left JOIN pro_wet_material_plan_detail wet on wet.workorder_id = ord.workorder_id +LEFT JOIN pro_rfid_process_detail rfid on rfid.workorder_code = ord.workorder_code and rfid.rfid = res.rfid +where res.taskcode = '0' and equipmentCode = 'C6' and res.OrderCode is not null ORDER BY plan_time; "; 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 2184338..f7152c1 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 58f85d5..65e2e5e 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/XGL.Data.dll b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll index 2be1b87..5c898fa 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 abad8de..3d0d023 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 08b7ea3..5c25e29 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 d91e903..fa77292 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/XGL.Data.csproj.AssemblyReference.cache b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache index e019020..8aff212 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.dll b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll index 2be1b87..5c898fa 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 abad8de..3d0d023 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/Model/FoamingMac/FoamingMacModel.cs b/shangjian/XGL.Model/Model/FoamingMac/FoamingMacModel.cs index a46abb0..4ff6bc1 100644 --- a/shangjian/XGL.Model/Model/FoamingMac/FoamingMacModel.cs +++ b/shangjian/XGL.Model/Model/FoamingMac/FoamingMacModel.cs @@ -18,6 +18,8 @@ namespace XGL.Models.Model.FoamingMac public int car_num { get; set; } public DateTime? begin { get; set; } public DateTime? beout { get; set; } + public DateTime? plan_time { get; set; } + public string update_time { get; set; } public string status { get; set; } public string product_date { get; set; } @@ -28,5 +30,7 @@ namespace XGL.Models.Model.FoamingMac public string work_batch_code { get; set; } public string taskcode { get; set; } public string rfid { get; set; } + + public string totalCount { get; set; } } } diff --git a/shangjian/XGL.Model/bin/Debug/XGL.Models.dll b/shangjian/XGL.Model/bin/Debug/XGL.Models.dll index 08b7ea3..5c25e29 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 d91e903..fa77292 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/XGL.Models.dll b/shangjian/XGL.Model/obj/Debug/XGL.Models.dll index 08b7ea3..5c25e29 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 d91e903..fa77292 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/Views/LanJu_Complete.xaml b/shangjian/XGL/Views/LanJu_Complete.xaml index ba8fa73..fcd250e 100644 --- a/shangjian/XGL/Views/LanJu_Complete.xaml +++ b/shangjian/XGL/Views/LanJu_Complete.xaml @@ -4,10 +4,20 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:XGL.Views" - xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:convert="clr-namespace:XGL.Tools" Width="1920" Height="330" mc:Ignorable="d" Loaded="UserControl_Loaded"> + + + + + + diff --git a/shangjian/XGL/Views/LanJu_Complete.xaml.cs b/shangjian/XGL/Views/LanJu_Complete.xaml.cs index 4eb27ba..3ee983a 100644 --- a/shangjian/XGL/Views/LanJu_Complete.xaml.cs +++ b/shangjian/XGL/Views/LanJu_Complete.xaml.cs @@ -57,8 +57,8 @@ namespace XGL.Views order.product_code = i["product_code"].ToString(); order.car_num = Convert.ToInt32(i["car_num"].ToString()); - order.product_date = i["product_date"].ToString(); - order.create_by = i["create_by"].ToString(); + order.product_date = i["update_time"].ToString(); + //order.create_by = i["create_by"].ToString(); orderList.Add(order); @@ -70,5 +70,10 @@ namespace XGL.Views LogHelper.instance.log.Error("获取完成记录信息时发生异常：" + ex.Message); } } + + private void datagrid1_LoadingRow(object sender, DataGridRowEventArgs e) + { + e.Row.Header = (e.Row.GetIndex() + 1).ToString(); + } } } diff --git a/shangjian/XGL/Views/LanJu_InOut.xaml b/shangjian/XGL/Views/LanJu_InOut.xaml index 255d5e9..1f1b520 100644 --- a/shangjian/XGL/Views/LanJu_InOut.xaml +++ b/shangjian/XGL/Views/LanJu_InOut.xaml @@ -4,9 +4,9 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:XGL.Views" - xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:convert="clr-namespace:XGL.Tools" Width="1920" - Height="330" + MinHeight="330" mc:Ignorable="d" Loaded="UserControl_Loaded"> + + + - + @@ -57,11 +60,23 @@ - + + + + + + + + + + + + + diff --git a/shangjian/XGL/Views/LanJu_InOut.xaml.cs b/shangjian/XGL/Views/LanJu_InOut.xaml.cs index b735b26..963681e 100644 --- a/shangjian/XGL/Views/LanJu_InOut.xaml.cs +++ b/shangjian/XGL/Views/LanJu_InOut.xaml.cs @@ -56,9 +56,15 @@ namespace XGL.Views order.begin = Convert.ToDateTime(i["begin"].ToString()); //order.beout = Convert.ToDateTime(i["beout"].ToString()); order.product_code = i["product_code"].ToString(); + order.product_name = i["product_name"].ToString(); order.car_num = Convert.ToInt32(i["car_num"].ToString()); - order.product_date = i["product_date"].ToString(); - order.create_by = i["create_by"].ToString(); + order.product_date = i["plan_time"].ToString(); + order.update_time = i["update_time"].ToString(); + order.status = i["status"].ToString(); + order.work_batch_code = i["work_batch_code"].ToString(); + order.attr1 = i["attr1"].ToString(); + order.taskcode = i["taskcode"].ToString(); + order.rfid = i["rfid"].ToString(); orderList.Add(order); diff --git a/shangjian/XGL/Views/LanJu_Operator.xaml b/shangjian/XGL/Views/LanJu_Operator.xaml index bdb4b19..ffd23b9 100644 --- a/shangjian/XGL/Views/LanJu_Operator.xaml +++ b/shangjian/XGL/Views/LanJu_Operator.xaml @@ -138,7 +138,7 @@ - @@ -158,7 +158,7 @@ Text="完成" /> - + --> - + - - - + + + - - - + + + + + @@ -384,7 +387,7 @@ Grid.ColumnSpan="5" Width="1000" Height="69" - Margin="25,10,0,0" + Margin="25,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" Orientation="Horizontal"> @@ -401,7 +404,7 @@ FontSize="28" Text="出入记录" /> - + --> \ No newline at end of file diff --git a/shangjian/XGL/Views/LanJu_Operator.xaml.cs b/shangjian/XGL/Views/LanJu_Operator.xaml.cs index 07d7937..acaca11 100644 --- a/shangjian/XGL/Views/LanJu_Operator.xaml.cs +++ b/shangjian/XGL/Views/LanJu_Operator.xaml.cs @@ -116,13 +116,11 @@ namespace XGL.Views order.product_code = i["product_code"].ToString(); order.car_num = Convert.ToInt32(i["car_num"].ToString()); - order.begin = Convert.ToDateTime(i["begin"].ToString()); + order.plan_time = Convert.ToDateTime(i["plan_time"].ToString()); order.status = i["status"].ToString(); order.process_id = i["route_code"].ToString(); - order.work_batch_code = i["work_batch_code"].ToString(); order.attr1 = i["attr1"].ToString(); - order.taskcode = i["taskcode"].ToString(); - order.rfid = i["rfid"].ToString(); + order.totalCount = i["totalCount"].ToString(); orderList.Add(order); } diff --git a/shangjian/XGL/bin/x86/Debug/CentralControl.exe b/shangjian/XGL/bin/x86/Debug/CentralControl.exe index 4e785d2..fcb9bfa 100644 Binary files a/shangjian/XGL/bin/x86/Debug/CentralControl.exe and b/shangjian/XGL/bin/x86/Debug/CentralControl.exe differ diff --git a/shangjian/XGL/bin/x86/Debug/CentralControl.pdb b/shangjian/XGL/bin/x86/Debug/CentralControl.pdb index c227995..83bc444 100644 Binary files a/shangjian/XGL/bin/x86/Debug/CentralControl.pdb and b/shangjian/XGL/bin/x86/Debug/CentralControl.pdb differ diff --git a/shangjian/XGL/bin/x86/Debug/CommonFunc.dll b/shangjian/XGL/bin/x86/Debug/CommonFunc.dll index 2184338..f7152c1 100644 Binary files a/shangjian/XGL/bin/x86/Debug/CommonFunc.dll and b/shangjian/XGL/bin/x86/Debug/CommonFunc.dll differ diff --git a/shangjian/XGL/bin/x86/Debug/CommonFunc.pdb b/shangjian/XGL/bin/x86/Debug/CommonFunc.pdb index 58f85d5..65e2e5e 100644 Binary files a/shangjian/XGL/bin/x86/Debug/CommonFunc.pdb and b/shangjian/XGL/bin/x86/Debug/CommonFunc.pdb differ diff --git a/shangjian/XGL/bin/x86/Debug/XGL.Data.dll b/shangjian/XGL/bin/x86/Debug/XGL.Data.dll index 2be1b87..5c898fa 100644 Binary files a/shangjian/XGL/bin/x86/Debug/XGL.Data.dll and b/shangjian/XGL/bin/x86/Debug/XGL.Data.dll differ diff --git a/shangjian/XGL/bin/x86/Debug/XGL.Data.pdb b/shangjian/XGL/bin/x86/Debug/XGL.Data.pdb index abad8de..3d0d023 100644 Binary files a/shangjian/XGL/bin/x86/Debug/XGL.Data.pdb and b/shangjian/XGL/bin/x86/Debug/XGL.Data.pdb differ diff --git a/shangjian/XGL/bin/x86/Debug/XGL.Models.dll b/shangjian/XGL/bin/x86/Debug/XGL.Models.dll index 08b7ea3..5c25e29 100644 Binary files a/shangjian/XGL/bin/x86/Debug/XGL.Models.dll and b/shangjian/XGL/bin/x86/Debug/XGL.Models.dll differ diff --git a/shangjian/XGL/bin/x86/Debug/XGL.Models.pdb b/shangjian/XGL/bin/x86/Debug/XGL.Models.pdb index d91e903..fa77292 100644 Binary files a/shangjian/XGL/bin/x86/Debug/XGL.Models.pdb and b/shangjian/XGL/bin/x86/Debug/XGL.Models.pdb differ diff --git a/shangjian/XGL/bin/x86/Debug/XGL.exe b/shangjian/XGL/bin/x86/Debug/XGL.exe index a744ae8..9751351 100644 Binary files a/shangjian/XGL/bin/x86/Debug/XGL.exe and b/shangjian/XGL/bin/x86/Debug/XGL.exe differ diff --git a/shangjian/XGL/bin/x86/Debug/XGL.pdb b/shangjian/XGL/bin/x86/Debug/XGL.pdb index 744272a..9dc8e15 100644 Binary files a/shangjian/XGL/bin/x86/Debug/XGL.pdb and b/shangjian/XGL/bin/x86/Debug/XGL.pdb differ diff --git a/shangjian/XGL/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/XGL/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 5af994a..0e281bb 100644 Binary files a/shangjian/XGL/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/XGL/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/XGL/obj/x86/Debug/GeneratedInternalTypeHelper.g.cs b/shangjian/XGL/obj/x86/Debug/GeneratedInternalTypeHelper.g.cs index c65238f..ffa4e1e 100644 --- a/shangjian/XGL/obj/x86/Debug/GeneratedInternalTypeHelper.g.cs +++ b/shangjian/XGL/obj/x86/Debug/GeneratedInternalTypeHelper.g.cs @@ -1,2 +1,62 @@ - +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +namespace XamlGeneratedNamespace { + + + /// + /// GeneratedInternalTypeHelper + /// + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { + + /// + /// CreateInstance + /// + protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) { + return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) + | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture); + } + + /// + /// GetPropertyValue + /// + protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) { + return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture); + } + + /// + /// SetPropertyValue + /// + protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) { + propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture); + } + + /// + /// CreateDelegate + /// + protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) { + return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod + | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] { + delegateType, + handler}, null))); + } + + /// + /// AddEventHandler + /// + protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) { + eventInfo.AddEventHandler(target, handler); + } + } +} diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Complete.g.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Complete.g.cs index 1898b4a..13a0d5b 100644 --- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Complete.g.cs +++ b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Complete.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\LanJu_Complete.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "ABF34BE1429613802D6E785DDC9CA93825958E44ED1AA3C6450B8D631140FD09" +#pragma checksum "..\..\..\..\Views\LanJu_Complete.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "BC3C45B2997CE7CC01F6E19A4E0072D8F8E942927CECBE857517FB0182DEF4E0" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -30,6 +30,7 @@ using System.Windows.Media.TextFormatting; using System.Windows.Navigation; using System.Windows.Shapes; using System.Windows.Shell; +using XGL.Tools; using XGL.Views; @@ -42,7 +43,7 @@ namespace XGL.Views { public partial class LanJu_Complete : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { - #line 23 "..\..\..\..\Views\LanJu_Complete.xaml" + #line 33 "..\..\..\..\Views\LanJu_Complete.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DataGrid datagrid1; @@ -89,6 +90,12 @@ namespace XGL.Views { return; case 2: this.datagrid1 = ((System.Windows.Controls.DataGrid)(target)); + + #line 39 "..\..\..\..\Views\LanJu_Complete.xaml" + this.datagrid1.LoadingRow += new System.EventHandler(this.datagrid1_LoadingRow); + + #line default + #line hidden return; } this._contentLoaded = true; diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Complete.g.i.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Complete.g.i.cs index 1898b4a..13a0d5b 100644 --- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Complete.g.i.cs +++ b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Complete.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\LanJu_Complete.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "ABF34BE1429613802D6E785DDC9CA93825958E44ED1AA3C6450B8D631140FD09" +#pragma checksum "..\..\..\..\Views\LanJu_Complete.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "BC3C45B2997CE7CC01F6E19A4E0072D8F8E942927CECBE857517FB0182DEF4E0" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -30,6 +30,7 @@ using System.Windows.Media.TextFormatting; using System.Windows.Navigation; using System.Windows.Shapes; using System.Windows.Shell; +using XGL.Tools; using XGL.Views; @@ -42,7 +43,7 @@ namespace XGL.Views { public partial class LanJu_Complete : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { - #line 23 "..\..\..\..\Views\LanJu_Complete.xaml" + #line 33 "..\..\..\..\Views\LanJu_Complete.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DataGrid datagrid1; @@ -89,6 +90,12 @@ namespace XGL.Views { return; case 2: this.datagrid1 = ((System.Windows.Controls.DataGrid)(target)); + + #line 39 "..\..\..\..\Views\LanJu_Complete.xaml" + this.datagrid1.LoadingRow += new System.EventHandler(this.datagrid1_LoadingRow); + + #line default + #line hidden return; } this._contentLoaded = true; diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.cs index 1d8c8c0..6f6b90d 100644 --- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.cs +++ b/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4F274FD442BEA87AD6398AACCB6772C9DC89D5D581D153BBB463B6CE5E33C793" +#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "900AB4A25FD2778DB6739C87FEB2B0F97BD5FE5DFAAA65B6E4B7D8B96B8B515E" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -30,6 +30,7 @@ using System.Windows.Media.TextFormatting; using System.Windows.Navigation; using System.Windows.Shapes; using System.Windows.Shell; +using XGL.Tools; using XGL.Views; @@ -42,7 +43,7 @@ namespace XGL.Views { public partial class LanJu_InOut : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { - #line 30 "..\..\..\..\Views\LanJu_InOut.xaml" + #line 33 "..\..\..\..\Views\LanJu_InOut.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DataGrid dgInOutRecord; @@ -90,7 +91,7 @@ namespace XGL.Views { case 2: this.dgInOutRecord = ((System.Windows.Controls.DataGrid)(target)); - #line 39 "..\..\..\..\Views\LanJu_InOut.xaml" + #line 42 "..\..\..\..\Views\LanJu_InOut.xaml" this.dgInOutRecord.LoadingRow += new System.EventHandler(this.dgInOutRecord_LoadingRow); #line default diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.i.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.i.cs index 1d8c8c0..6f6b90d 100644 --- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.i.cs +++ b/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4F274FD442BEA87AD6398AACCB6772C9DC89D5D581D153BBB463B6CE5E33C793" +#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "900AB4A25FD2778DB6739C87FEB2B0F97BD5FE5DFAAA65B6E4B7D8B96B8B515E" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -30,6 +30,7 @@ using System.Windows.Media.TextFormatting; using System.Windows.Navigation; using System.Windows.Shapes; using System.Windows.Shell; +using XGL.Tools; using XGL.Views; @@ -42,7 +43,7 @@ namespace XGL.Views { public partial class LanJu_InOut : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { - #line 30 "..\..\..\..\Views\LanJu_InOut.xaml" + #line 33 "..\..\..\..\Views\LanJu_InOut.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DataGrid dgInOutRecord; @@ -90,7 +91,7 @@ namespace XGL.Views { case 2: this.dgInOutRecord = ((System.Windows.Controls.DataGrid)(target)); - #line 39 "..\..\..\..\Views\LanJu_InOut.xaml" + #line 42 "..\..\..\..\Views\LanJu_InOut.xaml" this.dgInOutRecord.LoadingRow += new System.EventHandler(this.dgInOutRecord_LoadingRow); #line default diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml index 4e1136e..b5dd74e 100644 Binary files a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml and b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml differ diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.cs index 2d6fb11..5166b4a 100644 --- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.cs +++ b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.cs @@ -1,4 +1,5 @@ -#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "2C64C56E58CC31DC49E67813003427D01103BFC94002361C33C47F7162FFE649" +// Updated by XamlIntelliSenseFileGenerator 2023-10-8 18:44:15 +#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "366D02E19597E9666A6D222B5F229768B9DF7CB19E8732060AE011535EA650B5" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -33,211 +34,186 @@ using System.Windows.Shell; using XGL.Tools; -namespace XGL.Views { - - +namespace XGL.Views +{ + + /// /// LanJu_Operator /// - public partial class LanJu_Operator : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { - - - #line 3 "..\..\..\..\Views\LanJu_Operator.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal XGL.Views.LanJu_Operator UCOperator; - - #line default - #line hidden - - - #line 146 "..\..\..\..\Views\LanJu_Operator.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Button btnComplete; - - #line default - #line hidden - - - #line 207 "..\..\..\..\Views\LanJu_Operator.xaml" + public partial class LanJu_Operator : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector + { + +#line default +#line hidden + + +#line 207 "..\..\..\..\Views\LanJu_Operator.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button btnPause; - - #line default - #line hidden - - - #line 228 "..\..\..\..\Views\LanJu_Operator.xaml" + +#line default +#line hidden + + +#line 228 "..\..\..\..\Views\LanJu_Operator.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button btnRecover; - - #line default - #line hidden - - - #line 315 "..\..\..\..\Views\LanJu_Operator.xaml" + +#line default +#line hidden + + +#line 315 "..\..\..\..\Views\LanJu_Operator.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button btnRefresh; - - #line default - #line hidden - - - #line 332 "..\..\..\..\Views\LanJu_Operator.xaml" + +#line default +#line hidden + + +#line 332 "..\..\..\..\Views\LanJu_Operator.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DataGrid dgWorkOrderInfo; - - #line default - #line hidden - - - #line 470 "..\..\..\..\Views\LanJu_Operator.xaml" + +#line default +#line hidden + + +#line 468 "..\..\..\..\Views\LanJu_Operator.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ContentControl Window1; - - #line default - #line hidden - - - #line 478 "..\..\..\..\Views\LanJu_Operator.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.ContentControl Window2; - - #line default - #line hidden - + +#line default +#line hidden + private bool _contentLoaded; - + /// /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] - public void InitializeComponent() { - if (_contentLoaded) { + public void InitializeComponent() + { + if (_contentLoaded) + { return; } _contentLoaded = true; System.Uri resourceLocater = new System.Uri("/XGL;component/views/lanju_operator.xaml", System.UriKind.Relative); - - #line 1 "..\..\..\..\Views\LanJu_Operator.xaml" + +#line 1 "..\..\..\..\Views\LanJu_Operator.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); - - #line default - #line hidden + +#line default +#line hidden } - + [System.Diagnostics.DebuggerNonUserCodeAttribute()] [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] - void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) { + void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) + { switch (connectionId) { - case 1: - this.UCOperator = ((XGL.Views.LanJu_Operator)(target)); - - #line 12 "..\..\..\..\Views\LanJu_Operator.xaml" - this.UCOperator.Loaded += new System.Windows.RoutedEventHandler(this.UCOperator_Loaded); - - #line default - #line hidden - return; - case 2: - this.btnComplete = ((System.Windows.Controls.Button)(target)); - - #line 152 "..\..\..\..\Views\LanJu_Operator.xaml" - this.btnComplete.Click += new System.Windows.RoutedEventHandler(this.btnComplete_Click); - - #line default - #line hidden - return; - case 3: - this.btnPause = ((System.Windows.Controls.Button)(target)); - - #line 208 "..\..\..\..\Views\LanJu_Operator.xaml" - this.btnPause.Click += new System.Windows.RoutedEventHandler(this.btnPause_Click); - - #line default - #line hidden - return; - case 4: - this.btnRecover = ((System.Windows.Controls.Button)(target)); - - #line 234 "..\..\..\..\Views\LanJu_Operator.xaml" - this.btnRecover.Click += new System.Windows.RoutedEventHandler(this.btnRecover_Click); - - #line default - #line hidden - return; - case 5: - - #line 255 "..\..\..\..\Views\LanJu_Operator.xaml" - ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click); - - #line default - #line hidden - return; - case 6: - - #line 276 "..\..\..\..\Views\LanJu_Operator.xaml" - ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click); - - #line default - #line hidden - return; - case 7: - - #line 298 "..\..\..\..\Views\LanJu_Operator.xaml" - ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click); - - #line default - #line hidden - return; - case 8: - this.btnRefresh = ((System.Windows.Controls.Button)(target)); - - #line 326 "..\..\..\..\Views\LanJu_Operator.xaml" - this.btnRefresh.Click += new System.Windows.RoutedEventHandler(this.btnRefresh_Click); - - #line default - #line hidden - return; - case 9: - this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target)); - - #line 338 "..\..\..\..\Views\LanJu_Operator.xaml" - this.dgWorkOrderInfo.LoadingRow += new System.EventHandler(this.dgWorkOrderInfo_LoadingRow); - - #line default - #line hidden - return; - case 10: - - #line 397 "..\..\..\..\Views\LanJu_Operator.xaml" - ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click); - - #line default - #line hidden - return; - case 11: - - #line 410 "..\..\..\..\Views\LanJu_Operator.xaml" - ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Complete_Click); - - #line default - #line hidden - return; - case 12: - this.Window1 = ((System.Windows.Controls.ContentControl)(target)); - return; - case 13: - this.Window2 = ((System.Windows.Controls.ContentControl)(target)); - return; + case 1: + this.UCOperator = ((XGL.Views.LanJu_Operator)(target)); + +#line 12 "..\..\..\..\Views\LanJu_Operator.xaml" + this.UCOperator.Loaded += new System.Windows.RoutedEventHandler(this.UCOperator_Loaded); + +#line default +#line hidden + return; + case 2: + this.btnComplete = ((System.Windows.Controls.Button)(target)); + +#line 152 "..\..\..\..\Views\LanJu_Operator.xaml" + this.btnComplete.Click += new System.Windows.RoutedEventHandler(this.btnComplete_Click); + +#line default +#line hidden + return; + case 3: + this.btnPause = ((System.Windows.Controls.Button)(target)); + +#line 208 "..\..\..\..\Views\LanJu_Operator.xaml" + this.btnPause.Click += new System.Windows.RoutedEventHandler(this.btnPause_Click); + +#line default +#line hidden + return; + case 4: + this.btnRecover = ((System.Windows.Controls.Button)(target)); + +#line 234 "..\..\..\..\Views\LanJu_Operator.xaml" + this.btnRecover.Click += new System.Windows.RoutedEventHandler(this.btnRecover_Click); + +#line default +#line hidden + return; + case 5: + +#line 255 "..\..\..\..\Views\LanJu_Operator.xaml" + ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click); + +#line default +#line hidden + return; + case 6: + +#line 276 "..\..\..\..\Views\LanJu_Operator.xaml" + ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click); + +#line default +#line hidden + return; + case 7: + +#line 298 "..\..\..\..\Views\LanJu_Operator.xaml" + ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click); + +#line default +#line hidden + return; + case 8: + this.btnRefresh = ((System.Windows.Controls.Button)(target)); + +#line 326 "..\..\..\..\Views\LanJu_Operator.xaml" + this.btnRefresh.Click += new System.Windows.RoutedEventHandler(this.btnRefresh_Click); + +#line default +#line hidden + return; + case 9: + this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target)); + +#line 339 "..\..\..\..\Views\LanJu_Operator.xaml" + this.dgWorkOrderInfo.LoadingRow += new System.EventHandler(this.dgWorkOrderInfo_LoadingRow); + +#line default +#line hidden + return; + case 10: + +#line 400 "..\..\..\..\Views\LanJu_Operator.xaml" + ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click); + +#line default +#line hidden + return; + case 11: + this.Window1 = ((System.Windows.Controls.ContentControl)(target)); + return; } this._contentLoaded = true; } + + internal System.Windows.Controls.UserControl UCOperator; } } diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.i.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.i.cs index 2d6fb11..97258dc 100644 --- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.i.cs +++ b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "2C64C56E58CC31DC49E67813003427D01103BFC94002361C33C47F7162FFE649" +#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "366D02E19597E9666A6D222B5F229768B9DF7CB19E8732060AE011535EA650B5" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -90,21 +90,13 @@ namespace XGL.Views { #line hidden - #line 470 "..\..\..\..\Views\LanJu_Operator.xaml" + #line 468 "..\..\..\..\Views\LanJu_Operator.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ContentControl Window1; #line default #line hidden - - #line 478 "..\..\..\..\Views\LanJu_Operator.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.ContentControl Window2; - - #line default - #line hidden - private bool _contentLoaded; /// @@ -207,7 +199,7 @@ namespace XGL.Views { case 9: this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target)); - #line 338 "..\..\..\..\Views\LanJu_Operator.xaml" + #line 339 "..\..\..\..\Views\LanJu_Operator.xaml" this.dgWorkOrderInfo.LoadingRow += new System.EventHandler(this.dgWorkOrderInfo_LoadingRow); #line default @@ -215,26 +207,15 @@ namespace XGL.Views { return; case 10: - #line 397 "..\..\..\..\Views\LanJu_Operator.xaml" + #line 400 "..\..\..\..\Views\LanJu_Operator.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click); #line default #line hidden return; case 11: - - #line 410 "..\..\..\..\Views\LanJu_Operator.xaml" - ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Complete_Click); - - #line default - #line hidden - return; - case 12: this.Window1 = ((System.Windows.Controls.ContentControl)(target)); return; - case 13: - this.Window2 = ((System.Windows.Controls.ContentControl)(target)); - return; } this._contentLoaded = true; } diff --git a/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache b/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache index 0004533..82fa677 100644 Binary files a/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache and b/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache differ diff --git a/shangjian/XGL/obj/x86/Debug/XGL.exe b/shangjian/XGL/obj/x86/Debug/XGL.exe index a744ae8..9751351 100644 Binary files a/shangjian/XGL/obj/x86/Debug/XGL.exe and b/shangjian/XGL/obj/x86/Debug/XGL.exe differ diff --git a/shangjian/XGL/obj/x86/Debug/XGL.g.resources b/shangjian/XGL/obj/x86/Debug/XGL.g.resources index 841a1e2..71a5cb3 100644 Binary files a/shangjian/XGL/obj/x86/Debug/XGL.g.resources and b/shangjian/XGL/obj/x86/Debug/XGL.g.resources differ diff --git a/shangjian/XGL/obj/x86/Debug/XGL.pdb b/shangjian/XGL/obj/x86/Debug/XGL.pdb index 744272a..9dc8e15 100644 Binary files a/shangjian/XGL/obj/x86/Debug/XGL.pdb and b/shangjian/XGL/obj/x86/Debug/XGL.pdb differ diff --git a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref index ce090f8..429f4d7 100644 --- a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref +++ b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref @@ -1,4 +1,4 @@ -D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\GeneratedInternalTypeHelper.g.cs + FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormBlankingBoard.xaml;; FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormBoard.xaml;;