3

shangjian/CommonFunc/LoginUserInfo.cs

@@ -25,5 +25,15 @@ namespace CommonFunc
         /// 员工姓名
         /// </summary>
         public static string UserName { get; set; }
+
+        /// <summary>
+        /// 班组
+        /// </summary>
+        public static string TeamCode { get; set; }
+
+        /// <summary>
+        /// 班次
+        /// </summary>
+        public static string ShiftCode { get; set; }
     }
 }

shangjian/XGL.Data/DBService/DBService.cs

@@ -16,9 +16,6 @@ namespace CentralControl.DBDAO
 {
     public class DBService
     { 
-
-
-
         /// <summary>
         /// 得到一个对象实体集合
         /// </summary>
@@ -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;
+        }
+
         /// <summary>
         /// 删除一条数据
         /// </summary>
@@ -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'
+"; //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;
         }
 
+        /// <summary>
+        /// 获取工单是否齐套
+        /// </summary>
+        /// <returns></returns>
+        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;
+            
+        }
+
+
         /// <summary>
         /// 获取湿料计划指向的成型机
         /// </summary>

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
+    {
+        /// <summary>
+        /// 获取烘房列表
+        /// </summary>
+        /// <param name="bdt"></param>
+        /// <param name="edt"></param>
+        /// <returns></returns>
+        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;
+        }
+
+
+
+        /// <summary>
+        /// 获取烘房内数据
+        /// </summary>
+        /// <param name="bdt"></param>
+        /// <param name="edt"></param>
+        /// <returns></returns>
+        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;
+        }
+    }
+}

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
+    {
+        /// <summary>
+        /// 获取成型机在产物料信息
+        /// </summary>
+        /// <param name="bdt"></param>
+        /// <param name="edt"></param>
+        /// <returns></returns>
+        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;
+        }
+
+        /// <summary>
+        /// 获取成型机状态
+        /// </summary>
+        /// <param name="bdt"></param>
+        /// <param name="edt"></param>
+        /// <returns></returns>
+        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;
+        }
+
+        /// <summary>
+        /// 查询出入记录
+        /// </summary>
+        /// <param name="bdt"></param>
+        /// <param name="edt"></param>
+        /// <returns></returns>
+        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;
+        }
+
+        /// <summary>
+        /// 查询完成记录
+        /// </summary>
+        /// <param name="bdt"></param>
+        /// <param name="edt"></param>
+        /// <returns></returns>
+        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;
+        }
+
+        /// <summary>
+        /// 暂停工单
+        /// </summary>
+        /// <param name="bdt"></param>
+        /// <param name="edt"></param>
+        /// <returns></returns>
+        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;
+        }
+    }
+}

shangjian/XGL.Data/XGL.Data.csproj

@@ -96,6 +96,8 @@
     <Compile Include="data_carmaterialDb.cs" />
     <Compile Include="data_carproductDb.cs" />
     <Compile Include="DBService\DBService.cs" />
+    <Compile Include="DBService\DringRoomService.cs" />
+    <Compile Include="DBService\FormingMachineService.cs" />
     <Compile Include="DBService\MESDBService.cs" />
     <Compile Include="filedatasDb.cs" />
     <Compile Include="permissionDB.cs" />

shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-88b89d70a90af1deba654dc2d2264eaade3d0c27
+79f02adf94b81a462e2d021ffaeb806c569f29e2

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;
         }

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; }
+        
+    }
+}

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; }
  
     }
 }

shangjian/XGL.Model/XGL.Models.csproj

@@ -97,6 +97,7 @@
     <Compile Include="Model\CarRealInfo.cs" />
     <Compile Include="Model\CarMaterial.cs" />
     <Compile Include="Model\CarProduct.cs" />
+    <Compile Include="Model\FoamingMac\FoamingMacModel.cs" />
     <Compile Include="Model\LineCatchArea.cs" />
     <Compile Include="Model\LinePreInfo.cs" />
     <Compile Include="Model\MaterialBom.cs" />

shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-00bbabdd01c605bce5f2d3e47dd2c7484c0442ea
+15e0079c678473a5e3606350c39806472a1461a2

shangjian/XGL/App.config

@@ -7,6 +7,12 @@
     </sectionGroup>
   </configSections>
   <appSettings> 
+	  <!--车间编码-->
+	  <add key="SiteCode" value="BPZ01"/>
+	  <!--设备编码-->
+	  <add key="DeviceCode" value="C1"/>
+	  <!--上位机类型 0:工单准备，1：成型机，2：烘房-->
+	  <add key="ClientMode" value="2"/>
     <!--上位机类型 1 上件 ，2 排空区  0下件区-->
     <add key="PostType" value="1"/>
     <!--线体编码-->
@@ -16,12 +22,14 @@
     <add key="plcport" value="60001"/>
 
     <add key="LineId" value="1"/>
-    <!--看板刷新时间 单位秒-->
+	  <!--看板刷新时间 单位秒-->
     <add key="BoardRefresh" value="60"/>
     <!--下件界面刷新时间 单位秒-->
     <add key="TakeOffRefresh" value="10"/>
     <!--排空区刷新时间 单位秒-->
     <add key="EmptyRefresh" value="10"/>
+	<!--获取设备状态间隔时间 单位秒-->
+	<add key="GetDeviceStateInterval" value="60"/>
     <add key="thriftIp" value="192.168.3.150"/>
     <!--上件点发车thrift端口  7911 ,7912-->
     <add key="thriftPort" value="7921"/>

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">
     <Window.Resources>
 
         <ResourceDictionary>
@@ -236,6 +236,7 @@
                             FontSize="20"
                             Text="车间：" />
                         <TextBlock
+                             x:Name="tbFactory" 
                             Margin="-45,0"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
@@ -255,8 +256,8 @@
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             FontSize="20"
-                            Text="车间：" />
-                        <TextBlock
+                            Text="线体：" />
+                        <TextBlock x:Name="tbLineCode" 
                             Margin="-45,0"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
@@ -264,7 +265,7 @@
                             Foreground="#1A68CA"
                             Text="黑蚊香车间" />
                     </StackPanel>
-                    <StackPanel
+                    <StackPanel Visibility="Collapsed"
                         Grid.Column="2"
                         Width="300"
                         Height="80"
@@ -286,6 +287,7 @@
                             Text="自动线甲组" />
                     </StackPanel>
                     <StackPanel
+                        Visibility="Collapsed"
                         Grid.Column="3"
                         Width="300"
                         Height="80"
@@ -320,6 +322,7 @@
                             FontSize="20"
                             Text="设备：" />
                         <TextBlock
+                            x:Name="tbDevice"
                             Margin="-45,0"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
@@ -341,6 +344,7 @@
                             FontSize="20"
                             Text="操作人员：" />
                         <TextBlock
+                            x:Name="tbOperator"
                             Margin="-45,0"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
@@ -450,16 +454,17 @@
             <StackPanel
                 x:Name="DownStart"
                 Canvas.Left="0"
-                Canvas.Top="1020"
+                Canvas.Top="1030"
                 Width="1920"
-                Height="85"
+                Height="Auto"
                 HorizontalAlignment="Center"
-                VerticalAlignment="Top"
+                VerticalAlignment="Center"
                 Background="White">
                 <StackPanel
                     Width="1920"
-                    Height="84"
+                    Height="Auto"
                     Margin="0"
+                    VerticalAlignment="Center"
                     HorizontalAlignment="Left"
                     Orientation="Horizontal">
                     <Label
@@ -469,11 +474,19 @@
                         Content="网络状态"
                         FontSize="20px"
                         Foreground="Black" />
+
+                    <Button  BorderThickness="1" BorderBrush="CornflowerBlue" Visibility="Visible" Background="Transparent"  FontSize="26" Height="50" Width="50" HorizontalAlignment="Left" x:Name="btnZXH"    Margin="1400,4,0,2" ToolTip="最小化" Click="btnZXH_Click"  >
+                        <!--<TextBlock  Name="BtnLogoff"  Text="{DynamicResource 退出}"  TextWrapping="WrapWithOverflow"></TextBlock>-->
+                        <StackPanel Orientation="Horizontal" Margin="2">
+                            <Image Source="..\Resources\zxh.png" Width="40" Height="40"/>
+                            <!--<Label VerticalAlignment="Center" FontSize="20" Foreground="White" HorizontalAlignment="Center">退出</Label>-->
+                        </StackPanel>
+                    </Button>
                     <Button
                         x:Name="btnFault"
