diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo index de00281..c1eb913 100644 Binary files a/shangjian/.vs/BL/v17/.suo and b/shangjian/.vs/BL/v17/.suo differ diff --git a/shangjian/CentralControl/bin/Debug/CentralControl.exe b/shangjian/CentralControl/bin/Debug/CentralControl.exe index a1d4f6a..1756a95 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 4380a8d..0bd211a 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 5c36304..7ce41cb 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 a8f2b0c..1ac96da 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 1d3786f..f3952c4 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 c63ff2c..927ac6e 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 bd1ed4a..6e8be3a 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 42b75d7..b1d4766 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 b9f03dd..7b924e5 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 a1d4f6a..1756a95 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 4380a8d..0bd211a 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 5c36304..7ce41cb 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 a8f2b0c..1ac96da 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 bd1ed4a..6e8be3a 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 42b75d7..b1d4766 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 74a7104..21783d9 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 5c36304..7ce41cb 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 a8f2b0c..1ac96da 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 5c36304..7ce41cb 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 a8f2b0c..1ac96da 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 bd1ed4a..6e8be3a 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 42b75d7..b1d4766 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 747fbb3..b5953e0 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/bin/x86/Debug/CommonFunc.dll b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll index 5c36304..7ce41cb 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 a8f2b0c..1ac96da 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 1d3786f..f3952c4 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 c63ff2c..927ac6e 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 bd1ed4a..6e8be3a 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 42b75d7..b1d4766 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 be801e8..1038644 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 1d3786f..f3952c4 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 c63ff2c..927ac6e 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/OrderPrepare/WcsSyncResult.cs b/shangjian/XGL.Model/Model/OrderPrepare/WcsSyncResult.cs new file mode 100644 index 0000000..606b103 --- /dev/null +++ b/shangjian/XGL.Model/Model/OrderPrepare/WcsSyncResult.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace XGL.Models.Model.OrderPrepare +{ + public class WcsSyncResult + { + + + public string reqCode { get; set; } + public int code { get; set; } + public string message { get; set; } + + + } +} diff --git a/shangjian/XGL.Model/XGL.Models.csproj b/shangjian/XGL.Model/XGL.Models.csproj index cb037b6..7904914 100644 --- a/shangjian/XGL.Model/XGL.Models.csproj +++ b/shangjian/XGL.Model/XGL.Models.csproj @@ -110,6 +110,7 @@ + diff --git a/shangjian/XGL.Model/bin/Debug/XGL.Models.dll b/shangjian/XGL.Model/bin/Debug/XGL.Models.dll index bd1ed4a..6e8be3a 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 42b75d7..b1d4766 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 1a962e1..58bd50d 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 3149550..aa575d3 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 0d14476..64dac35 100644 --- a/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache +++ b/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -15e0079c678473a5e3606350c39806472a1461a2 +ba8f52b01cbb380daf24abf11e9369249f394d6c diff --git a/shangjian/XGL.Model/obj/Debug/XGL.Models.dll b/shangjian/XGL.Model/obj/Debug/XGL.Models.dll index bd1ed4a..6e8be3a 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 42b75d7..b1d4766 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/App.config b/shangjian/XGL/App.config index b37dc64..20014e3 100644 --- a/shangjian/XGL/App.config +++ b/shangjian/XGL/App.config @@ -29,7 +29,7 @@ - + diff --git a/shangjian/XGL/Views/LanJu_Prepare.xaml b/shangjian/XGL/Views/LanJu_Prepare.xaml index a608b63..2024e0b 100644 --- a/shangjian/XGL/Views/LanJu_Prepare.xaml +++ b/shangjian/XGL/Views/LanJu_Prepare.xaml @@ -258,19 +258,16 @@ Width="*" Binding="{Binding BatchCode}" Header="生产批次" />--> - + + - - + - + + + + diff --git a/shangjian/XGL/Views/LanJu_Prepare.xaml.cs b/shangjian/XGL/Views/LanJu_Prepare.xaml.cs index 26dce7f..55ec44e 100644 --- a/shangjian/XGL/Views/LanJu_Prepare.xaml.cs +++ b/shangjian/XGL/Views/LanJu_Prepare.xaml.cs @@ -123,7 +123,7 @@ namespace XGL.Views checkUserWin.ShowDialog(); if (!checkUserWin.loginFlag) { - CustomMessageBox.Show("请先校验用户!", CustomMessageBoxIcon.Warning); + CustomMessageBox.Show("请先校验用户!",CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning); return; } if (WorkOrder.SelectedItems.Count == 0) @@ -138,7 +138,7 @@ namespace XGL.Views string status = (WorkOrder.SelectedItem as WetMaterialModel).status; if (sync_flag.Equals("Y")) { - CustomMessageBox.Show("该工单已同步,请选择其他的工单!", CustomMessageBoxIcon.Warning); + CustomMessageBox.Show("该工单已同步,请选择其他的工单!", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning); return; } @@ -146,7 +146,7 @@ namespace XGL.Views { if (status != "") { - CustomMessageBox.Show("该工单不符合条件,请选择其他的工单!", CustomMessageBoxIcon.Warning); + CustomMessageBox.Show("该工单不符合条件,请选择其他的工单!", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning); return; } } @@ -161,16 +161,16 @@ namespace XGL.Views //获取湿料计划指定的成型机 //var cxjDt = userDbWareHouse.GetCXJList(orderID); + DataTable cxjDt = null; + //根据工单获取成型机 - //根据工单获取成型机 - var cxjDt = userDbWareHouse.GetCXJList(workorderID); + cxjDt = userDbWareHouse.GetCXJList(workorderID);// 在此处执行数据库查询 if (cxjDt == null || cxjDt.Rows.Count == 0) { - CustomMessageBox.Show("该工单未指定料罐、成型机,请稍后再试!", CustomMessageBoxIcon.Warning); + CustomMessageBox.Show("该工单未指定料罐、成型机,请稍后再试!", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning); return; } - List cxjList = new List(); List bucketList = new List(); //这扯淡的设计,根据湿料计划获取各个工单对应的工序、机台信息,这样式的,[["GX01","C1"],["GX01","C5"],["GX01","C3"],["GX01","C6"],["GX01","C8"],["GX02","H2"],["GX02","H3"],["GX02","H4"],["GX02","H5"],["GX02","H6"],["GX03","X3"],["GX03","X6"]] @@ -235,19 +235,28 @@ namespace XGL.Views // 将要发送的数据序列化为JSON格式 var jsonContent = JsonConvert.SerializeObject(materialPlanModel); - + LogHelper.instance.log.Info("给WCS同步计划>>"+ jsonContent); RestHelper restClient = new RestHelper(); var response = await restClient.PostAsync(apiUrl, jsonContent); + WcsSyncResult result = Utils.DeJson(response); //Console.WriteLine(response); - //更新湿料计划同步状态 - var updatestatus = userDbWareHouse.UpdateSycnFlag(workorderID); - if (!updatestatus) - LogHelper.instance.log.Info("更新湿料计划同步状态失败!"); + if (result.message.ToLower().Equals("ok")) + { + //更新湿料计划同步状态 + var updatestatus = userDbWareHouse.UpdateSycnFlag(workorderID); + if (!updatestatus) + LogHelper.instance.log.Info("更新湿料计划同步状态失败!"); + else + { + GetWorkOrder(); + } + } else { - GetWorkOrder(); + CustomMessageBox.Show("开始工单失败!", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning); } + } private void Flow_Click(object sender, RoutedEventArgs e) diff --git a/shangjian/XGL/bin/x86/Debug/CentralControl.exe b/shangjian/XGL/bin/x86/Debug/CentralControl.exe index a1d4f6a..1756a95 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 4380a8d..0bd211a 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 5c36304..7ce41cb 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 a8f2b0c..1ac96da 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 1d3786f..f3952c4 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 c63ff2c..927ac6e 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 bd1ed4a..6e8be3a 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 42b75d7..b1d4766 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 7c7ae42..1db5ca3 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.exe.config b/shangjian/XGL/bin/x86/Debug/XGL.exe.config index 7080ddc..20014e3 100644 --- a/shangjian/XGL/bin/x86/Debug/XGL.exe.config +++ b/shangjian/XGL/bin/x86/Debug/XGL.exe.config @@ -29,7 +29,7 @@ - + @@ -37,6 +37,8 @@ + + diff --git a/shangjian/XGL/bin/x86/Debug/XGL.pdb b/shangjian/XGL/bin/x86/Debug/XGL.pdb index 3458f75..b24205f 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/Views/LanJu_Operator.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml index 2b6e1c7..291f793 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/XGL.csproj.AssemblyReference.cache b/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache index 58764fe..1c0fbc8 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 7c7ae42..1db5ca3 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 a6325dd..03592a6 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 3458f75..b24205f 100644 Binary files a/shangjian/XGL/obj/x86/Debug/XGL.pdb and b/shangjian/XGL/obj/x86/Debug/XGL.pdb differ