diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo index d50e9b7..3288548 100644 Binary files a/shangjian/.vs/BL/v17/.suo and b/shangjian/.vs/BL/v17/.suo differ diff --git a/shangjian/CommonFunc/LoginUserInfo.cs b/shangjian/CommonFunc/LoginUserInfo.cs index 1d5fe21..51677bb 100644 --- a/shangjian/CommonFunc/LoginUserInfo.cs +++ b/shangjian/CommonFunc/LoginUserInfo.cs @@ -25,5 +25,15 @@ namespace CommonFunc /// 员工姓名 /// public static string UserName { get; set; } + + /// + /// 班组 + /// + public static string TeamCode { get; set; } + + /// + /// 班次 + /// + public static string ShiftCode { get; set; } } } diff --git a/shangjian/XGL.Data/DBService/DBService.cs b/shangjian/XGL.Data/DBService/DBService.cs index 7e9b880..cbb43b4 100644 --- a/shangjian/XGL.Data/DBService/DBService.cs +++ b/shangjian/XGL.Data/DBService/DBService.cs @@ -15,10 +15,7 @@ using CommonFunc.Tools; namespace CentralControl.DBDAO { public class DBService - { - - - + { /// /// 得到一个对象实体集合 /// @@ -86,6 +83,18 @@ namespace CentralControl.DBDAO } return Items; } + + public DataTable GetFactoryInfo(string sitecode) + { + string sql = $"select factory_name from sys_factory where factory_code = '{sitecode}'"; + DataSet dtset = Utils.netClientDBHelper.getDataSet(sql); + if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) + { + return dtset.Tables[0]; + } + return null; + } + /// /// 删除一条数据 /// @@ -639,12 +648,12 @@ select a.TrayCode,a.ProductBarNo,a.carcode,a.createtime,a.lineno,b.HadNumber { string sql = $@"select wet.id,wet.factory_code,wet.prod_code, wet.sync_flag,wet.plan_time, wetDetail.workorder_id,bucket_id,bucket_code,material_code,material_name, -wetDetail.product_name,wet.shift_desc,prod_line_code +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 -"; //where CONVERT(VARCHAR(10), wet.plan_time , 120)= '2023-08-08' +left join pro_order_workorder workorder on workorder.workorder_id = wetDetail.workorder_id +"; //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) { @@ -669,6 +678,19 @@ left join pro_order_workorder workorder on workorder.workorder_id = wetDetail.wo return null; } + /// + /// 获取工单是否齐套 + /// + /// + public bool UpdateSycnFlag(string workOrderNo) + { + string sql = $@"update pro_wet_material_plan set sync_flag = 'Y' where id = '{workOrderNo}'"; + + return Utils.netClientDBHelper.executeUpdate(sql) == 0 ? false : true; + + } + + /// /// 获取湿料计划指向的成型机 /// diff --git a/shangjian/XGL.Data/DBService/DringRoomService.cs b/shangjian/XGL.Data/DBService/DringRoomService.cs new file mode 100644 index 0000000..af243a7 --- /dev/null +++ b/shangjian/XGL.Data/DBService/DringRoomService.cs @@ -0,0 +1,56 @@ +using CommonFunc.Tools; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace XGL.Data.DBService +{ + public class DringRoomService + { + /// + /// 获取烘房列表 + /// + /// + /// + /// + public DataTable GetDringRoomInfo() + { + + string sql = $@"select equipment_code as quipCode,equipment_name as quipName,equipment_type_code from base_equipment where equipment_type_code = 'equ_type_hf'"; + + DataSet dtset = Utils.netClientDBHelper.getDataSet(sql); + if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) + { + return dtset.Tables[0]; + } + return null; + } + + + + /// + /// 获取烘房内数据 + /// + /// + /// + /// + public DataTable GetDringRoomData(string devicecode) + { + //获取绑定中，且RFID没有出烘房（在烘房内）的数据 + 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') +"; + + DataSet dtset = Utils.netClientDBHelper.getDataSet(sql); + if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) + { + return dtset.Tables[0]; + } + return null; + } + } +} diff --git a/shangjian/XGL.Data/DBService/FormingMachineService.cs b/shangjian/XGL.Data/DBService/FormingMachineService.cs new file mode 100644 index 0000000..9af7ecc --- /dev/null +++ b/shangjian/XGL.Data/DBService/FormingMachineService.cs @@ -0,0 +1,110 @@ +using CommonFunc.Tools; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace XGL.Data.DBService +{ + public class FormingMachineService + { + /// + /// 获取成型机在产物料信息 + /// + /// + /// + /// + public DataTable GetFormingMachineInfo(string devicecode) + { + + string sql = $@"SELECT 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 equipmentCode = '{devicecode}'; "; + + DataSet dtset = Utils.netClientDBHelper.getDataSet(sql); + if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) + { + return dtset.Tables[0]; + } + return null; + } + + /// + /// 获取成型机状态 + /// + /// + /// + /// + public DataTable GetFormingMachineState(string devicecode) + { + + string sql = $@"select status from base_equipment where equipment_code = '{devicecode}'; "; + + DataSet dtset = Utils.netClientDBHelper.getDataSet(sql); + if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) + { + return dtset.Tables[0]; + } + return null; + } + + /// + /// 查询出入记录 + /// + /// + /// + /// + 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],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 equipmentCode = '{devicecode}'; "; + + DataSet dtset = Utils.netClientDBHelper.getDataSet(sql); + if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) + { + return dtset.Tables[0]; + } + return null; + } + + /// + /// 查询完成记录 + /// + /// + /// + /// + public DataTable GetCompleteHistoryList(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],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 ord.status = 'w3' and equipmentCode = '{devicecode}'; "; + + DataSet dtset = Utils.netClientDBHelper.getDataSet(sql); + if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) + { + return dtset.Tables[0]; + } + return null; + } + + /// + /// 暂停工单 + /// + /// + /// + /// + public bool PauseWorkOrder(string orderCode) + { + + string sql = $@"update pro_order_workorder set status = 'w4' where workorder_code = '{orderCode}'"; + + int issucc = Utils.netClientDBHelper.executeUpdate(sql); + + return issucc > 0 ? true : false; + } + } +} diff --git a/shangjian/XGL.Data/XGL.Data.csproj b/shangjian/XGL.Data/XGL.Data.csproj index 4283ea6..bbc793f 100644 --- a/shangjian/XGL.Data/XGL.Data.csproj +++ b/shangjian/XGL.Data/XGL.Data.csproj @@ -96,6 +96,8 @@ + + diff --git a/shangjian/XGL.Data/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/XGL.Data/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 31fbcf3..8a912f5 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.CoreCompileInputs.cache b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.CoreCompileInputs.cache index 57d9457..dd0a787 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 +1,5 @@ +<<<<<<< HEAD fbc0cc7e40c5cf1726e3b3ecaa740b610d52f69f +======= +79f02adf94b81a462e2d021ffaeb806c569f29e2 +>>>>>>> babf7ea9e37642c626439584d080cf06049abc5f diff --git a/shangjian/XGL.Data/userDB.cs b/shangjian/XGL.Data/userDB.cs index c96d476..e78fcd4 100644 --- a/shangjian/XGL.Data/userDB.cs +++ b/shangjian/XGL.Data/userDB.cs @@ -325,6 +325,7 @@ namespace XGL.Data LoginUser.UserId = info.user_id; LoginUser.UserCode = info.user_name; LoginUser.UserName = info.nick_name; + //待补充班组班次 } return issuccess;//lst.Count > 0 ? true : false; } diff --git a/shangjian/XGL.Model/Model/FoamingMac/FoamingMacModel.cs b/shangjian/XGL.Model/Model/FoamingMac/FoamingMacModel.cs new file mode 100644 index 0000000..06d844c --- /dev/null +++ b/shangjian/XGL.Model/Model/FoamingMac/FoamingMacModel.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace XGL.Models.Model.FoamingMac +{ + public class FoamingMacModel + { + public string id { get; set; } + public string workorder_code { get; set; } + + public string product_name { get; set; } + public string product_code { get; set; } + + public int car_num { get; set; } + public DateTime? begin { get; set; } + public DateTime? beout { get; set; } + public string status { get; set; } + + public string product_date { get; set; } + public string create_by { get; set; } + + } +} diff --git a/shangjian/XGL.Model/Model/OrderPrepare/WetMaterialModel.cs b/shangjian/XGL.Model/Model/OrderPrepare/WetMaterialModel.cs index 3c6151a..35e5f09 100644 --- a/shangjian/XGL.Model/Model/OrderPrepare/WetMaterialModel.cs +++ b/shangjian/XGL.Model/Model/OrderPrepare/WetMaterialModel.cs @@ -25,6 +25,7 @@ namespace XGL.Models.Model.OrderPrepare public string product_name { get; set; } public string shift_desc { get; set; } public string prod_line_code { get; set; } - + public string status { get; set; } + } } diff --git a/shangjian/XGL.Model/XGL.Models.csproj b/shangjian/XGL.Model/XGL.Models.csproj index a12c75c..cb037b6 100644 --- a/shangjian/XGL.Model/XGL.Models.csproj +++ b/shangjian/XGL.Model/XGL.Models.csproj @@ -97,6 +97,7 @@ + diff --git a/shangjian/XGL.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/XGL.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 864ebb1..aa73f2f 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.CoreCompileInputs.cache b/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache index 84f9401..8734ccc 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,5 @@ +<<<<<<< HEAD 447124d86454b5028e0096d5af8102cbe476aa0c +======= +15e0079c678473a5e3606350c39806472a1461a2 +>>>>>>> babf7ea9e37642c626439584d080cf06049abc5f diff --git a/shangjian/XGL/App.config b/shangjian/XGL/App.config index 954a5f8..ada0642 100644 --- a/shangjian/XGL/App.config +++ b/shangjian/XGL/App.config @@ -6,7 +6,13 @@
- + + + + + + + @@ -16,12 +22,14 @@ - + + + diff --git a/shangjian/XGL/FormItem/Main.xaml b/shangjian/XGL/FormItem/Main.xaml index e145155..e845632 100644 --- a/shangjian/XGL/FormItem/Main.xaml +++ b/shangjian/XGL/FormItem/Main.xaml @@ -6,13 +6,13 @@ xmlns:local="clr-namespace:XGL.FormItem" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" Title="Main" - Width="1920" - Height="1080" + Width="1920" + Height="1080" Closed="Close" WindowStartupLocation="CenterScreen" WindowState="Maximized" WindowStyle="None" - mc:Ignorable="d"> + mc:Ignorable="d" Loaded="Window_Loaded"> @@ -236,6 +236,7 @@ FontSize="20" Text="车间：" /> - + - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/shangjian/XGL/Views/LanJu_Operatorbak - 复制.xaml.cs b/shangjian/XGL/Views/LanJu_Operatorbak - 复制.xaml.cs new file mode 100644 index 0000000..5f9dd13 --- /dev/null +++ b/shangjian/XGL/Views/LanJu_Operatorbak - 复制.xaml.cs @@ -0,0 +1,107 @@ +using COSMO.IM.LanJu.Index; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace XGL.Views + +{ + /// + /// LanJu_Operator.xaml 的交互逻辑 + /// + public partial class LanJu_Operatorbak : UserControl + { + public static LanJu_Operator lanJu_Operator; + Frame frame = new Frame() { Content = new Views.LanJu_InOut()}; + + public enum WindowID + { + frame + } + public LanJu_Operatorbak() + { + InitializeComponent(); + WindowChange(WindowID.frame); + + } + + public void WindowChange(WindowID windowID) + { + Window1.Content = frame; + } + + private void InOut_Click(object sender, RoutedEventArgs e) + { + LanJu_InOut lanJu_InOut = new LanJu_InOut(); + Window1.Content = new Frame + { + Content = lanJu_InOut + }; + } + + private void Complete_Click(object sender, RoutedEventArgs e) + { + LanJu_Complete lanJu_Complete = new LanJu_Complete(); + Window1.Content = new Frame + { + Content = lanJu_Complete + }; + } + + private void DeviceItems_Click(object sender, RoutedEventArgs e) + { + LanJu_DeviceItems lanJu_DeviceItems = new LanJu_DeviceItems(); + Window1.Content = new Frame + { + Content = lanJu_DeviceItems + }; + } + + private void Paused_Click(object sender, RoutedEventArgs e) + { + LanJu_Paused lanJu_Paused = new LanJu_Paused(); + Window1.Content= new Frame + { + Content = lanJu_Paused + }; + } + + /// + /// 上部按钮 + /// + /// + /// + private void Flow_Click(object sender, RoutedEventArgs e) + { + LanJu_Flow lanJu_Flow = new LanJu_Flow(); + LanJu_Flow.jump = 1; + Window2.Content = new Frame + { + Content= lanJu_Flow + }; + } + + private void Material_Click(object sender, RoutedEventArgs e) + { + LanJu_Material lanJu_Material = new LanJu_Material(); + Window2.Content = new Frame + { + Content = lanJu_Material + }; + } + + + } +} diff --git a/shangjian/XGL/Views/LanJu_Prepare.xaml b/shangjian/XGL/Views/LanJu_Prepare.xaml index b360a9e..1d4f26c 100644 --- a/shangjian/XGL/Views/LanJu_Prepare.xaml +++ b/shangjian/XGL/Views/LanJu_Prepare.xaml @@ -4,6 +4,7 @@ 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:convert="clr-namespace:XGL.Tools" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" Width="1920" Height="800" @@ -43,12 +44,11 @@ - - - + + + @@ -262,6 +262,14 @@ Width="*" Binding="{Binding prod_line_code}" Header="成型机" /> + + diff --git a/shangjian/XGL/Views/LanJu_Prepare.xaml.cs b/shangjian/XGL/Views/LanJu_Prepare.xaml.cs index 94c780b..2dbf55f 100644 --- a/shangjian/XGL/Views/LanJu_Prepare.xaml.cs +++ b/shangjian/XGL/Views/LanJu_Prepare.xaml.cs @@ -1,4 +1,5 @@ using CentralControl.DBDAO; +using CommonFunc; using CommonFunc.Tools; using Newtonsoft.Json; using Newtonsoft.Json.Linq; @@ -66,6 +67,8 @@ namespace XGL.Views wet.bucket_code = i["bucket_code"].ToString(); wet.shift_desc = i["shift_desc"].ToString(); wet.prod_line_code = i["prod_line_code"].ToString(); + wet.status = i["status"].ToString(); + wet.sync_flag = i["sync_flag"].ToString(); wetList.Add(wet); // list_modelWareHouse.WorkOrderCode = i["WorkOrderCode"].ToString(); // list_modelWareHouse.OrderCode = i["OrderCode"].ToString(); @@ -75,13 +78,11 @@ namespace XGL.Views // list_modelWareHouse.BatchCode = i["BatchCode"].ToString(); // modelWareHouse.Add(list_modelWareHouse); } - //this.WorkOrder.ItemsSource = modelWareHouse; - this.WorkOrder.ItemsSource = wetList; } catch (Exception ex) { - + LogHelper.instance.log.Error("获取工单准备信息时发生异常：" + ex.Message); } } @@ -98,8 +99,13 @@ namespace XGL.Views } private void btnStartOrders_Click(object sender, RoutedEventArgs e) { - - + CheckUserWin checkUserWin = new CheckUserWin(); + checkUserWin.ShowDialog(); + if (!checkUserWin.loginFlag) + { + CustomMessageBox.Show("请先校验用户！", CustomMessageBoxIcon.Warning); + return; + } if (WorkOrder.SelectedItems.Count == 0) { CustomMessageBox.Show("请选择要开始的工单！", CustomMessageBoxIcon.Warning); @@ -107,6 +113,19 @@ namespace XGL.Views } string orderID = (WorkOrder.SelectedItem as WetMaterialModel).id; string material = (WorkOrder.SelectedItem as WetMaterialModel).material_code; + string sync_flag = (WorkOrder.SelectedItem as WetMaterialModel).sync_flag; + string status = (WorkOrder.SelectedItem as WetMaterialModel).status; + if (!sync_flag.Equals("Y")) + { + CustomMessageBox.Show("该工单已同步，请选择其他的工单！", CustomMessageBoxIcon.Warning); + return; + } + + if (!status.Equals("w0")) + { + CustomMessageBox.Show("该工单不符合条件，请选择其他的工单！", CustomMessageBoxIcon.Warning); + return; + } //获取WMS齐套率 var wmsState = userDbWareHouse.GetWorkOrderQitaoLv(orderID); if (wmsState == null || wmsState.Rows[0][0].Equals("0")) @@ -124,7 +143,7 @@ namespace XGL.Views 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"]] for (int i = 0; i < cxjDt.Rows.Count; i++) { string jsonStrCXJList = cxjDt.Rows[i][0].ToString(); @@ -153,7 +172,7 @@ namespace XGL.Views string apiUrl = "http://example.com/api/endpoint"; - + MaterialPlanModel materialPlanModel = new MaterialPlanModel(); skuInfo sku = new skuInfo(); List listWetMaterial = Utils.ToDataList(dt); @@ -184,11 +203,15 @@ namespace XGL.Views // 将要发送的数据序列化为JSON格式 var jsonContent = JsonConvert.SerializeObject(materialPlanModel); - + RestHelper restClient = new RestHelper(); var response = restClient.PostAsync(apiUrl, jsonContent); Console.WriteLine(response); + //更新湿料计划同步状态 + var updatestatus = userDbWareHouse.UpdateSycnFlag(orderID); + if (!updatestatus) + LogHelper.instance.log.Info("更新湿料计划同步状态失败！"); } } } diff --git a/shangjian/XGL/XGL.csproj b/shangjian/XGL/XGL.csproj index e5741ff..4aa5725 100644 --- a/shangjian/XGL/XGL.csproj +++ b/shangjian/XGL/XGL.csproj @@ -208,6 +208,10 @@ Main.xaml + + ModuleUC.xaml + + ordertj.xaml @@ -280,6 +284,12 @@ UCUserList.xaml + + CheckUserWin.xaml + + + DryingRoomUC.xaml + LanJu_Complete.xaml @@ -392,6 +402,10 @@ MainWindow.xaml Code + + Designer + MSBuild:Compile + MSBuild:Compile Designer @@ -488,6 +502,14 @@ MSBuild:Compile Designer + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + MSBuild:Compile Designer @@ -932,6 +954,7 @@ + Always diff --git a/shangjian/XGL/bin/x86/Debug/XGL.exe.config b/shangjian/XGL/bin/x86/Debug/XGL.exe.config index 954a5f8..ada0642 100644 --- a/shangjian/XGL/bin/x86/Debug/XGL.exe.config +++ b/shangjian/XGL/bin/x86/Debug/XGL.exe.config @@ -6,7 +6,13 @@
- + + + + + + + @@ -16,12 +22,14 @@ - + + + diff --git a/shangjian/XGL/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/XGL/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 8ba43f2..7fc1314 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/FormItem/Main.g.cs b/shangjian/XGL/obj/x86/Debug/FormItem/Main.g.cs index d064e6b..ae0109b 100644 --- a/shangjian/XGL/obj/x86/Debug/FormItem/Main.g.cs +++ b/shangjian/XGL/obj/x86/Debug/FormItem/Main.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\FormItem\Main.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "37C438E1EAF0683518728F4D4D56C558F66FDFE8AAD314B65D85A076FD054124" +#pragma checksum "..\..\..\..\FormItem\Main.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FB9BE4D3807DFA418587F91BFC9ACFE62EDC194602590A2D9DE86AD3FA0F3F41" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -49,7 +49,39 @@ namespace XGL.FormItem { #line hidden - #line 354 "..\..\..\..\FormItem\Main.xaml" + #line 239 "..\..\..\..\FormItem\Main.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBlock tbFactory; + + #line default + #line hidden + + + #line 260 "..\..\..\..\FormItem\Main.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBlock tbLineCode; + + #line default + #line hidden + + + #line 325 "..\..\..\..\FormItem\Main.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBlock tbDevice; + + #line default + #line hidden + + + #line 347 "..\..\..\..\FormItem\Main.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBlock tbOperator; + + #line default + #line hidden + + + #line 358 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Grid UpperStart2; @@ -57,7 +89,7 @@ namespace XGL.FormItem { #line hidden - #line 361 "..\..\..\..\FormItem\Main.xaml" + #line 365 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ContentControl Index; @@ -65,7 +97,7 @@ namespace XGL.FormItem { #line hidden - #line 390 "..\..\..\..\FormItem\Main.xaml" + #line 394 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Label LabDate; @@ -73,7 +105,7 @@ namespace XGL.FormItem { #line hidden - #line 401 "..\..\..\..\FormItem\Main.xaml" + #line 405 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Label LabTime; @@ -81,7 +113,7 @@ namespace XGL.FormItem { #line hidden - #line 451 "..\..\..\..\FormItem\Main.xaml" + #line 455 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.StackPanel DownStart; @@ -89,7 +121,15 @@ namespace XGL.FormItem { #line hidden - #line 473 "..\..\..\..\FormItem\Main.xaml" + #line 478 "..\..\..\..\FormItem\Main.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Button btnZXH; + + #line default + #line hidden + + + #line 486 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button btnFault; @@ -131,6 +171,12 @@ namespace XGL.FormItem { #line 11 "..\..\..\..\FormItem\Main.xaml" ((XGL.FormItem.Main)(target)).Closed += new System.EventHandler(this.Close); + #line default + #line hidden + + #line 15 "..\..\..\..\FormItem\Main.xaml" + ((XGL.FormItem.Main)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Window_Loaded); + #line default #line hidden return; @@ -138,24 +184,45 @@ namespace XGL.FormItem { this.UpperStart1 = ((System.Windows.Controls.StackPanel)(target)); return; case 3: - this.UpperStart2 = ((System.Windows.Controls.Grid)(target)); + this.tbFactory = ((System.Windows.Controls.TextBlock)(target)); return; case 4: - this.Index = ((System.Windows.Controls.ContentControl)(target)); + this.tbLineCode = ((System.Windows.Controls.TextBlock)(target)); return; case 5: - this.LabDate = ((System.Windows.Controls.Label)(target)); + this.tbDevice = ((System.Windows.Controls.TextBlock)(target)); return; case 6: - this.LabTime = ((System.Windows.Controls.Label)(target)); + this.tbOperator = ((System.Windows.Controls.TextBlock)(target)); return; case 7: - this.DownStart = ((System.Windows.Controls.StackPanel)(target)); + this.UpperStart2 = ((System.Windows.Controls.Grid)(target)); return; case 8: - this.btnFault = ((System.Windows.Controls.Button)(target)); + this.Index = ((System.Windows.Controls.ContentControl)(target)); + return; + case 9: + this.LabDate = ((System.Windows.Controls.Label)(target)); + return; + case 10: + this.LabTime = ((System.Windows.Controls.Label)(target)); + return; + case 11: + this.DownStart = ((System.Windows.Controls.StackPanel)(target)); + return; + case 12: + this.btnZXH = ((System.Windows.Controls.Button)(target)); #line 478 "..\..\..\..\FormItem\Main.xaml" + this.btnZXH.Click += new System.Windows.RoutedEventHandler(this.btnZXH_Click); + + #line default + #line hidden + return; + case 13: + this.btnFault = ((System.Windows.Controls.Button)(target)); + + #line 491 "..\..\..\..\FormItem\Main.xaml" this.btnFault.Click += new System.Windows.RoutedEventHandler(this.btnExit_Click); #line default diff --git a/shangjian/XGL/obj/x86/Debug/FormItem/Main.g.i.cs b/shangjian/XGL/obj/x86/Debug/FormItem/Main.g.i.cs index d064e6b..ae0109b 100644 --- a/shangjian/XGL/obj/x86/Debug/FormItem/Main.g.i.cs +++ b/shangjian/XGL/obj/x86/Debug/FormItem/Main.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\FormItem\Main.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "37C438E1EAF0683518728F4D4D56C558F66FDFE8AAD314B65D85A076FD054124" +#pragma checksum "..\..\..\..\FormItem\Main.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FB9BE4D3807DFA418587F91BFC9ACFE62EDC194602590A2D9DE86AD3FA0F3F41" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -49,7 +49,39 @@ namespace XGL.FormItem { #line hidden - #line 354 "..\..\..\..\FormItem\Main.xaml" + #line 239 "..\..\..\..\FormItem\Main.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBlock tbFactory; + + #line default + #line hidden + + + #line 260 "..\..\..\..\FormItem\Main.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBlock tbLineCode; + + #line default + #line hidden + + + #line 325 "..\..\..\..\FormItem\Main.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBlock tbDevice; + + #line default + #line hidden + + + #line 347 "..\..\..\..\FormItem\Main.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBlock tbOperator; + + #line default + #line hidden + + + #line 358 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Grid UpperStart2; @@ -57,7 +89,7 @@ namespace XGL.FormItem { #line hidden - #line 361 "..\..\..\..\FormItem\Main.xaml" + #line 365 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ContentControl Index; @@ -65,7 +97,7 @@ namespace XGL.FormItem { #line hidden - #line 390 "..\..\..\..\FormItem\Main.xaml" + #line 394 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Label LabDate; @@ -73,7 +105,7 @@ namespace XGL.FormItem { #line hidden - #line 401 "..\..\..\..\FormItem\Main.xaml" + #line 405 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Label LabTime; @@ -81,7 +113,7 @@ namespace XGL.FormItem { #line hidden - #line 451 "..\..\..\..\FormItem\Main.xaml" + #line 455 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.StackPanel DownStart; @@ -89,7 +121,15 @@ namespace XGL.FormItem { #line hidden - #line 473 "..\..\..\..\FormItem\Main.xaml" + #line 478 "..\..\..\..\FormItem\Main.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Button btnZXH; + + #line default + #line hidden + + + #line 486 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button btnFault; @@ -131,6 +171,12 @@ namespace XGL.FormItem { #line 11 "..\..\..\..\FormItem\Main.xaml" ((XGL.FormItem.Main)(target)).Closed += new System.EventHandler(this.Close); + #line default + #line hidden + + #line 15 "..\..\..\..\FormItem\Main.xaml" + ((XGL.FormItem.Main)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Window_Loaded); + #line default #line hidden return; @@ -138,24 +184,45 @@ namespace XGL.FormItem { this.UpperStart1 = ((System.Windows.Controls.StackPanel)(target)); return; case 3: - this.UpperStart2 = ((System.Windows.Controls.Grid)(target)); + this.tbFactory = ((System.Windows.Controls.TextBlock)(target)); return; case 4: - this.Index = ((System.Windows.Controls.ContentControl)(target)); + this.tbLineCode = ((System.Windows.Controls.TextBlock)(target)); return; case 5: - this.LabDate = ((System.Windows.Controls.Label)(target)); + this.tbDevice = ((System.Windows.Controls.TextBlock)(target)); return; case 6: - this.LabTime = ((System.Windows.Controls.Label)(target)); + this.tbOperator = ((System.Windows.Controls.TextBlock)(target)); return; case 7: - this.DownStart = ((System.Windows.Controls.StackPanel)(target)); + this.UpperStart2 = ((System.Windows.Controls.Grid)(target)); return; case 8: - this.btnFault = ((System.Windows.Controls.Button)(target)); + this.Index = ((System.Windows.Controls.ContentControl)(target)); + return; + case 9: + this.LabDate = ((System.Windows.Controls.Label)(target)); + return; + case 10: + this.LabTime = ((System.Windows.Controls.Label)(target)); + return; + case 11: + this.DownStart = ((System.Windows.Controls.StackPanel)(target)); + return; + case 12: + this.btnZXH = ((System.Windows.Controls.Button)(target)); #line 478 "..\..\..\..\FormItem\Main.xaml" + this.btnZXH.Click += new System.Windows.RoutedEventHandler(this.btnZXH_Click); + + #line default + #line hidden + return; + case 13: + this.btnFault = ((System.Windows.Controls.Button)(target)); + + #line 491 "..\..\..\..\FormItem\Main.xaml" this.btnFault.Click += new System.Windows.RoutedEventHandler(this.btnExit_Click); #line default 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 8a49e0d..3743ac3 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}" "D9E3179827221A00BEA649ACD732FB0E9CC436811E9855942DA07795C69E0298" +#pragma checksum "..\..\..\..\Views\LanJu_Complete.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A734146014090369F7C815DBE3432D497FFFDCD44CD3EDB950E7A73238C9FB39" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -40,6 +40,14 @@ namespace XGL.Views { /// public partial class LanJu_Complete : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { + + #line 23 "..\..\..\..\Views\LanJu_Complete.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.DataGrid datagrid1; + + #line default + #line hidden + private bool _contentLoaded; /// @@ -68,6 +76,20 @@ namespace XGL.Views { [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) { + switch (connectionId) + { + case 1: + + #line 10 "..\..\..\..\Views\LanJu_Complete.xaml" + ((XGL.Views.LanJu_Complete)(target)).Loaded += new System.Windows.RoutedEventHandler(this.UserControl_Loaded); + + #line default + #line hidden + return; + case 2: + this.datagrid1 = ((System.Windows.Controls.DataGrid)(target)); + 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 8a49e0d..3743ac3 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}" "D9E3179827221A00BEA649ACD732FB0E9CC436811E9855942DA07795C69E0298" +#pragma checksum "..\..\..\..\Views\LanJu_Complete.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A734146014090369F7C815DBE3432D497FFFDCD44CD3EDB950E7A73238C9FB39" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -40,6 +40,14 @@ namespace XGL.Views { /// public partial class LanJu_Complete : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { + + #line 23 "..\..\..\..\Views\LanJu_Complete.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.DataGrid datagrid1; + + #line default + #line hidden + private bool _contentLoaded; /// @@ -68,6 +76,20 @@ namespace XGL.Views { [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) { + switch (connectionId) + { + case 1: + + #line 10 "..\..\..\..\Views\LanJu_Complete.xaml" + ((XGL.Views.LanJu_Complete)(target)).Loaded += new System.Windows.RoutedEventHandler(this.UserControl_Loaded); + + #line default + #line hidden + return; + case 2: + this.datagrid1 = ((System.Windows.Controls.DataGrid)(target)); + 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 ce1e377..3db462c 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}" "C47342758549A6204F02CF8D035A1B42888A57A6286A87E27999CBF1733823DB" +#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CE0F630FE34B7BD37C2CEDBD08637C86F9F3DA587E00331C2922D20490DD20A7" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -40,6 +40,14 @@ namespace XGL.Views { /// public partial class LanJu_InOut : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { + + #line 23 "..\..\..\..\Views\LanJu_InOut.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.DataGrid dgInOutRecord; + + #line default + #line hidden + private bool _contentLoaded; /// @@ -68,6 +76,20 @@ namespace XGL.Views { [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) { + switch (connectionId) + { + case 1: + + #line 10 "..\..\..\..\Views\LanJu_InOut.xaml" + ((XGL.Views.LanJu_InOut)(target)).Loaded += new System.Windows.RoutedEventHandler(this.UserControl_Loaded); + + #line default + #line hidden + return; + case 2: + this.dgInOutRecord = ((System.Windows.Controls.DataGrid)(target)); + return; + } this._contentLoaded = true; } } 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 ce1e377..3db462c 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}" "C47342758549A6204F02CF8D035A1B42888A57A6286A87E27999CBF1733823DB" +#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CE0F630FE34B7BD37C2CEDBD08637C86F9F3DA587E00331C2922D20490DD20A7" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -40,6 +40,14 @@ namespace XGL.Views { /// public partial class LanJu_InOut : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { + + #line 23 "..\..\..\..\Views\LanJu_InOut.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.DataGrid dgInOutRecord; + + #line default + #line hidden + private bool _contentLoaded; /// @@ -68,6 +76,20 @@ namespace XGL.Views { [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) { + switch (connectionId) + { + case 1: + + #line 10 "..\..\..\..\Views\LanJu_InOut.xaml" + ((XGL.Views.LanJu_InOut)(target)).Loaded += new System.Windows.RoutedEventHandler(this.UserControl_Loaded); + + #line default + #line hidden + return; + case 2: + this.dgInOutRecord = ((System.Windows.Controls.DataGrid)(target)); + return; + } this._contentLoaded = true; } } diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml index c0175e6..3525dc4 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 7c45ebe..b7bf1ce 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,4 @@ -#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "AB2B051561FC0AAF8ADA21B038D7FC9FF8BB10872AA9B534F58D0EA6F74E4619" +#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "68237B91A8A2E3D55441027A55A5911DD4A1E43F40363D724C13524E9FCA7AEB" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -29,6 +29,7 @@ using System.Windows.Media.TextFormatting; using System.Windows.Navigation; using System.Windows.Shapes; using System.Windows.Shell; +using XGL.Tools; namespace XGL.Views { @@ -40,7 +41,39 @@ namespace XGL.Views { public partial class LanJu_Operator : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { - #line 418 "..\..\..\..\Views\LanJu_Operator.xaml" + #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 104 "..\..\..\..\Views\LanJu_Operator.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Label LbDeviceState; + + #line default + #line hidden + + + #line 199 "..\..\..\..\Views\LanJu_Operator.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Button btnPause; + + #line default + #line hidden + + + #line 301 "..\..\..\..\Views\LanJu_Operator.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.DataGrid dgWorkOrderInfo; + + #line default + #line hidden + + + #line 425 "..\..\..\..\Views\LanJu_Operator.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ContentControl Window1; @@ -48,7 +81,7 @@ namespace XGL.Views { #line hidden - #line 426 "..\..\..\..\Views\LanJu_Operator.xaml" + #line 433 "..\..\..\..\Views\LanJu_Operator.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ContentControl Window2; @@ -86,57 +119,65 @@ namespace XGL.Views { switch (connectionId) { case 1: + this.UCOperator = ((XGL.Views.LanJu_Operator)(target)); - #line 248 "..\..\..\..\Views\LanJu_Operator.xaml" - ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click); + #line 12 "..\..\..\..\Views\LanJu_Operator.xaml" + this.UCOperator.Loaded += new System.Windows.RoutedEventHandler(this.UCOperator_Loaded); #line default #line hidden return; case 2: - - #line 269 "..\..\..\..\Views\LanJu_Operator.xaml" - ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click); - - #line default - #line hidden + this.LbDeviceState = ((System.Windows.Controls.Label)(target)); return; case 3: + this.btnPause = ((System.Windows.Controls.Button)(target)); - #line 345 "..\..\..\..\Views\LanJu_Operator.xaml" - ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click); + #line 200 "..\..\..\..\Views\LanJu_Operator.xaml" + this.btnPause.Click += new System.Windows.RoutedEventHandler(this.btnPause_Click); #line default #line hidden return; case 4: - #line 358 "..\..\..\..\Views\LanJu_Operator.xaml" - ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Complete_Click); + #line 247 "..\..\..\..\Views\LanJu_Operator.xaml" + ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click); #line default #line hidden return; case 5: - #line 371 "..\..\..\..\Views\LanJu_Operator.xaml" - ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.DeviceItems_Click); + #line 268 "..\..\..\..\Views\LanJu_Operator.xaml" + ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click); #line default #line hidden return; case 6: + this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target)); + return; + case 7: - #line 384 "..\..\..\..\Views\LanJu_Operator.xaml" - ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Paused_Click); + #line 352 "..\..\..\..\Views\LanJu_Operator.xaml" + ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click); #line default #line hidden return; - case 7: + case 8: + + #line 365 "..\..\..\..\Views\LanJu_Operator.xaml" + ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Complete_Click); + + #line default + #line hidden + return; + case 9: this.Window1 = ((System.Windows.Controls.ContentControl)(target)); return; - case 8: + case 10: this.Window2 = ((System.Windows.Controls.ContentControl)(target)); return; } 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 7c45ebe..b7bf1ce 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}" "AB2B051561FC0AAF8ADA21B038D7FC9FF8BB10872AA9B534F58D0EA6F74E4619" +#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "68237B91A8A2E3D55441027A55A5911DD4A1E43F40363D724C13524E9FCA7AEB" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -29,6 +29,7 @@ using System.Windows.Media.TextFormatting; using System.Windows.Navigation; using System.Windows.Shapes; using System.Windows.Shell; +using XGL.Tools; namespace XGL.Views { @@ -40,7 +41,39 @@ namespace XGL.Views { public partial class LanJu_Operator : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { - #line 418 "..\..\..\..\Views\LanJu_Operator.xaml" + #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 104 "..\..\..\..\Views\LanJu_Operator.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Label LbDeviceState; + + #line default + #line hidden + + + #line 199 "..\..\..\..\Views\LanJu_Operator.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Button btnPause; + + #line default + #line hidden + + + #line 301 "..\..\..\..\Views\LanJu_Operator.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.DataGrid dgWorkOrderInfo; + + #line default + #line hidden + + + #line 425 "..\..\..\..\Views\LanJu_Operator.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ContentControl Window1; @@ -48,7 +81,7 @@ namespace XGL.Views { #line hidden - #line 426 "..\..\..\..\Views\LanJu_Operator.xaml" + #line 433 "..\..\..\..\Views\LanJu_Operator.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ContentControl Window2; @@ -86,57 +119,65 @@ namespace XGL.Views { switch (connectionId) { case 1: + this.UCOperator = ((XGL.Views.LanJu_Operator)(target)); - #line 248 "..\..\..\..\Views\LanJu_Operator.xaml" - ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click); + #line 12 "..\..\..\..\Views\LanJu_Operator.xaml" + this.UCOperator.Loaded += new System.Windows.RoutedEventHandler(this.UCOperator_Loaded); #line default #line hidden return; case 2: - - #line 269 "..\..\..\..\Views\LanJu_Operator.xaml" - ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click); - - #line default - #line hidden + this.LbDeviceState = ((System.Windows.Controls.Label)(target)); return; case 3: + this.btnPause = ((System.Windows.Controls.Button)(target)); - #line 345 "..\..\..\..\Views\LanJu_Operator.xaml" - ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click); + #line 200 "..\..\..\..\Views\LanJu_Operator.xaml" + this.btnPause.Click += new System.Windows.RoutedEventHandler(this.btnPause_Click); #line default #line hidden return; case 4: - #line 358 "..\..\..\..\Views\LanJu_Operator.xaml" - ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Complete_Click); + #line 247 "..\..\..\..\Views\LanJu_Operator.xaml" + ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click); #line default #line hidden return; case 5: - #line 371 "..\..\..\..\Views\LanJu_Operator.xaml" - ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.DeviceItems_Click); + #line 268 "..\..\..\..\Views\LanJu_Operator.xaml" + ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click); #line default #line hidden return; case 6: + this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target)); + return; + case 7: - #line 384 "..\..\..\..\Views\LanJu_Operator.xaml" - ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Paused_Click); + #line 352 "..\..\..\..\Views\LanJu_Operator.xaml" + ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click); #line default #line hidden return; - case 7: + case 8: + + #line 365 "..\..\..\..\Views\LanJu_Operator.xaml" + ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Complete_Click); + + #line default + #line hidden + return; + case 9: this.Window1 = ((System.Windows.Controls.ContentControl)(target)); return; - case 8: + case 10: this.Window2 = ((System.Windows.Controls.ContentControl)(target)); return; } diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.cs index b8e08ff..3c3b43f 100644 --- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.cs +++ b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "79641976A1D3FBA064588F5FBE49D6B549B2778A4A4E294C45C3887DB50008EF" +#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "394B8FC940C20C47AE49432AD455CC792EB4379B4033CFF6C4D39F94106589D1" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -29,6 +29,7 @@ using System.Windows.Media.TextFormatting; using System.Windows.Navigation; using System.Windows.Shapes; using System.Windows.Shell; +using XGL.Tools; using XGL.Views; @@ -80,7 +81,7 @@ namespace XGL.Views { { case 1: - #line 10 "..\..\..\..\Views\LanJu_Prepare.xaml" + #line 11 "..\..\..\..\Views\LanJu_Prepare.xaml" ((XGL.Views.LanJu_Prepare)(target)).Loaded += new System.Windows.RoutedEventHandler(this.UserControl_Loaded); #line default diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.i.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.i.cs index b8e08ff..3c3b43f 100644 --- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.i.cs +++ b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "79641976A1D3FBA064588F5FBE49D6B549B2778A4A4E294C45C3887DB50008EF" +#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "394B8FC940C20C47AE49432AD455CC792EB4379B4033CFF6C4D39F94106589D1" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -29,6 +29,7 @@ using System.Windows.Media.TextFormatting; using System.Windows.Navigation; using System.Windows.Shapes; using System.Windows.Shell; +using XGL.Tools; using XGL.Views; @@ -80,7 +81,7 @@ namespace XGL.Views { { case 1: - #line 10 "..\..\..\..\Views\LanJu_Prepare.xaml" + #line 11 "..\..\..\..\Views\LanJu_Prepare.xaml" ((XGL.Views.LanJu_Prepare)(target)).Loaded += new System.Windows.RoutedEventHandler(this.UserControl_Loaded); #line default diff --git a/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache b/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache index 45072c9..009969b 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.csproj.CoreCompileInputs.cache b/shangjian/XGL/obj/x86/Debug/XGL.csproj.CoreCompileInputs.cache index 68fbea2..7642eee 100644 --- a/shangjian/XGL/obj/x86/Debug/XGL.csproj.CoreCompileInputs.cache +++ b/shangjian/XGL/obj/x86/Debug/XGL.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD c23811e111f40b16b81ddee103d879c0c47d4bf7 +======= +faa284e7164f694a865d6b02088b958d74599d7b +>>>>>>> babf7ea9e37642c626439584d080cf06049abc5f diff --git a/shangjian/XGL/obj/x86/Debug/XGL.csproj.FileListAbsolute.txt b/shangjian/XGL/obj/x86/Debug/XGL.csproj.FileListAbsolute.txt index e49ad16..59b2189 100644 --- a/shangjian/XGL/obj/x86/Debug/XGL.csproj.FileListAbsolute.txt +++ b/shangjian/XGL/obj/x86/Debug/XGL.csproj.FileListAbsolute.txt @@ -2086,6 +2086,7 @@ D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\XGL.Prop D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\XGL.csproj.CoreCompileInputs.cache D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\XGL.csproj.CopyComplete D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\XGL.exe +<<<<<<< HEAD E:\workspace\LanJu\client\shangjian\XGL\bin\x86\Debug\Config\log4net.config E:\workspace\LanJu\client\shangjian\XGL\bin\x86\Debug\snap7.dll E:\workspace\LanJu\client\shangjian\XGL\bin\x86\Debug\config\ConnectionConfig.Config @@ -2355,3 +2356,11 @@ E:\workspace\LanJu\client\shangjian\XGL\obj\x86\Debug\XGL.csproj.CoreCompileInpu E:\workspace\LanJu\client\shangjian\XGL\obj\x86\Debug\XGL.csproj.CopyComplete E:\workspace\LanJu\client\shangjian\XGL\obj\x86\Debug\XGL.exe E:\workspace\LanJu\client\shangjian\XGL\obj\x86\Debug\XGL.pdb +======= +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\CheckUserWin.g.cs +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\CheckUserWin.baml +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Tools\ModuleUC.g.cs +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\DryingRoomUC.g.cs +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Tools\ModuleUC.baml +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\DryingRoomUC.baml +>>>>>>> babf7ea9e37642c626439584d080cf06049abc5f diff --git a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache index 9f5721c..d888c0e 100644 --- a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache +++ b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache @@ -9,12 +9,21 @@ XGL none false DEBUG;TRACE +<<<<<<< HEAD E:\workspace\LanJu\client\shangjian\XGL\App.xaml 51-449314787 3-297253631 62596019463 511606894072 CSS\DataGridClass.xaml;CSS\NormalSmlBtnClass.xaml;CSS\SearchBtnClass.xaml;CSS\Style.xaml;CSS\SearchTextClass.xaml;CSS\TabControl.xaml;FormItem\FormBlankingBoard.xaml;FormItem\FormBoard.xaml;FormItem\FormChargingBoard.xaml;FormItem\FormLocator.xaml;FormItem\FormOutBoxBoard.xaml;FormItem\FormShowSelect.xaml;FormItem\Main.xaml;LoginPage.xaml;MainWindow.xaml;UControl\ordertj.xaml;UControl\orderzfzy.xaml;UControl\orderzy.xaml;UControl\product_order.xaml;UControl\product_ordertj.xaml;UControl\product_orderzfzy.xaml;UControl\product_orderzy.xaml;UControl\UCArea.xaml;UControl\UCBoard.xaml;UControl\UCCar.xaml;UControl\UCCarL.xaml;UControl\UCLMix.xaml;UControl\UCMix.xaml;UControl\UCMixR.xaml;UControl\UCPermissionList.xaml;UControl\UCPostionList.xaml;UControl\UCProgressBar.xaml;UControl\UCRoleList.xaml;UControl\UCRProgressBar.xaml;UControl\UCStorage.xaml;UControl\UCStorageNew.xaml;UControl\UCStorageNewx.xaml;UControl\UCTakeOff.xaml;UControl\UCUserList.xaml;Views\LanJu_Complete.xaml;Views\LanJu_DeviceItems.xaml;Views\LanJu_Flow.xaml;Views\LanJu_Index.xaml;Views\LanJu_InOut.xaml;Views\LanJu_Material.xaml;Views\LanJu_NowUser.xaml;Views\LanJu_Operator.xaml;Views\LanJu_Paused.xaml;Views\LanJu_Prepare.xaml;Views\LanJu_User.xaml;Views\LanJu_UserRecord.xaml; +======= +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\App.xaml +54-2004655723 +3-297253631 +661168773745 +511587517384 +CSS\DataGridClass.xaml;CSS\NormalSmlBtnClass.xaml;CSS\SearchBtnClass.xaml;CSS\Style.xaml;CSS\SearchTextClass.xaml;CSS\TabControl.xaml;FormItem\FormBlankingBoard.xaml;FormItem\FormBoard.xaml;FormItem\FormChargingBoard.xaml;FormItem\FormLocator.xaml;FormItem\FormOutBoxBoard.xaml;FormItem\FormShowSelect.xaml;FormItem\Main.xaml;LoginPage.xaml;MainWindow.xaml;Tools\ModuleUC.xaml;UControl\ordertj.xaml;UControl\orderzfzy.xaml;UControl\orderzy.xaml;UControl\product_order.xaml;UControl\product_ordertj.xaml;UControl\product_orderzfzy.xaml;UControl\product_orderzy.xaml;UControl\UCArea.xaml;UControl\UCBoard.xaml;UControl\UCCar.xaml;UControl\UCCarL.xaml;UControl\UCLMix.xaml;UControl\UCMix.xaml;UControl\UCMixR.xaml;UControl\UCPermissionList.xaml;UControl\UCPostionList.xaml;UControl\UCProgressBar.xaml;UControl\UCRoleList.xaml;UControl\UCRProgressBar.xaml;UControl\UCStorage.xaml;UControl\UCStorageNew.xaml;UControl\UCStorageNewx.xaml;UControl\UCTakeOff.xaml;UControl\UCUserList.xaml;Views\CheckUserWin.xaml;Views\DryingRoomUC.xaml;Views\LanJu_Complete.xaml;Views\LanJu_DeviceItems.xaml;Views\LanJu_Flow.xaml;Views\LanJu_Index.xaml;Views\LanJu_InOut.xaml;Views\LanJu_Material.xaml;Views\LanJu_NowUser.xaml;Views\LanJu_Operator.xaml;Views\LanJu_Paused.xaml;Views\LanJu_Prepare.xaml;Views\LanJu_User.xaml;Views\LanJu_UserRecord.xaml; +>>>>>>> babf7ea9e37642c626439584d080cf06049abc5f False diff --git a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.i.cache b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.i.cache index e16c079..daf1e56 100644 --- a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.i.cache +++ b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.i.cache @@ -4,17 +4,17 @@ winexe C# .cs -D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\ +E:\workspace\LanJu\client\shangjian\XGL\obj\x86\Debug\ XGL none false DEBUG;TRACE -D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\App.xaml -51-449314787 +E:\workspace\LanJu\client\shangjian\XGL\App.xaml +54-2004655723 3-297253631 -63-816002294 -511587517384 -CSS\DataGridClass.xaml;CSS\NormalSmlBtnClass.xaml;CSS\SearchBtnClass.xaml;CSS\Style.xaml;CSS\SearchTextClass.xaml;CSS\TabControl.xaml;FormItem\FormBlankingBoard.xaml;FormItem\FormBoard.xaml;FormItem\FormChargingBoard.xaml;FormItem\FormLocator.xaml;FormItem\FormOutBoxBoard.xaml;FormItem\FormShowSelect.xaml;FormItem\Main.xaml;LoginPage.xaml;MainWindow.xaml;UControl\ordertj.xaml;UControl\orderzfzy.xaml;UControl\orderzy.xaml;UControl\product_order.xaml;UControl\product_ordertj.xaml;UControl\product_orderzfzy.xaml;UControl\product_orderzy.xaml;UControl\UCArea.xaml;UControl\UCBoard.xaml;UControl\UCCar.xaml;UControl\UCCarL.xaml;UControl\UCLMix.xaml;UControl\UCMix.xaml;UControl\UCMixR.xaml;UControl\UCPermissionList.xaml;UControl\UCPostionList.xaml;UControl\UCProgressBar.xaml;UControl\UCRoleList.xaml;UControl\UCRProgressBar.xaml;UControl\UCStorage.xaml;UControl\UCStorageNew.xaml;UControl\UCStorageNewx.xaml;UControl\UCTakeOff.xaml;UControl\UCUserList.xaml;Views\LanJu_Complete.xaml;Views\LanJu_DeviceItems.xaml;Views\LanJu_Flow.xaml;Views\LanJu_Index.xaml;Views\LanJu_InOut.xaml;Views\LanJu_Material.xaml;Views\LanJu_NowUser.xaml;Views\LanJu_Operator.xaml;Views\LanJu_Paused.xaml;Views\LanJu_Prepare.xaml;Views\LanJu_User.xaml;Views\LanJu_UserRecord.xaml; +67-243248012 +511606894072 +CSS\DataGridClass.xaml;CSS\NormalSmlBtnClass.xaml;CSS\SearchBtnClass.xaml;CSS\Style.xaml;CSS\SearchTextClass.xaml;CSS\TabControl.xaml;FormItem\FormBlankingBoard.xaml;FormItem\FormBoard.xaml;FormItem\FormChargingBoard.xaml;FormItem\FormLocator.xaml;FormItem\FormOutBoxBoard.xaml;FormItem\FormShowSelect.xaml;FormItem\Main.xaml;LoginPage.xaml;MainWindow.xaml;Tools\ModuleUC.xaml;UControl\ordertj.xaml;UControl\orderzfzy.xaml;UControl\orderzy.xaml;UControl\product_order.xaml;UControl\product_ordertj.xaml;UControl\product_orderzfzy.xaml;UControl\product_orderzy.xaml;UControl\UCArea.xaml;UControl\UCBoard.xaml;UControl\UCCar.xaml;UControl\UCCarL.xaml;UControl\UCLMix.xaml;UControl\UCMix.xaml;UControl\UCMixR.xaml;UControl\UCPermissionList.xaml;UControl\UCPostionList.xaml;UControl\UCProgressBar.xaml;UControl\UCRoleList.xaml;UControl\UCRProgressBar.xaml;UControl\UCStorage.xaml;UControl\UCStorageNew.xaml;UControl\UCStorageNewx.xaml;UControl\UCTakeOff.xaml;UControl\UCUserList.xaml;Views\CheckUserWin.xaml;Views\DryingRoomUC.xaml;Views\LanJu_Complete.xaml;Views\LanJu_DeviceItems.xaml;Views\LanJu_Flow.xaml;Views\LanJu_Index.xaml;Views\LanJu_InOut.xaml;Views\LanJu_Material.xaml;Views\LanJu_NowUser.xaml;Views\LanJu_Operator.xaml;Views\LanJu_Paused.xaml;Views\LanJu_Prepare.xaml;Views\LanJu_User.xaml;Views\LanJu_UserRecord.xaml; True diff --git a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref index 1812c42..b70931b 100644 --- a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref +++ b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref @@ -1,5 +1,6 @@  +<<<<<<< HEAD FE:\workspace\LanJu\client\shangjian\XGL\FormItem\FormBlankingBoard.xaml;; FE:\workspace\LanJu\client\shangjian\XGL\FormItem\FormBoard.xaml;; FE:\workspace\LanJu\client\shangjian\XGL\FormItem\FormChargingBoard.xaml;; @@ -42,4 +43,52 @@ FE:\workspace\LanJu\client\shangjian\XGL\Views\LanJu_Paused.xaml;; FE:\workspace\LanJu\client\shangjian\XGL\Views\LanJu_Prepare.xaml;; FE:\workspace\LanJu\client\shangjian\XGL\Views\LanJu_User.xaml;; FE:\workspace\LanJu\client\shangjian\XGL\Views\LanJu_UserRecord.xaml;; +======= +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormBlankingBoard.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormBoard.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormChargingBoard.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormLocator.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormOutBoxBoard.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormShowSelect.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\Main.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Tools\ModuleUC.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\ordertj.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\orderzfzy.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\orderzy.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\product_order.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\product_ordertj.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\product_orderzfzy.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\product_orderzy.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCArea.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCBoard.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCCar.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCCarL.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCLMix.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCMix.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCMixR.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCPermissionList.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCPostionList.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCProgressBar.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCRoleList.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCRProgressBar.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCStorage.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCStorageNew.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCStorageNewx.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCTakeOff.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCUserList.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\CheckUserWin.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\DryingRoomUC.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Complete.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_DeviceItems.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Flow.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Index.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_InOut.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Material.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_NowUser.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Operator.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Paused.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Prepare.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_User.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_UserRecord.xaml;; +>>>>>>> babf7ea9e37642c626439584d080cf06049abc5f