-                        Width="200"
-                        Height="50"
-                        Margin="1500,0,0,0"
+                        Width="100"
+                        Height="40"
+                        Margin="100,0,0,0"
                         Background="#2F82E7"
                         Click="btnExit_Click"
                         Content="退出"

shangjian/XGL/FormItem/Main.xaml.cs

@@ -1,5 +1,9 @@
-using System;
+using CentralControl.DBDAO;
+using CommonFunc;
+using CommonFunc.Tools;
+using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -12,6 +16,7 @@ using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
+using XGL.Views;
 
 namespace XGL.FormItem
 {
@@ -23,6 +28,10 @@ namespace XGL.FormItem
         public static Main main; 
         Frame frame1 = new Frame() { Content = new Views.LanJu_Index()};
         Timer timer = new Timer();
+        LanJu_Prepare prepare = new LanJu_Prepare();
+        LanJu_Operator op = new LanJu_Operator();
+        DryingRoomUC dryingRoomUC = new DryingRoomUC();
+
         public enum WindowID
         {
             frame1
@@ -31,11 +40,29 @@ namespace XGL.FormItem
         {
             InitializeComponent();
             main = this;
-            WindowChange(WindowID.frame1);
+            //WindowChange(WindowID.frame1);
             CommonFunc.Common.ReadConfig();//读取配置文件
             timer.Interval = 1000;
             timer.Elapsed += Timer_Elapsed;
             timer.Start();
+
+            InitPage();
+        }
+
+        private void InitPage()
+        {
+            if (Utils.GetAppSetting("ClientMode").Equals("0"))
+            {
+                this.Index.Content = prepare;
+            }
+            else if (Utils.GetAppSetting("ClientMode").Equals("1"))
+            {
+                this.Index.Content = op;
+            }
+            else
+            {
+                this.Index.Content = dryingRoomUC;
+            }
         }
 
         private void Timer_Elapsed(object sender, ElapsedEventArgs e)
@@ -67,6 +94,22 @@ namespace XGL.FormItem
             }
         }
 
+        private void btnZXH_Click(object sender, RoutedEventArgs e)
+        {
+            this.WindowState = WindowState.Minimized;
+        }
+       
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            this.tbOperator.Text = LoginUser.UserName;
+            this.tbDevice.Text = Utils.GetAppSetting("DeviceCode"); 
+            string sitecode = Utils.GetAppSetting("SiteCode");
+            DBService userDbWareHouse = new DBService();
+            DataTable dt = userDbWareHouse.GetFactoryInfo(sitecode);
+            string name = dt == null?"": dt.Rows[0][0].ToString();
+            this.tbFactory.Text = name;
+        }
     }
   
 }

shangjian/XGL/Tools/ModuleUC.xaml

@@ -0,0 +1,58 @@
+<UserControl x:Class="XGL.Tools.ModuleUC"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:XGL.Tools"
+             mc:Ignorable="d" 
+             d:DesignHeight="150" d:DesignWidth="150">
+    <UserControl.Resources>
+        <Style TargetType="TextBlock">
+            <Setter Property="FontSize" Value="14"></Setter>
+            <Setter Property="FontWeight" Value="Bold"></Setter>
+            <Setter Property="FontFamily" Value="宋体"></Setter>
+            <Setter Property="Foreground" Value="Black"></Setter>
+        </Style>
+    </UserControl.Resources>
+    <Grid  Width="120" Height="120">
+        <!--<Grid.Background>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                <GradientStop Color="#07437F" Offset="0"/>
+                <GradientStop Color="#0B325A" Offset="0.3"/>
+                <GradientStop Color="#07437F" Offset="1"/>
+            </LinearGradientBrush>
+        </Grid.Background>-->
+        <Grid.RowDefinitions>
+            <RowDefinition/>
+            <RowDefinition Height="20"/>
+        </Grid.RowDefinitions>
+        <Border x:Name="bd" Grid.Row="0" BorderThickness="1.5" BorderBrush="Green">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition/>
+                    <RowDefinition/>
+                    <RowDefinition/>
+                    <RowDefinition/>
+                </Grid.RowDefinitions>
+                <StackPanel Orientation="Horizontal" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center">
+                    <TextBlock x:Name="TBType"  Text="RFID:" VerticalAlignment="Center" HorizontalAlignment="Center"></TextBlock>
+                    <TextBlock x:Name="TBRFID"  Text="A0001" VerticalAlignment="Center" HorizontalAlignment="Center"></TextBlock> 
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" Grid.Row="1" VerticalAlignment="Center"  HorizontalAlignment="Center">
+                    <TextBlock    Text="工单:" VerticalAlignment="Center" HorizontalAlignment="Center"></TextBlock>
+                    <TextBlock x:Name="TBOrderCode" Text="513907300" VerticalAlignment="Center" HorizontalAlignment="Center"></TextBlock>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" Grid.Row="2" VerticalAlignment="Center"  HorizontalAlignment="Center">
+                    <TextBlock   Grid.Row="3" Text="物料:" VerticalAlignment="Center" HorizontalAlignment="Center"></TextBlock>
+                    <TextBlock x:Name="TBMaterialCode"  Grid.Row="3" Text="abcdefg" VerticalAlignment="Center" HorizontalAlignment="Center" ></TextBlock>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" Grid.Row="3" VerticalAlignment="Center"  HorizontalAlignment="Center" Visibility="Collapsed">
+                    <TextBlock   Grid.Row="3" Text="时间:" VerticalAlignment="Center" HorizontalAlignment="Center"></TextBlock>
+                    <TextBlock x:Name="TBTime"  Grid.Row="3" Text="10" VerticalAlignment="Center" HorizontalAlignment="Center"></TextBlock>
+                </StackPanel>
+
+            </Grid>
+        </Border>
+        <TextBlock x:Name="TBID" Grid.Row="1" Text="1#" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="Green"></TextBlock>
+    </Grid>
+</UserControl>

shangjian/XGL/Tools/ModuleUC.xaml.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+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.Tools
+{
+    /// <summary>
+    /// ModuleUC.xaml 的交互逻辑
+    /// </summary>
+    public partial class ModuleUC : UserControl
+    {
+        string rfid = string.Empty;
+        string order = string.Empty;
+        string material = string.Empty;
+        string time = string.Empty;
+        string boardID = string.Empty;
+
+        public ModuleUC()
+        {
+            InitializeComponent();
+        }
+        public ModuleUC(string bID, string rfid, string orderCode, string materialCode, string times)
+        {
+            InitializeComponent();
+            //temp = t;
+            boardID = bID; 
+            this.TBID.Text = boardID + "#";
+            this.TBOrderCode.Text = orderCode;
+            this.TBMaterialCode.Text = materialCode;
+            this.TBRFID.Text = rfid;
+            this.TBTime.Text = times;
+
+            if (string.IsNullOrEmpty(rfid))
+            {
+                this.Background = Brushes.LightGray;
+                return;
+            }
+            //if (Convert.ToInt32(time) >= 7)
+            //{
+            //    this.Background = Brushes.LightGray;
+            //}
+            //else
+            //{
+            //    this.Background = Brushes.LightGray;
+            //}
+
+        }
+
+
+    }
+}

shangjian/XGL/Tools/MyValueConverter.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace XGL.Tools
+{
+    public class MyValueConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            // 根据输入值返回对应的输出值 已派发w1未派w0活动w2报工w3
+            if (value == "w1")
+            {
+                return "已派发";
+            }
+            else if (value == "w2")
+            {
+                return "活动";
+            }
+            else if (value == "w3")
+            {
+                return "报工";
+            }
+            else if (value == "w4")
+            {
+                return "暂停";
+            }
+            else
+            {
+                return "未派";
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            // 如果需要双向绑定，也需要实现 ConvertBack 方法
+            throw new NotImplementedException();
+        }
+    }
+}

shangjian/XGL/Views/CheckUserWin.xaml

@@ -0,0 +1,39 @@
+<Window x:Class="XGL.Views.CheckUserWin"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:XGL.Views"
+        mc:Ignorable="d"
+        Title="CheckUserWin" Height="350" Width="600" WindowStartupLocation="CenterScreen" WindowStyle="None">
+    <Grid>
+        <Grid.Background>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                <GradientStop Color="AliceBlue"></GradientStop>
+                <GradientStop Color="#FF2281D1" Offset="1"></GradientStop>
+                <GradientStop Color="AliceBlue" Offset="0.5"></GradientStop>
+            </LinearGradientBrush>
+        </Grid.Background>
+        <Grid.RowDefinitions>
+            <RowDefinition/>
+            <RowDefinition/>
+            <RowDefinition/>
+            <RowDefinition/>
+            <RowDefinition/>
+        </Grid.RowDefinitions>
+        <Label x:Name="lbTitle" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="24" Content="校验用户"></Label>
+        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="1">
+            <Label x:Name="lbUser" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="24" Content="用户名："></Label>
+            <TextBox x:Name="txtUserID" Width="260" Height="50" TextChanged="txtUserID_TextChanged" VerticalContentAlignment="Center"></TextBox>
+        </StackPanel>
+        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="2">
+            <Label x:Name="lbPW" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="24" Content="密   码："></Label>
+            <PasswordBox x:Name="pw" Width="260" Height="50"  PasswordChanged="pw_PasswordChanged" VerticalContentAlignment="Center"></PasswordBox>
+        </StackPanel>
+        <Label x:Name="tbMsg" Width="500" Height="60" Grid.Row="3" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" VerticalAlignment="Center" FontSize="18" Foreground="Red" FontWeight="Bold"></Label>
+        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="4">
+            <Button x:Name="btnCancel" Width="120" Height="50" Content="取消" Margin="10" FontWeight="Bold" Click="btnCancel_Click"/>
+            <Button x:Name="btnOK" Width="120" Height="50" Content="确定" Margin="10" Background="#2F82E7" Foreground="White" FontWeight="Bold" Click="btnOK_Click"/>
+        </StackPanel>
+    </Grid>
+</Window>

shangjian/XGL/Views/CheckUserWin.xaml.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+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.Shapes;
+using XGL.Data;
+
+namespace XGL.Views
+{
+    /// <summary>
+    /// CheckUserWin.xaml 的交互逻辑
+    /// </summary>
+    public partial class CheckUserWin : Window
+    {
+        private UserLogin ul;
+        public bool loginFlag;
+        public CheckUserWin()
+        {
+            InitializeComponent();
+        }
+
+        private void btnCancel_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close();
+        }
+
+        private void btnOK_Click(object sender, RoutedEventArgs e)
+        { 
+            userDB usdb = new userDB(); 
+            bool islogin = usdb.Login(txtUserID.Text.Trim(), pw.Password.Trim());
+            if (islogin)
+            {
+                loginFlag = islogin;
+                tbMsg.Content = "校验成功";
+                this.Close();
+            }
+            else
+            {
+                loginFlag = islogin;
+                tbMsg.Content = "校验失败";
+            }
+        }
+
+        private void txtUserID_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            tbMsg.Content = "";
+        }
+
+        private void pw_PasswordChanged(object sender, RoutedEventArgs e)
+        {
+            tbMsg.Content = "";
+        }
+    }
+}

shangjian/XGL/Views/DryingRoomUC.xaml

@@ -0,0 +1,32 @@
+<UserControl x:Class="XGL.Views.DryingRoomUC"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:XGL.Views"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800" Loaded="UserControl_Loaded">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="0.1*"/>
+            <RowDefinition Height="0.3*"/>
+            <RowDefinition/>
+        </Grid.RowDefinitions>
+        <StackPanel Orientation="Horizontal" Grid.Row="0" VerticalAlignment="Center">
+            <StackPanel Orientation="Horizontal">
+                <Label Content="请选择烘房：" VerticalContentAlignment="Center" FontSize="16"/>
+                <ComboBox x:Name="comboDryRoomInfo" Width="200" SelectionChanged="comboDryRoomInfo_SelectionChanged"></ComboBox>
+            </StackPanel>
+            <StackPanel Orientation="Horizontal" Margin="10,0,0,0">
+                <Label Content="当前温度：" VerticalContentAlignment="Center" FontSize="16"/>
+                <Label x:Name="lbCurrTemperature" Width="40" VerticalContentAlignment="Center" FontSize="16"></Label>
+            </StackPanel>
+            <StackPanel Orientation="Horizontal">
+                <Label Content="当前压强：" VerticalContentAlignment="Center" FontSize="16"/>
+                <Label x:Name="lbCurrPressure" Width="40" VerticalContentAlignment="Center" FontSize="16"></Label>
+            </StackPanel>
+        </StackPanel>
+        <ListBox Grid.Row="1" x:Name="DringRoomOuterListBox"></ListBox>
+        <ListBox Grid.Row="2" x:Name="DringRoomListBox"></ListBox>
+    </Grid>
+</UserControl>

shangjian/XGL/Views/DryingRoomUC.xaml.cs

@@ -0,0 +1,90 @@
+using CommonFunc.Tools;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+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;
+using XGL.Data.DBService;
+using XGL.Tools;
+
+namespace XGL.Views
+{
+    /// <summary>
+    /// DryingRoomUC.xaml 的交互逻辑
+    /// </summary>
+    public partial class DryingRoomUC : UserControl
+    {
+        DringRoomService dringRoomService = new DringRoomService();
+        public DryingRoomUC()
+        {
+            InitializeComponent();
+        }
+
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
+        {
+            InitComBoboxData();
+            GetDringRoomData();
+         
+        }
+
+        private void GetDringRoomData()
+        {
+            DataTable dt = dringRoomService.GetDringRoomData(comboDryRoomInfo.Text);
+            if (dt == null)
+                return;
+
+            int index = 0;
+            foreach (DataRow item in dt.Rows)
+            {
+                int i = 0;
+                index = i++;
+                string rfid = item["rfid"].ToString();
+                string workorder_code = item["workorder_code"].ToString();
+                string materialCode = item["product_code"].ToString();
+                //string workorder_code = item["workorder_code"].ToString();
+                ModuleUC uc = new ModuleUC(index.ToString(), rfid, workorder_code, materialCode, "10");
+                DringRoomListBox.Items.Add(uc);
+            }
+            
+        
+        }
+
+        private void InitComBoboxData()
+        {
+           DataTable dt = dringRoomService.GetDringRoomInfo();
+            if (dt == null)
+            {
+                CustomMessageBox.Show("没有维护设备信息，请维护设备后重试！", CustomMessageBoxIcon.Warning);
+                return;
+            }
+
+            List<EquipmentMode> listEquip = Utils.ToDataList<EquipmentMode>(dt);
+            //comboDryRoomInfo.SelectedValuePath = "quipName";
+            comboDryRoomInfo.DisplayMemberPath = "quipCode";
+            comboDryRoomInfo.ItemsSource = listEquip;
+            comboDryRoomInfo.SelectedIndex = 0;
+        }
+
+        private void comboDryRoomInfo_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            string hfCode = comboDryRoomInfo.Text;
+            GetDringRoomData();
+        }
+    }
+    public class EquipmentMode
+    {
+        public int type { get; set; }
+        public string quipCode { get; set; }
+        public int quipName { get; set; }
+    }
+}

shangjian/XGL/Views/LanJu_Complete.xaml

@@ -7,7 +7,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Width="1920"
     Height="330"
-    mc:Ignorable="d">
+    mc:Ignorable="d" Loaded="UserControl_Loaded">
     <Viewbox Stretch="Fill">
         <Canvas
             Width="1920"
@@ -20,6 +20,7 @@
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center">
                 <DataGrid
+                    x:Name="datagrid1"
                     Width="1870"
                     Height="220"
                     Margin="0"
@@ -36,12 +37,18 @@
                         </Style>
                     </DataGrid.ColumnHeaderStyle>
                     <DataGrid.Columns>
-                        <DataGridTextColumn Width="200" Header="序号" />
-                        <DataGridTextColumn Width="250" Header="工单/SFC" />
-                        <DataGridTextColumn Width="250" Header="时间" />
-                        <DataGridTextColumn Width="250" Header="完成工单/SFC" />
-                        <DataGridTextColumn Width="250" Header="工单数量" />
-                        <DataGridTextColumn Width="*" Header="人员" />
+                        <DataGridTemplateColumn Header=" 序号" Width="160" MinWidth="10" IsReadOnly="True">
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow}}, Path=Header}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,0,0,0"></TextBlock>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
+                        <DataGridTextColumn Width="250" Header="工单/SFC" Binding="{Binding workorder_code}"/>
+                        <DataGridTextColumn Width="250" Header="时间" Binding="{Binding begin}"/>
+                        <!--<DataGridTextColumn Width="250" Header="完成工单/SFC" />-->
+                        <DataGridTextColumn Width="250" Header="工单数量" Binding="{Binding car_num}"/>
+                        <DataGridTextColumn Width="*" Header="人员" Binding="{Binding create_by}"/>
                     </DataGrid.Columns>
                 </DataGrid>
             </Grid>

shangjian/XGL/Views/LanJu_Complete.xaml.cs

@@ -1,5 +1,8 @@
-using System;
+using CommonFunc;
+using CommonFunc.Tools;
+using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -12,6 +15,8 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using XGL.Data.DBService;
+using XGL.Models.Model.FoamingMac;
 
 namespace XGL.Views
 {
@@ -20,9 +25,48 @@ namespace XGL.Views
     /// </summary>
     public partial class LanJu_Complete : UserControl
     {
+        FormingMachineService formingMachineService = new FormingMachineService();
+        List<FoamingMacModel> orderList = new List<FoamingMacModel>();
+        FoamingMacModel order = new FoamingMacModel();
+
+
         public LanJu_Complete()
         {
             InitializeComponent();
         }
+
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
+        { 
+            GetInfo();
+        }
+
+        private void GetInfo()
+        {
+            try
+            {
+                //modelWareHouse = new List<WorkOrder>();
+                //userDbWareHouse = new DBService();
+                DataTable dt = formingMachineService.GetCompleteHistoryList(Utils.GetAppSetting("DeviceCode"));
+                if (dt == null) return;
+                foreach (DataRow i in dt.Rows)
+                {
+                    order.workorder_code = i["workorder_code"].ToString();
+                    order.product_name = i["product_name"].ToString();
+
+                    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();
+
+                    orderList.Add(order);
+
+                }
+                this.datagrid1.ItemsSource = orderList;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.instance.log.Error("获取完成记录信息时发生异常：" + ex.Message);
+            }
+        }
     }
 }

shangjian/XGL/Views/LanJu_InOut.xaml

@@ -7,7 +7,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Width="1920"
     Height="330"
-    mc:Ignorable="d">
+    mc:Ignorable="d" Loaded="UserControl_Loaded">
     <Viewbox Stretch="Fill">
         <Canvas
             Width="1920"
@@ -20,6 +20,7 @@
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center">
                 <DataGrid
+                    x:Name="dgInOutRecord"
                     Width="1870"
                     Height="220"
                     Margin="0"
@@ -36,12 +37,19 @@
                         </Style>
                     </DataGrid.ColumnHeaderStyle>
                     <DataGrid.Columns>
-                        <DataGridTextColumn Width="200" Header="序号" />
+                        <DataGridTemplateColumn Header=" 序号" Width="160" MinWidth="10" IsReadOnly="True">
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow}}, Path=Header}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,0,0,0"></TextBlock>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
                         <DataGridTextColumn Width="250" Header="操作" />
-                        <DataGridTextColumn Width="250" Header="时间" />
-                        <DataGridTextColumn Width="250" Header="工单/SFC" />
-                        <DataGridTextColumn Width="250" Header="工单数量" />
-                        <DataGridTextColumn Width="*" Header="人员" />
+                        <DataGridTextColumn Width="250" Header="开始时间"  Binding="{Binding begin}"/>
+                        <DataGridTextColumn Width="250" Header="结束时间"  Binding="{Binding beout}"/>
+                        <DataGridTextColumn Width="250" Header="工单/SFC"  Binding="{Binding workorder_code}"/>
+                        <DataGridTextColumn Width="250" Header="工单数量"  Binding="{Binding car_num}"/>
+                        <DataGridTextColumn Width="*" Header="人员"  Binding="{Binding create_by}"/>
                     </DataGrid.Columns>
                 </DataGrid>
             </Grid>

shangjian/XGL/Views/LanJu_InOut.xaml.cs

@@ -1,5 +1,8 @@
-using System;
+using CommonFunc;
+using CommonFunc.Tools;
+using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -12,6 +15,8 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using XGL.Data.DBService;
+using XGL.Models.Model.FoamingMac;
 
 namespace XGL.Views
 {
@@ -20,9 +25,48 @@ namespace XGL.Views
     /// </summary>
     public partial class LanJu_InOut : UserControl
     {
+
+        FormingMachineService formingMachineService = new FormingMachineService();
+        List<FoamingMacModel> orderList = new List<FoamingMacModel>();
+        FoamingMacModel order = new FoamingMacModel();
+
         public LanJu_InOut()
         {
             InitializeComponent();
         }
+
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
+        {
+            GetInOutRecordInfo();
+        }
+
+        private void GetInOutRecordInfo()
+        {
+            try
+            {
+                //modelWareHouse = new List<WorkOrder>();
+                //userDbWareHouse = new DBService();
+                DataTable dt = formingMachineService.GetInOutHistoryList(Utils.GetAppSetting("DeviceCode"));
+                if (dt == null) return;
+                foreach (DataRow i in dt.Rows)
+                {
+                    order.workorder_code = i["workorder_code"].ToString();
+                    order.begin = Convert.ToDateTime(i["begin"].ToString());
+                    order.beout = Convert.ToDateTime(i["beout"].ToString());
+                    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();
+
+                    orderList.Add(order);
+
+                }
+                this.dgInOutRecord.ItemsSource = orderList;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.instance.log.Error("获取完成记录信息时发生异常：" + ex.Message);
+            }
+        }
     }
 }

shangjian/XGL/Views/LanJu_Operator.xaml

@@ -1,41 +1,42 @@
 <UserControl
     x:Class="XGL.Views.LanJu_Operator"
+    x:Name="UCOperator"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="XGL.Views"
+     xmlns:convert="clr-namespace:XGL.Tools"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Width="1920"
     Height="800"
-    mc:Ignorable="d">
-    <Viewbox Stretch="Fill">
-        <Canvas
-            Width="1920"
-            Height="800"
-            Background="#F2F3F5">
-            <Grid
+    mc:Ignorable="d" Loaded="UCOperator_Loaded">
+    <UserControl.Resources>
+        <convert:MyValueConverter x:Key="MyConverter"/>
+    </UserControl.Resources>
+
+    <Grid  Background="#F2F3F5"
                 Width="1920"
                 Height="800"
                 Margin="0">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="auto" />
-                    <RowDefinition Height="auto" />
-                    <RowDefinition Height="270" />
-                    <RowDefinition Height="80" />
-                    <RowDefinition Height="330" />
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="220" />
-                    <ColumnDefinition Width="1*" />
-                    <ColumnDefinition Width="1*" />
-                    <ColumnDefinition Width="1*" />
-                    <ColumnDefinition Width="1*" />
-                    <ColumnDefinition Width="1*" />
-                    <ColumnDefinition Width="1*" />
-                    <ColumnDefinition Width="1*" />
-                    <ColumnDefinition Width="220" />
-                </Grid.ColumnDefinitions>
-                <StackPanel
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="270" />
+            <RowDefinition Height="80" />
+            <RowDefinition Height="330" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="220" />
+            <ColumnDefinition Width="1*" />
+            <ColumnDefinition Width="1*" />
+            <ColumnDefinition Width="1*" />
+            <ColumnDefinition Width="1*" />
+            <ColumnDefinition Width="1*" />
+            <ColumnDefinition Width="1*" />
+            <ColumnDefinition Width="1*" />
+            <ColumnDefinition Width="220" />
+        </Grid.ColumnDefinitions>
+        <StackPanel
                     Grid.Row="0"
                     Grid.Column="0"
                     Grid.ColumnSpan="3"
@@ -45,11 +46,11 @@
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
                     Orientation="Horizontal">
-                    <TextBlock
+            <TextBlock
                         Margin="0,5"
                         FontSize="16"
                         Text="设备编码：" />
-                    <TextBox
+            <TextBox
                         Width="350"
                         Height="25"
                         Margin="0"
@@ -58,9 +59,9 @@
                         FontSize="13"
                         Foreground="Gray"
                         Text="请输入内容" />
-                </StackPanel>
+        </StackPanel>
 
-                <StackPanel
+        <StackPanel
                     Grid.Row="0"
                     Grid.Column="3"
                     Grid.ColumnSpan="3"
@@ -70,11 +71,11 @@
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
                     Orientation="Horizontal">
-                    <TextBlock
+            <TextBlock
                         Margin="0,5"
                         FontSize="16"
                         Text="工单/SFC编码：" />
-                    <TextBox
+            <TextBox
                         Width="350"
                         Height="25"
                         Margin="0"
@@ -83,9 +84,9 @@
                         FontSize="13"
                         Foreground="Gray"
                         Text="请输入内容" />
-                </StackPanel>
+        </StackPanel>
 
-                <StackPanel
+        <StackPanel
                     Grid.Row="0"
                     Grid.Column="6"
                     Grid.ColumnSpan="2"
@@ -95,150 +96,148 @@
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
                     Orientation="Horizontal">
-                    <TextBlock
+            <TextBlock
                         Margin="0,5"
                         FontSize="16"
                         Text="设备状态：" />
-                    <Label
+            <Label
+                        x:Name="LbDeviceState"
                         Width="140"
                         Height="25"
                         HorizontalContentAlignment="Center"
-                        Background="#70B603">
-                        <TextBlock
-                            Width="30"
-                            Height="18"
-                            FontSize="14"
-                            Foreground="White"
-                            Text="正常" />
-                    </Label>
-                </StackPanel>
+                        Background="#70B603"  Content="正常" Foreground="White" FontSize="14">
 
-                <StackPanel
+            </Label>
+        </StackPanel>
+
+        <StackPanel
                     Grid.Row="1"
                     Grid.Column="0"
                     Width="220"
                     Height="90">
-                    <Button
+            <Button
                         Width="170"
                         Height="80"
                         Margin="25,5"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         Background="#2B7EE6">
-                        <Button.Content>
-                            <TextBlock
+                <Button.Content>
+                    <TextBlock
                                 VerticalAlignment="Center"
                                 FontSize="20"
                                 Foreground="White"
                                 Text="开始" />
-                        </Button.Content>
-                    </Button>
-                </StackPanel>
-                <StackPanel
+                </Button.Content>
+            </Button>
+        </StackPanel>
+        <StackPanel
                     Grid.Row="1"
                     Grid.Column="1"
                     Height="90">
-                    <Button
+            <Button
                         Width="170"
                         Height="80"
                         Margin="10,5"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Background="#2B7EE6">
-                        <Button.Content>
-                            <TextBlock
+                <Button.Content>
+                    <TextBlock
                                 VerticalAlignment="Center"
                                 FontSize="20"
                                 Foreground="White"
                                 Text="完成" />
-                        </Button.Content>
-                    </Button>
-                </StackPanel>
-                <StackPanel
+                </Button.Content>
+            </Button>
+        </StackPanel>
+        <StackPanel
                     Grid.Row="1"
                     Grid.Column="2"
                     Height="90">
-                    <Button
+            <Button
                         Width="170"
                         Height="80"
                         Margin="10,5"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Background="#2B7EE6">
-                        <Button.Content>
-                            <TextBlock
+                <Button.Content>
+                    <TextBlock
                                 VerticalAlignment="Center"
                                 FontSize="20"
                                 Foreground="White"
                                 Text="注销" />
-                        </Button.Content>
-                    </Button>
-                </StackPanel>
-                <StackPanel
+                </Button.Content>
+            </Button>
+        </StackPanel>
+        <StackPanel
                     Grid.Row="1"
                     Grid.Column="3"
                     Height="90">
-                    <Button
+            <Button
                         Width="170"
                         Height="80"
                         Margin="10,5"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Background="#2B7EE6">
-                        <Button.Content>
-                            <TextBlock
+                <Button.Content>
+                    <TextBlock
                                 VerticalAlignment="Center"
                                 FontSize="20"
                                 Foreground="White"
                                 Text="首检确认" />
-                        </Button.Content>
-                    </Button>
-                </StackPanel>
-                <StackPanel
+                </Button.Content>
+            </Button>
+        </StackPanel>
+        <StackPanel
                     Grid.Row="1"
                     Grid.Column="4"
                     Height="90">
-                    <Button
+            <Button
+                  x:Name="btnPause"
+                Click="btnPause_Click"
                         Width="170"
                         Height="80"
                         Margin="10,5"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Background="#2B7EE6">
-                        <Button.Content>
-                            <TextBlock
+                <Button.Content>
+                    <TextBlock
                                 VerticalAlignment="Center"
                                 FontSize="20"
                                 Foreground="White"
                                 Text="暂停生产" />
-                        </Button.Content>
-                    </Button>
-                </StackPanel>
-                <StackPanel
+                </Button.Content>
+            </Button>
+        </StackPanel>
+        <StackPanel
                     Grid.Row="1"
                     Grid.Column="5"
                     Height="90">
-                    <Button
+            <Button
                         Width="170"
                         Height="80"
                         Margin="10,5"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Background="#2B7EE6">
-                        <Button.Content>
-                            <TextBlock
+                <Button.Content>
+                    <TextBlock
                                 VerticalAlignment="Center"
                                 FontSize="20"
                                 Foreground="White"
                                 Text="恢复生产" />
-                        </Button.Content>
-                    </Button>
-                </StackPanel>
-                <StackPanel
+                </Button.Content>
+            </Button>
+        </StackPanel>
+        <StackPanel
                     Grid.Row="1"
                     Grid.Column="6"
                     Height="90">
-                    <Button
+            <Button
                         Width="170"
                         Height="80"
                         Margin="10,5"
@@ -246,20 +245,20 @@
                         VerticalAlignment="Center"
                         Background="#2B7EE6"
                         Click="Flow_Click">
-                        <Button.Content>
-                            <TextBlock
+                <Button.Content>
+                    <TextBlock
                                 VerticalAlignment="Center"
                                 FontSize="20"
                                 Foreground="White"
                                 Text="查看工艺" />
-                        </Button.Content>
-                    </Button>
-                </StackPanel>
-                <StackPanel
+                </Button.Content>
+            </Button>
+        </StackPanel>
+        <StackPanel
                     Grid.Row="1"
                     Grid.Column="7"
                     Height="90">
-                    <Button
+            <Button
                         Width="170"
                         Height="80"
                         Margin="10,5"
@@ -267,67 +266,75 @@
                         VerticalAlignment="Center"
                         Background="#2B7EE6"
                         Click="Material_Click">
-                        <Button.Content>
-                            <TextBlock
+                <Button.Content>
+                    <TextBlock
                                 VerticalAlignment="Center"
                                 FontSize="20"
                                 Foreground="White"
                                 Text="查看物料" />
-                        </Button.Content>
-                    </Button>
-                </StackPanel>
-                <StackPanel
+                </Button.Content>
+            </Button>
+        </StackPanel>
+        <StackPanel
                     Grid.Row="1"
                     Grid.Column="8"
                     Width="220"
                     Height="90">
-                    <Button
+            <Button
                         Width="170"
                         Height="80"
                         Margin="25,5"
                         HorizontalAlignment="Right"
                         VerticalAlignment="Center"
                         Background="#2B7EE6">
-                        <Button.Content>
-                            <TextBlock
+                <Button.Content>
+                    <TextBlock
                                 VerticalAlignment="Center"
                                 FontSize="20"
                                 Foreground="White"
                                 Text="查看SOP" />
-                        </Button.Content>
-                    </Button>
-                </StackPanel>
+                </Button.Content>
+            </Button>
+        </StackPanel>
 
-                <DataGrid
+        <DataGrid
+                    x:Name="dgWorkOrderInfo"
                     Grid.Row="2"
                     Grid.ColumnSpan="9"
                     Width="1870"
                     Height="220"
                     Margin="0,20"
+            FontSize="18" Foreground="Black"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Top"
                     AutoGenerateColumns="False">
-                    <DataGrid.ColumnHeaderStyle>
-                        <Style TargetType="DataGridColumnHeader">
-                            <Setter Property="HorizontalContentAlignment" Value="Center" />
-                            <Setter Property="Height" Value="48" />
-                            <Setter Property="FontSize" Value="24" />
-                            <Setter Property="Foreground" Value="White" />
-                            <Setter Property="Background" Value="#2B7EE6" />
-                        </Style>
-                    </DataGrid.ColumnHeaderStyle>
-                    <DataGrid.Columns>
-                        <DataGridTextColumn Width="200" Header="序号" />
-                        <DataGridTextColumn Width="250" Header="工单/SFC" />
-                        <DataGridTextColumn Width="250" Header="产品名称" />
-                        <DataGridTextColumn Width="250" Header="产品型号" />
-                        <DataGridTextColumn Width="250" Header="工单数量" />
-                        <DataGridTextColumn Width="250" Header="开始时间" />
-                        <DataGridTextColumn Width="*" Header="工单状态" />
-                    </DataGrid.Columns>
-                </DataGrid>
+            <DataGrid.ColumnHeaderStyle>
+                <Style TargetType="DataGridColumnHeader">
+                    <Setter Property="HorizontalContentAlignment" Value="Center" />
+                    <Setter Property="Height" Value="48" />
+                    <Setter Property="FontSize" Value="24" />
+                    <Setter Property="Foreground" Value="White" />
+                    <Setter Property="Background" Value="#2B7EE6" />
+                </Style>
+            </DataGrid.ColumnHeaderStyle>
+            <DataGrid.Columns>
+                <DataGridTemplateColumn Header=" 序号" Width="160" MinWidth="10" IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow}}, Path=Header}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,0,0,0"></TextBlock>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTextColumn Width="250" Header="工单/SFC" Binding="{Binding workorder_code}" />
+                <DataGridTextColumn Width="250" Header="产品名称" Binding="{Binding product_name}" />
+                <DataGridTextColumn Width="250" Header="产品型号" Binding="{Binding product_code}" />
+                <DataGridTextColumn Width="250" Header="工单数量" Binding="{Binding car_num}" />
+                <DataGridTextColumn Width="250" Header="开始时间" Binding="{Binding begin}" />
+                <DataGridTextColumn Width="*" Header="工单状态"   Binding="{Binding status,Converter={StaticResource MyConverter}}" />
+            </DataGrid.Columns>
+        </DataGrid>
 
-                <StackPanel
+        <StackPanel
                     Grid.Row="3"
                     Grid.ColumnSpan="5"
                     Width="1000"
@@ -336,73 +343,73 @@
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
                     Orientation="Horizontal">
-                    <Button
+            <Button
                         Width="196"
                         Height="69"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Bottom"
                         Background="White"
                         Click="InOut_Click">
-                        <TextBlock
+                <TextBlock
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             FontSize="28"
                             Text="出入记录" />
-                    </Button>
-                    <Button
+            </Button>
+            <Button
                         Width="196"
                         Height="69"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Bottom"
                         Background="White"
                         Click="Complete_Click">
-                        <TextBlock
+                <TextBlock
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             FontSize="28"
                             Text="完成记录" />
-                    </Button>
-                    <Button
+            </Button>
+            <!--<Button
                         Width="196"
                         Height="69"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Bottom"
                         Background="White"
                         Click="DeviceItems_Click">
-                        <TextBlock
+                <TextBlock
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             FontSize="28"
                             Text="设备当前物料" />
-                    </Button>
-                    <Button
+            </Button>
+            <Button
                         Width="196"
                         Height="69"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Bottom"
                         Background="White"
                         Click="Paused_Click">
-                        <TextBlock
+                <TextBlock
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             FontSize="28"
                             Text="暂停记录" />
-                    </Button>
-                    <Button
+            </Button>
+            <Button
                         Width="196"
                         Height="69"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Bottom"
                         Background="White">
-                        <TextBlock
+                <TextBlock
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             FontSize="28"
                             Text="工单信息" />
-                    </Button>
-                </StackPanel>
+            </Button>-->
+        </StackPanel>
 
-                <Grid
+        <Grid
                     Grid.Row="4"
                     Grid.ColumnSpan="9"
                     Width="1920"
@@ -410,19 +417,19 @@
                     Margin="0"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="407*" />
-                        <ColumnDefinition Width="1513*" />
-                    </Grid.ColumnDefinitions>
-                    <ContentControl
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="407*" />
+                <ColumnDefinition Width="1513*" />
+            </Grid.ColumnDefinitions>
+            <ContentControl
                         x:Name="Window1"
                         Grid.ColumnSpan="2"
                         Width="1920"
                         Height="330" />
 
-                </Grid>
+        </Grid>
 
-                <ContentControl
+        <ContentControl
                     x:Name="Window2"
                     Grid.Row="0"
                     Grid.RowSpan="5"
@@ -430,7 +437,5 @@
                     Grid.ColumnSpan="9"
                     Width="1920"
                     Height="800" />
-            </Grid>
-        </Canvas>
-    </Viewbox>
+    </Grid>
 </UserControl>

shangjian/XGL/Views/LanJu_Operator.xaml.cs

@@ -1,10 +1,14 @@
-using COSMO.IM.LanJu.Index;
+using CommonFunc;
+using CommonFunc.Tools;
+using COSMO.IM.LanJu.Index;
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 using System.Reflection;
 using System.Text; 
 using System.Threading.Tasks;
+using System.Timers;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
@@ -14,6 +18,8 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using XGL.Data.DBService;
+using XGL.Models.Model.FoamingMac;
 
 namespace XGL.Views
 
@@ -23,9 +29,13 @@ namespace XGL.Views
     /// </summary>
     public partial class LanJu_Operator : UserControl
     {
+        FormingMachineService formingMachineService = new FormingMachineService();
         public static LanJu_Operator lanJu_Operator;
         Frame frame = new Frame() { Content = new Views.LanJu_InOut()};
-
+        string deviceCode = Utils.GetAppSetting("DeviceCode");
+        List<FoamingMacModel> orderList = new List<FoamingMacModel>();
+        FoamingMacModel order = new FoamingMacModel();
+        Timer timerDeciveState = new Timer();
         public enum WindowID
         {
             frame
@@ -34,7 +44,24 @@ namespace XGL.Views
         {
             InitializeComponent();
             WindowChange(WindowID.frame);
+            timerDeciveState.Interval = Utils.GetAppSetting("GetDeviceStateInterval") == "" ? 15000 : Convert.ToInt32(Utils.GetAppSetting("GetDeviceStateInterval"));
+            timerDeciveState.Elapsed += TimerDeciveState_Elapsed;
+            timerDeciveState.Start();
+        }
 
+        private void TimerDeciveState_Elapsed(object sender, ElapsedEventArgs e)
+        {    // 使用Dispatcher来在UI线程上更新UI
+            Application.Current.Dispatcher.Invoke(() =>
+            {
+            DataTable dt = formingMachineService.GetFormingMachineState(deviceCode);
+            if (dt != null && dt.Rows.Count > 0)
+            {
+            
+                    // 在这里更新UI元素
+                    LbDeviceState.Content = dt.Rows[0][0].ToString() == "1" ? "正常" : "异常";
+
+                }
+            });
         }
 
         public void WindowChange(WindowID windowID)
@@ -102,6 +129,46 @@ namespace XGL.Views
             };
         }
        
+        private void UCOperator_Loaded(object sender, RoutedEventArgs e)
+        {
+            GetWorkOrderInfo();
+        }
 
+        private void GetWorkOrderInfo()
+        {
+            try
+            {
+                //modelWareHouse = new List<WorkOrder>();
+                //userDbWareHouse = new DBService();
+               DataTable dt = formingMachineService.GetFormingMachineInfo(deviceCode);
+                if (dt == null) return;
+                foreach (DataRow i in dt.Rows)
+                { 
+                    order.workorder_code = i["workorder_code"].ToString();
+                    order.product_name = i["product_name"].ToString();
+
+                    order.product_code = i["product_code"].ToString();
+                    order.car_num = Convert.ToInt32(i["car_num"].ToString());
+                    order.begin =  Convert.ToDateTime(i["begin"].ToString()); 
+                    order.status = i["status"].ToString();
+            
+                    orderList.Add(order);
+                   
+                }
+                this.dgWorkOrderInfo.ItemsSource = orderList;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.instance.log.Error("获取工单准备信息时发生异常：" + ex.Message);
+            }
+        } 
+       
+        private void btnPause_Click(object sender, RoutedEventArgs e)
+        {
+            var selectedRow = dgWorkOrderInfo.SelectedItem as FoamingMacModel;
+            var workordercode = selectedRow.workorder_code;
+            formingMachineService.PauseWorkOrder(workordercode);
+            GetWorkOrderInfo();
+        }
     }
 }

shangjian/XGL/Views/LanJu_Operatorbak - 复制.xaml

@@ -0,0 +1,436 @@
+<UserControl
+    x:Class="XGL.Views.LanJu_Operator"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="XGL.Views"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Width="1920"
+    Height="800"
+    mc:Ignorable="d">
+    <Viewbox Stretch="Fill">
+        <Canvas
+            Width="1920"
+            Height="800"
+            Background="#F2F3F5">
+            <Grid
+                Width="1920"
+                Height="800"
+                Margin="0">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="auto" />
+                    <RowDefinition Height="auto" />
+                    <RowDefinition Height="270" />
+                    <RowDefinition Height="80" />
+                    <RowDefinition Height="330" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="220" />
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="220" />
+                </Grid.ColumnDefinitions>
+                <StackPanel
+                    Grid.Row="0"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="3"
+                    Width="450"
+                    Height="30"
+                    Margin="50,5"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    Orientation="Horizontal">
+                    <TextBlock
+                        Margin="0,5"
+                        FontSize="16"
+                        Text="设备编码：" />
+                    <TextBox
+                        Width="350"
+                        Height="25"
+                        Margin="0"
+                        Padding="5,0,0,0"
+                        VerticalContentAlignment="Center"
+                        FontSize="13"
+                        Foreground="Gray"
+                        Text="请输入内容" />
+                </StackPanel>
+
+                <StackPanel
+                    Grid.Row="0"
+                    Grid.Column="3"
+                    Grid.ColumnSpan="3"
+                    Width="480"
+                    Height="30"
+                    Margin="50,5"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    Orientation="Horizontal">
+                    <TextBlock
+                        Margin="0,5"
+                        FontSize="16"
+                        Text="工单/SFC编码：" />
+                    <TextBox
+                        Width="350"
+                        Height="25"
+                        Margin="0"
+                        Padding="5,0,0,0"
+                        VerticalContentAlignment="Center"
+                        FontSize="13"
+                        Foreground="Gray"
+                        Text="请输入内容" />
+                </StackPanel>
+
+                <StackPanel
+                    Grid.Row="0"
+                    Grid.Column="6"
+                    Grid.ColumnSpan="2"
+                    Width="300"
+                    Height="30"
+                    Margin="5,5"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    Orientation="Horizontal">
+                    <TextBlock
+                        Margin="0,5"
+                        FontSize="16"
+                        Text="设备状态：" />
+                    <Label
+                        Width="140"
+                        Height="25"
+                        HorizontalContentAlignment="Center"
+                        Background="#70B603">
+                        <TextBlock
+                            Width="30"
+                            Height="18"
+                            FontSize="14"
+                            Foreground="White"
+                            Text="正常" />
+                    </Label>
+                </StackPanel>
+
+                <StackPanel
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Width="220"
+                    Height="90">
+                    <Button
+                        Width="170"
+                        Height="80"
+                        Margin="25,5"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Background="#2B7EE6">
+                        <Button.Content>
+                            <TextBlock
+                                VerticalAlignment="Center"
+                                FontSize="20"
+                                Foreground="White"
+                                Text="开始" />
+                        </Button.Content>
+                    </Button>
+                </StackPanel>
+                <StackPanel
+                    Grid.Row="1"
+                    Grid.Column="1"
+                    Height="90">
+                    <Button
+                        Width="170"
+                        Height="80"
+                        Margin="10,5"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Background="#2B7EE6">
+                        <Button.Content>
+                            <TextBlock
+                                VerticalAlignment="Center"
+                                FontSize="20"
+                                Foreground="White"
+                                Text="完成" />
+                        </Button.Content>
+                    </Button>
+                </StackPanel>
+                <StackPanel
+                    Grid.Row="1"
+                    Grid.Column="2"
+                    Height="90">
+                    <Button
+                        Width="170"
+                        Height="80"
+                        Margin="10,5"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Background="#2B7EE6">
+                        <Button.Content>
+                            <TextBlock
+                                VerticalAlignment="Center"
+                                FontSize="20"
+                                Foreground="White"
+                                Text="注销" />
+                        </Button.Content>
+                    </Button>
+                </StackPanel>
+                <StackPanel
+                    Grid.Row="1"
+                    Grid.Column="3"
+                    Height="90">
+                    <Button
+                        Width="170"
+                        Height="80"
+                        Margin="10,5"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Background="#2B7EE6">
+                        <Button.Content>
+                            <TextBlock
+                                VerticalAlignment="Center"
+                                FontSize="20"
+                                Foreground="White"
+                                Text="首检确认" />
+                        </Button.Content>
+                    </Button>
+                </StackPanel>
+                <StackPanel
+                    Grid.Row="1"
+                    Grid.Column="4"
+                    Height="90">
+                    <Button
+                        Width="170"
+                        Height="80"
+                        Margin="10,5"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Background="#2B7EE6">
+                        <Button.Content>
+                            <TextBlock
+                                VerticalAlignment="Center"
+                                FontSize="20"
+                                Foreground="White"
+                                Text="暂停生产" />
+                        </Button.Content>
+                    </Button>
+                </StackPanel>
+                <StackPanel
+                    Grid.Row="1"
+                    Grid.Column="5"
+                    Height="90">
+                    <Button
+                        Width="170"
+                        Height="80"
+                        Margin="10,5"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Background="#2B7EE6">
+                        <Button.Content>
+                            <TextBlock
+                                VerticalAlignment="Center"
+                                FontSize="20"
+                                Foreground="White"
+                                Text="恢复生产" />
+                        </Button.Content>
+                    </Button>
+                </StackPanel>
+                <StackPanel
+                    Grid.Row="1"
+                    Grid.Column="6"
+                    Height="90">
+                    <Button
+                        Width="170"
+                        Height="80"
+                        Margin="10,5"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Background="#2B7EE6"
+                        Click="Flow_Click">
+                        <Button.Content>
+                            <TextBlock
+                                VerticalAlignment="Center"
+                                FontSize="20"
+                                Foreground="White"
+                                Text="查看工艺" />
+                        </Button.Content>
+                    </Button>
+                </StackPanel>
+                <StackPanel
+                    Grid.Row="1"
+                    Grid.Column="7"
+                    Height="90">
+                    <Button
+                        Width="170"
+                        Height="80"
+                        Margin="10,5"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Background="#2B7EE6"
+                        Click="Material_Click">
+                        <Button.Content>
+                            <TextBlock
+                                VerticalAlignment="Center"
+                                FontSize="20"
+                                Foreground="White"
+                                Text="查看物料" />
+                        </Button.Content>
+                    </Button>
+                </StackPanel>
+                <StackPanel
+                    Grid.Row="1"
+                    Grid.Column="8"
+                    Width="220"
+                    Height="90">
+                    <Button
+                        Width="170"
+                        Height="80"
+                        Margin="25,5"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        Background="#2B7EE6">
+                        <Button.Content>
+                            <TextBlock
+                                VerticalAlignment="Center"
+                                FontSize="20"
+                                Foreground="White"
+                                Text="查看SOP" />
+                        </Button.Content>
+                    </Button>
+                </StackPanel>
+
+                <DataGrid
+                    Grid.Row="2"
+                    Grid.ColumnSpan="9"
+                    Width="1870"
+                    Height="220"
+                    Margin="0,20"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Top"
+                    AutoGenerateColumns="False">
+                    <DataGrid.ColumnHeaderStyle>
+                        <Style TargetType="DataGridColumnHeader">
+                            <Setter Property="HorizontalContentAlignment" Value="Center" />
+                            <Setter Property="Height" Value="48" />
+                            <Setter Property="FontSize" Value="24" />
+                            <Setter Property="Foreground" Value="White" />
+                            <Setter Property="Background" Value="#2B7EE6" />
+                        </Style>
+                    </DataGrid.ColumnHeaderStyle>
+                    <DataGrid.Columns>
+                        <DataGridTextColumn Width="200" Header="序号" />
+                        <DataGridTextColumn Width="250" Header="工单/SFC" />
+                        <DataGridTextColumn Width="250" Header="产品名称" />
+                        <DataGridTextColumn Width="250" Header="产品型号" />
+                        <DataGridTextColumn Width="250" Header="工单数量" />
+                        <DataGridTextColumn Width="250" Header="开始时间" />
+                        <DataGridTextColumn Width="*" Header="工单状态" />
+                    </DataGrid.Columns>
+                </DataGrid>
+
+                <StackPanel
+                    Grid.Row="3"
+                    Grid.ColumnSpan="5"
+                    Width="1000"
+                    Height="69"
+                    Margin="25,10,0,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    Orientation="Horizontal">
+                    <Button
+                        Width="196"
+                        Height="69"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Bottom"
+                        Background="White"
+                        Click="InOut_Click">
+                        <TextBlock
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="28"
+                            Text="出入记录" />
+                    </Button>
+                    <Button
+                        Width="196"
+                        Height="69"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Bottom"
+                        Background="White"
+                        Click="Complete_Click">
+                        <TextBlock
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="28"
+                            Text="完成记录" />
+                    </Button>
+                    <Button
+                        Width="196"
+                        Height="69"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Bottom"
+                        Background="White"
+                        Click="DeviceItems_Click">
+                        <TextBlock
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="28"
+                            Text="设备当前物料" />
+                    </Button>
+                    <Button
+                        Width="196"
+                        Height="69"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Bottom"
+                        Background="White"
+                        Click="Paused_Click">
+                        <TextBlock
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="28"
+                            Text="暂停记录" />
+                    </Button>
+                    <Button
+                        Width="196"
+                        Height="69"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Bottom"
+                        Background="White">
+                        <TextBlock
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="28"
+                            Text="工单信息" />
+                    </Button>
+                </StackPanel>
+
+                <Grid
+                    Grid.Row="4"
+                    Grid.ColumnSpan="9"
+                    Width="1920"
+                    Height="330"
+                    Margin="0"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="407*" />
+                        <ColumnDefinition Width="1513*" />
+                    </Grid.ColumnDefinitions>
+                    <ContentControl
+                        x:Name="Window1"
+                        Grid.ColumnSpan="2"
+                        Width="1920"
+                        Height="330" />
+
+                </Grid>
+
+                <ContentControl
+                    x:Name="Window2"
+                    Grid.Row="0"
+                    Grid.RowSpan="5"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="9"
+                    Width="1920"
+                    Height="800" />
+            </Grid>
+        </Canvas>
+    </Viewbox>
+</UserControl>

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
+
+{
+    /// <summary>
+    /// LanJu_Operator.xaml 的交互逻辑
+    /// </summary>
+    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
+            };
+        }
+
+        /// <summary>
+        /// 上部按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        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 
+            };
+        }
+
+
+    }
+}

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"
@@ -44,11 +45,10 @@
                 <Setter Property="Foreground" Value="#707971" />
                 <Setter Property="TextBlock.TextAlignment" Value="Center" />
                 <Setter Property="TextBlock.FontSize" Value="22" /> 
-
             </Style>
-
+            <convert:MyValueConverter x:Key="MyConverter"/>
+            <!--<convert:SyncFlagConverter x:Key="SyncFlagConverter"/>-->
         </ResourceDictionary> 
-
     </UserControl.Resources>
 
     <Viewbox Stretch="Fill">
@@ -262,6 +262,14 @@
                                 Width="*"
                                 Binding="{Binding prod_line_code}"
                                 Header="成型机" />
+                            <DataGridTextColumn
+                                Width="*"
+                                Binding="{Binding status,Converter={StaticResource MyConverter}}"
+                                Header="状态" />
+                            <DataGridTextColumn
+                                Width="*"
+                                Binding="{Binding sync_flag}"
+                                Header="状态" /> 
                         </DataGrid.Columns>
                     </DataGrid>
                 </ScrollViewer>

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,11 +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);
             }
         }
 
@@ -96,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);
@@ -105,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"))
@@ -122,7 +143,7 @@ namespace XGL.Views
 
             List<string> cxjList = new List<string>();
             List<string> bucketList = new List<string>();
-            //这扯淡的设计，根据湿料计划获取各个工单对应的工序、机台信息，
+            //这扯淡的设计，根据湿料计划获取各个工单对应的工序、机台信息，这样式的，[["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();
@@ -187,6 +208,10 @@ namespace XGL.Views
             var response = restClient.PostAsync(apiUrl, jsonContent);
 
             Console.WriteLine(response);
+            //更新湿料计划同步状态
+            var updatestatus = userDbWareHouse.UpdateSycnFlag(orderID);
+            if (!updatestatus)
+                LogHelper.instance.log.Info("更新湿料计划同步状态失败！");
         }
     }
 }

shangjian/XGL/XGL.csproj

@@ -208,6 +208,10 @@
       <DependentUpon>Main.xaml</DependentUpon>
     </Compile>
     <Compile Include="snap7.net.cs" />
+    <Compile Include="Tools\ModuleUC.xaml.cs">
+      <DependentUpon>ModuleUC.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Tools\MyValueConverter.cs" />
     <Compile Include="UControl\ordertj.xaml.cs">
       <DependentUpon>ordertj.xaml</DependentUpon>
     </Compile>
@@ -280,6 +284,12 @@
     <Compile Include="UControl\UCUserList.xaml.cs">
       <DependentUpon>UCUserList.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\CheckUserWin.xaml.cs">
+      <DependentUpon>CheckUserWin.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DryingRoomUC.xaml.cs">
+      <DependentUpon>DryingRoomUC.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\LanJu_Complete.xaml.cs">
       <DependentUpon>LanJu_Complete.xaml</DependentUpon>
     </Compile>
@@ -392,6 +402,10 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Page Include="Tools\ModuleUC.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="UControl\ordertj.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -488,6 +502,14 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\CheckUserWin.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\DryingRoomUC.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\LanJu_Complete.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -932,6 +954,7 @@
     <Resource Include="Resources\logo.png" />
     <Resource Include="Resources\topblank.png" />
     <Resource Include="Resources\startOrder.jpg" />
+    <Resource Include="Resources\zxh.png" />
     <Content Include="snap7.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

shangjian/XGL/bin/x86/Debug/XGL.exe.config

@@ -7,6 +7,12 @@
     </sectionGroup>
   </configSections>
   <appSettings> 
+	  <!--车间编码-->
+	  <add key="SiteCode" value="BPZ01"/>
+	  <!--设备编码-->
+	  <add key="DeviceCode" value="C1"/>
+	  <!--上位机类型 0:工单准备，1：成型机，2：烘房-->
+	  <add key="ClientMode" value="2"/>
     <!--上位机类型 1 上件 ，2 排空区  0下件区-->
     <add key="PostType" value="1"/>
     <!--线体编码-->
@@ -16,12 +22,14 @@
     <add key="plcport" value="60001"/>
 
     <add key="LineId" value="1"/>
-    <!--看板刷新时间 单位秒-->
+	  <!--看板刷新时间 单位秒-->
     <add key="BoardRefresh" value="60"/>
     <!--下件界面刷新时间 单位秒-->
     <add key="TakeOffRefresh" value="10"/>
     <!--排空区刷新时间 单位秒-->
     <add key="EmptyRefresh" value="10"/>
+	<!--获取设备状态间隔时间 单位秒-->
+	<add key="GetDeviceStateInterval" value="60"/>
     <add key="thriftIp" value="192.168.3.150"/>
     <!--上件点发车thrift端口  7911 ,7912-->
     <add key="thriftPort" value="7921"/>

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"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -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

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"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -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

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"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -40,6 +40,14 @@ namespace XGL.Views {
     /// </summary>
     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;
         
         /// <summary>
@@ -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;
         }
     }

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"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -40,6 +40,14 @@ namespace XGL.Views {
     /// </summary>
     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;
         
         /// <summary>
@@ -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;
         }
     }

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"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -40,6 +40,14 @@ namespace XGL.Views {
     /// </summary>
     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;
         
         /// <summary>
@@ -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;
         }
     }

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"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -40,6 +40,14 @@ namespace XGL.Views {
     /// </summary>
     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;
         
         /// <summary>
@@ -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;
         }
     }

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"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -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;
             }

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"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -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;
             }