From ef2f83d67468d6c27de9677be2d3bfc8a9205997 Mon Sep 17 00:00:00 2001
From: zhaojian <qj120227@163.com>
Date: Mon, 23 Oct 2023 13:48:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=83=98=E6=88=BF=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shangjian/XGL/Views/DryingRoomUC.xaml         |   4 +-
 shangjian/XGL/Views/HBLogWin.xaml             | 128 ++++++++++++++++++
 shangjian/XGL/Views/HBLogWin.xaml.cs          |  74 ++++++++++
 shangjian/XGL/Views/LanJu_Operator.xaml       |  19 +++
 shangjian/XGL/Views/LanJu_Operator.xaml.cs    |   6 +
 shangjian/XGL/Views/LanJu_Prepare.xaml.cs     |   4 +-
 .../obj/x86/Debug/Views/LanJu_Operator.baml   | Bin 9807 -> 0 bytes
 .../obj/x86/Debug/Views/LanJu_Operator.g.cs   |  43 ++++--
 8 files changed, 262 insertions(+), 16 deletions(-)
 create mode 100644 shangjian/XGL/Views/HBLogWin.xaml
 create mode 100644 shangjian/XGL/Views/HBLogWin.xaml.cs
 delete mode 100644 shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml

diff --git a/shangjian/XGL/Views/DryingRoomUC.xaml b/shangjian/XGL/Views/DryingRoomUC.xaml
index 2cf1e64..afc4209 100644
--- a/shangjian/XGL/Views/DryingRoomUC.xaml
+++ b/shangjian/XGL/Views/DryingRoomUC.xaml
@@ -377,12 +377,12 @@
             </StackPanel>
             <StackPanel Orientation="Horizontal" Margin="10,0,0,0">
                 <Label Content="当前温度：" VerticalContentAlignment="Center" FontSize="16"/>
-                <Label x:Name="lbCurrTemperature" Width="60" VerticalContentAlignment="Center" FontSize="24"
+                <Label x:Name="lbCurrTemperature" Width="60" VerticalContentAlignment="Center" FontSize="17" 
                             Foreground="#1A68CA"></Label>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
                 <Label Content="当前湿度：" VerticalContentAlignment="Center" FontSize="16"/>
-                <Label x:Name="lbCurrHumilly" Width="60" VerticalContentAlignment="Center"  FontSize="24"
+                <Label x:Name="lbCurrHumilly" Width="60" VerticalContentAlignment="Center"  FontSize="17" 
                             Foreground="#1A68CA"></Label>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
diff --git a/shangjian/XGL/Views/HBLogWin.xaml b/shangjian/XGL/Views/HBLogWin.xaml
new file mode 100644
index 0000000..c55779c
--- /dev/null
+++ b/shangjian/XGL/Views/HBLogWin.xaml
@@ -0,0 +1,128 @@
+<Window x:Class="XGL.Views.HBLogWin"
+        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" xmlns:localDate="clr-namespace:XGL.Tools"
+        xmlns:convert="clr-namespace:XGL.Tools"
+        mc:Ignorable="d"
+        Title="ViewLogWin" Loaded="Window_Loaded" WindowStartupLocation="CenterScreen" WindowStyle="None" WindowState="Maximized">
+    <Window.Resources>
+        <convert:DeviceNameConverter x:Key="DeviceNameConverter"/>
+        <SolidColorBrush x:Key="EvenRowBackground" Color="#E0E0E0"/>
+        <SolidColorBrush x:Key="OddRowBackground" Color="#FFFFFF"/>
+        <Style x:Key="DataGridRowStyle" TargetType="DataGridRow">
+            <Setter Property="Background" Value="{StaticResource EvenRowBackground}"/>
+            <Style.Triggers>
+                <Trigger Property="ItemsControl.AlternationIndex" Value="1">
+                    <Setter Property="Background" Value="{StaticResource OddRowBackground}"/>
+                </Trigger>
+            </Style.Triggers>
+        </Style>
+        <Style x:Key="CustomCellStyle" TargetType="DataGridCell">
+            <Setter Property="Foreground" Value="Black" />
+            <Setter Property="TextBlock.TextAlignment" Value="Center" />
+            <Setter Property="TextBlock.FontSize" Value="22" />
+        </Style>
+        <!--日历样式-->
+        <Style TargetType="CalendarDayButton" x:Key="CalendarDayBtnStyle">
+            <Setter Property="FontSize" Value="16"></Setter>
+        </Style>
+        <Style x:Key="calendarWithGotToTodayStyle"
+                TargetType="{x:Type Calendar}">
+            <Setter Property="CalendarDayButtonStyle"
+                    Value="{StaticResource CalendarDayBtnStyle}"></Setter>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Calendar}">
+                        <Border>
+                            <StackPanel Orientation="Vertical">
+                                <StackPanel x:Name="PART_Root"
+                                            HorizontalAlignment="Center" Background="#FF878787">
+                                    <CalendarItem x:Name="PART_CalendarItem"
+                                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                                    Background="{TemplateBinding Background}"
+                                                    Style="{TemplateBinding CalendarItemStyle}" 
+                                                    Height="{TemplateBinding Height}"                                 
+                                                     />
+                                    <Grid VerticalAlignment="Center" HorizontalAlignment="Center">
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="30"></RowDefinition>
+                                        </Grid.RowDefinitions>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="52"></ColumnDefinition>
+                                            <ColumnDefinition Width="26"></ColumnDefinition>
+                                            <ColumnDefinition Width="52"></ColumnDefinition>
+                                        </Grid.ColumnDefinitions>
+                                        <TextBlock x:Name="PART_GoToday"
+                                                Width="40" Height="20"
+                                                Text="今天" FontSize="18" VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center" Cursor="Hand" Foreground="#FFFFFFFF" />
+                                        <TextBlock Grid.Column="2" x:Name="PART_GoClear"
+                                                Width="40" Height="20" 
+                                                Text="清空" FontSize="18"  VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center" Cursor="Hand" Foreground="#FFFFFFFF"  />
+                                    </Grid>
+                                </StackPanel>
+                            </StackPanel>
+                        </Border>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="0.1*"/>
+            <RowDefinition Height="0.9*"/>
+        </Grid.RowDefinitions>
+        <StackPanel Orientation="Horizontal" Grid.Row="0" VerticalAlignment="Center">
+            <Label Content="设备编码：" VerticalContentAlignment="Center" FontSize="14" Margin="20"></Label>
+            <TextBox x:Name="txtDeviceCode" Width="150" Height="30" FontSize="18" VerticalContentAlignment="Center" KeyDown="txtDeviceCode_KeyDown"></TextBox>
+            <Button x:Name="btnQueryLog" Content="查询" Foreground="White" Margin="20,0,0,0" FontSize="18" Background="#2B7EE6" Width="100" Height="30" Click="btnQueryLog_Click"/>
+
+        </StackPanel>
+        <Button x:Name="btnClose"  Content="关闭" Foreground="White" FontSize="18" Background="#2B7EE6" Width="100" Margin="20" Height="30" Click="btnClose_Click" HorizontalAlignment="Right"/>
+        <DataGrid
+            x:Name="dgPlcValueInfo"
+            Grid.Row="1" 
+                    MinHeight="340"
+                     AlternatingRowBackground="{StaticResource OddRowBackground}"
+          AlternationCount="2"
+          RowStyle="{StaticResource DataGridRowStyle}"
+                    Margin="20,0,0,5"
+                    LoadingRow="dgLogInfo_LoadingRow"
+                    HeadersVisibility="Column"
+                    CellStyle="{StaticResource CustomCellStyle}"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top" IsReadOnly="True"
+                    AutoGenerateColumns="False" CanUserAddRows="False">
+            <DataGrid.ColumnHeaderStyle  >
+                <Style TargetType="DataGridColumnHeader">
+                    <Setter Property="HorizontalContentAlignment" Value="Center" />
+                    <Setter Property="Height" Value="48" />
+                    <Setter Property="FontSize" Value="20" />
+                    <Setter Property="Foreground" Value="White" />
+                    <Setter Property="Background" Value="#2B7EE6" />
+                </Style>
+            </DataGrid.ColumnHeaderStyle>
+            <DataGrid.Columns>
+                <DataGridTemplateColumn Header=" 序号" Width="80" MinWidth="10" IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow}}, Path=Header}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10,0,0,0"></TextBlock>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTextColumn Width="0.08*" Header="设备编码" Binding="{Binding device_code}" />
+                <DataGridTextColumn Width="0.1*" Header="值" Binding="{Binding value}" />
+                <DataGridTextColumn Width="0.15*" Header="更新时间" Binding="{Binding create_time, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" />
+             
+
+                <!--<DataGridTextColumn Width="340" Header="流转码" Binding="{Binding work_batch_code}" />-->
+                <!--<DataGridTextColumn Width="60" Header="出入" Binding="{Binding taskcode,Converter={StaticResource TaskCodeConverter}}"/>-->
+
+            </DataGrid.Columns>
+        </DataGrid>
+
+    </Grid>
+</Window>
diff --git a/shangjian/XGL/Views/HBLogWin.xaml.cs b/shangjian/XGL/Views/HBLogWin.xaml.cs
new file mode 100644
index 0000000..da8f3f1
--- /dev/null
+++ b/shangjian/XGL/Views/HBLogWin.xaml.cs
@@ -0,0 +1,74 @@
+using CentralControl.DBDAO;
+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.Shapes;
+
+namespace XGL.Views
+{
+    /// <summary>
+    /// HBLogWin.xaml 的交互逻辑
+    /// </summary>
+    public partial class HBLogWin : Window
+    {
+        DBService userDbWareHouse = new DBService();
+        public HBLogWin()
+        {
+            InitializeComponent();
+        }
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            GetPlcValueList();
+        }
+
+        private void dgLogInfo_LoadingRow(object sender, DataGridRowEventArgs e)
+        {
+            e.Row.Header = (e.Row.GetIndex() + 1).ToString();
+        }
+
+        private void btnQueryLog_Click(object sender, RoutedEventArgs e)
+        {
+            GetPlcValueList();
+        }
+
+        private void GetPlcValueList()
+        {
+
+            DataTable dt = userDbWareHouse.GetHFPlcValueList(this.txtDeviceCode.Text);
+            if (dt == null) return;
+            this.dgPlcValueInfo.ItemsSource = null;
+            this.dgPlcValueInfo.ItemsSource = dt.DefaultView;
+        }
+
+        private void btnClose_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close();
+        }
+
+        private void txtKey_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+            {
+                GetPlcValueList();
+            }
+        }
+
+        private void txtDeviceCode_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+            {
+                GetPlcValueList();
+            }
+        }
+    }
+}
diff --git a/shangjian/XGL/Views/LanJu_Operator.xaml b/shangjian/XGL/Views/LanJu_Operator.xaml
index ef44567..44f8cfa 100644
--- a/shangjian/XGL/Views/LanJu_Operator.xaml
+++ b/shangjian/XGL/Views/LanJu_Operator.xaml
@@ -374,6 +374,25 @@
                         Foreground="White"
                 Click="btnViewPlcvalue_Click" Content="查看Plc值"></Button>
         </StackPanel>
+        <StackPanel
+                    Grid.Row="0"
+                    Grid.Column="8"
+                    Width="220"
+                    Height="90">
+            <Button
+                        x:Name="HFPlcvalue"
+                        Grid.Row="1"
+                        Grid.Column="5"
+                        Width="170"
+                        Height="60"
+                        Margin="25,5"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        Background="#2B7EE6" 
+                        FontSize="20"
+                        Foreground="White"
+                Click="HFPlcvalue_Click" Content="查看烘房值"></Button>
+        </StackPanel>
         <DataGrid
                     x:Name="dgWorkOrderInfo"
                     Grid.Row="1"
diff --git a/shangjian/XGL/Views/LanJu_Operator.xaml.cs b/shangjian/XGL/Views/LanJu_Operator.xaml.cs
index 30b4146..86df945 100644
--- a/shangjian/XGL/Views/LanJu_Operator.xaml.cs
+++ b/shangjian/XGL/Views/LanJu_Operator.xaml.cs
@@ -466,5 +466,11 @@ namespace XGL.Views
             _workOrderCode = (dgWorkOrderInfo.SelectedItem as FoamingMacModel).workorder_code;
             InOut_Click(null,null);
         }
+
+        private void HFPlcvalue_Click(object sender, RoutedEventArgs e)
+        {
+            HBLogWin HFPlcWin = new HBLogWin();
+            HFPlcWin.ShowDialog();
+        }
     }
 }
diff --git a/shangjian/XGL/Views/LanJu_Prepare.xaml.cs b/shangjian/XGL/Views/LanJu_Prepare.xaml.cs
index ed4611a..fcda08c 100644
--- a/shangjian/XGL/Views/LanJu_Prepare.xaml.cs
+++ b/shangjian/XGL/Views/LanJu_Prepare.xaml.cs
@@ -98,6 +98,7 @@ namespace XGL.Views
                     //    list_modelWareHouse.QuantitySplit = i["QuantitySplit"].ToString();
                     //    list_modelWareHouse.BatchCode = i["BatchCode"].ToString();
                     //    modelWareHouse.Add(list_modelWareHouse);
+                    LogHelper.instance.log.Info(wet.prod_line_code);
                 }
                 this.WorkOrder.ItemsSource = null;
                 this.WorkOrder.ItemsSource = wetList;
@@ -199,8 +200,9 @@ namespace XGL.Views
                     wet.sync_flag = i["sync_flag"].ToString();
                     wet.processid = i["route_code"].ToString();
                     wetList.Add(wet);
-               
+                    LogHelper.instance.log.Info(wet.prod_line_code);
                 }
+               
                 if (wetList != null)
                 {
                     //使用Dispatcher来在UI线程上更新UI
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml
deleted file mode 100644
index e60fe46a8547f43bdcea48095cb556d6312286dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9807
zcmb`N3v?9MdB^WQv~Rs75D&2eE!ak|T0LeZ(c&1%2ynnCk_=ALge<#**s>3KcGjSz
zX@EQo!59Y{C@G2S2XUP`l*Eons2@oj$M#7Y+iBXgr;ntKSBNHk;l56f#q|Hp%)L8<
zBslG{bawaN|NZ8hdw=&acfY$K#@H4%!ur`dd~QbWW8&pt8vY!M*E6>6?hTt)wQQ4>
zLOP#Y+YyaLd*gjw(XO68sbf{kKry2h6?tt=E~-i*v#MpNxHFSZzF(dg&F_(OYjed+
zX3_Hb$&9i(m&nS6@kCNy1CP<sd_Gg~ixgv$4|n(A)w~36tci-YrRBYa=;lQ3j^d83
z<Fb-a^NI_Fk`r$gcrE@d2fKSnkqdH8O{l2gpn|*X%`1D#RqjTW@qgpGc6IFB)zvG-
z6RECvx7;Ny-tJ^0R_6nGMSd^*4!hW$+tayJes7^aQFu>We$>rAWV#&8E7`)PoGOoj
z7m&OMHEtMWeY;h4d`)|MA-P-5CJNDPI;rFf`CV!>na{TGP3Ly)YwwK3;_dqq*-ZPm
zrAyq*!JN#++)Q%wZX2#(caBUHR5=^H8}|Q?D(>v*Nk~a4-qF|9EysHM8rC@Wt@^*z
zkyopNNi>q^)o`05)p=bX@;+)A&4l)y89A4tCihxA(fHLpEvm@mlZlKz!1YmVG4gVw
zHg7VYyH{4!x#oxEB0f7B?r>(4zi~|^^W$=EUpBJ~J)cku(Y!L&o=qrwisP%%IpY`w
zJJXr8I-z%v#i!q_$Z7`?5?=aWILO$o(=PX&m`RZu#sYT@@VR$-TB7MkEsO+S)!ZF@
zov|mbN&&9<-_l&YF_PdzHw)J|*b<HThvh=Ps3he=rGrV8DAZ?q3*C63SOlV5CblIq
zMR~xWA}cM`j0Lw$h<tM^P5kEa1zVMrtZd3{Evmw%rP0A^M-zoT1Nl_hQ*#?te0llG
zel^#hNbcF7<cqn~Kt7XK${yOB?56&rs^)XhR4gr{d9odw&9>gfst1Y%HJ=@jGno-}
zA|r=uo$TRh78p$^W3oCrF)lZ+B<c}!#GCUpO3oFmg3;R(YGQ+uPLYRjwTu09n)!wl
zbgH6GghOu1SLk3`8r`gR{k?K-IKQ`Cqj0E#y$BP%6)g=FtY&K}WwU5$@UR+w7nJDL
zY`&!em1@0FrC=Ve_E3X-qe^;g3=e{EwU-Uq>gc1qQAgLmPdk?{K|iga;idnr@H<$&
znR2ofX3E9-%#@q`t(mG|SIv}%g=uiG9;_QZ7)mbWq$&tB*xd0}yt{A{2_wXm$gc~%
zEMd%=Qj{drT&gvtWlp$@-;7+ePLt~JNiJOg?D4wTVfG8n6L7OBC*4|e$J@+8iE2-l
zo<>;Rc5u3KRNkkq%cRG0SqzT|`p7eYgsiO9;=QnQlS`?AU#0s#rA2&h=IrdeS&Mg(
zjazEO2h9{0x=)&i1T`*FS;4%m>tpo)los!X<kk)5+YAQvKN#q~^j0>R254mki{FAA
zwQ>PI?X8^Bux1fOYG2U9q=noBy(le0hRArDylCr%t2OH~Xjo2vmTbzU<b4sZk2yMC
zxf&mURg`JcVti8V%N+GPIB*BOa#Ax231P@Bh4Dd6c1taIr=_qedPS3#Awf%m%c(I>
z)mODCr_<Xy*g4oWD1{sS3~Chy;_dRTbS_N~wL;L(BpL)n%=JrDJAwo?GZJ`Ab0>;w
zo@sHam|HJhe%(?UI&)up(_E#Ya8rP)R*RWe%;v1M3ovOVF4JrG6^%(mTEBz;9nIC*
z8AIiWgxf`ht9YUB9nIOX(pI+mI%U!8l(k={EOwo;j_Z_lUZ;#YdbS3JqHUUV5QRF5
zC#PA&`(4cud*!P1X^1odBHot`;WJ$Dzp69BW8|}3^1Y=w`{=>)Ij&SsXnt_dB*qJJ
z3e%285Z&uOd{RYRuWKwqo;rHyx<im?CPc_noRq^{3A~}XJEc|9J=4<Xh4!ZA-YoA@
z*J{!cu7zIH#4MNYH&sv7lrdO4`+L@}k9#qeA3zaJAlE?*%VS8;+=$q&eh|u1Qhld1
zXJ_nYP5OeVcmfZ>pM$pFk<f9?Q+j@X>B%E_@IGW3xP5Nv1k$wdxuuhMr|IMZS?Osc
z2(v)^HDm<hPB1^m1;O)=xpFN}svhw?kIz|nejT!%=Qp@QJUe1K&u6$6deg%0S)p2q
ze$!NEA$kEtg6Ox9nMw59Q0+u7n##3AC!hJl%Mb4d(dSJABKjiI2GN(05=6g)jE(4b
zAqb*fAo@Kn2%;}@<yxYAgnl0evk-j+vYqG;xMCstD%Wg8UlXd8=<B9B3(+5<ND%!I
zGBb((DO5YrADfDmXx(uwbonbMCm-K`>Ctmj=bix9H%&9*`V*uLu78G<;QCW!Y+U~w
zg5XN4!(VVgaQ&I7(4hQFq&dRXPGls!^uKU0$X?gX-D_2l`F5(gp+vDDqhfyri+a2)
z%feqHYlr?fT(Ll>?TKz>gZ_6ywL<^7sm=oZ?@=V6{{u2Jq5l%99s1j*axL`9FCHu%
zICJUYN8Y~pB-%D<ni2FVqz&kokrL4V5g8lwUqKMi@j#b;%>@DdpG<|I|1;78x(gWr
zJyH{70e~KslX-lfL3PMhcU@kA{{@mA^}lk(g8JXMW<z~Ns8-bPnCdL3{{uw=^?xEW
z6ZL;VwWI!TQ<;JKz+<H+jtbQOW111_cab(wPa`Ez(=OJAT7w`^(@Ko3w;>4B4pSl2
zv;h^U-MF@lx(t-I#CD)=u2_IpaLoqPBUCF;uc^)gG=L%jG>FVhpdqMBQP=WA4PW+j
zWd_hk&R#lmq;%oz)ZvR5EY+qN0j)*a09uEX09ucX4QK-d0hAVEeC@ji=sZ&)p!1Oy
zK<WGIY(Se}WCyx{D;A&&xn={pNT^nzi%oSFp!D@d0HrU&Gl4FJy3_`AnW@YU^wQy{
zCQqIQ(1>Y9Kvy7b0KEw*0rX~MY(Q^;Ab@rQ=t?e>w_|Nw5`%V?sSsldBM8QxIT%M_
zWM|yY6=H1e!(v<uzNu9Vr^j~FMy!L2wyjjBsm_8}LXkimM`kAC9;i!gh<i=Nin#i?
z=AYEZ?8w$3@Lglt5Z~WK+TeRDQiAXMkg@T-4T9h+f$usll==2^N$?#o72<n4(t<C2
zb1IKvvHtEtcxpFlxE{7TX4-Aj(mp5z?6&Fl8@NzjP&RUjZm;i=H*v+%H+OK&+Bfg#
zqOET>o9Z=v6Y;%m?t1U!27zCccfD7z>pgT~^5l86V+aN-(NuT5kKUyZATJmXBV%Jc
z0zoj2qmiRrC^No`OM>w>Qz6FNkrs@7HpaC<7Q{1dV7HvyvpGM8%H0iP8{`iP!G!!F
zE|ejEm`egOV%UZo3*?V*%?kOWT(m*nVXAXNPH+PY<fbcHoiU;(A2?e&_W0zfv!$0#
zp-o8`x9Pxd)q$sw7r=KRV*@@0K>+Uo@ZDS}15a~F0RL@MA>ezE7Qp>B;Eh364d4_$
z9m*u{rN|&En85`$=vg6{&~scUL(g+bKp*Fd1^PW)vqD$6XoFrb)j6RTxq$_G-4!il
zKu3E@`=3W^_QI@P$K9{v-iJKlZeHQR4x!~n!8sR}S!n{-P_L|}H?by!gCRsz%#Cnk
zh*hV?w&PsHjF|4q<K`d7g+}k0i^L~{@IB4Zhwl6xE(Cr^-|6(w?kBnC|B>eE>ZY&K
zzbm94Yp!nH>Qj&^QJ-+Qk^(zTB8Ze5vxO#GE7^ygh{5lNJuRc*`Bm(~Rb~x34Io6T
zM!Z$bK^vz7FeF0ZhHCb+X;wKRXXK<Rr_9h)HPeF&2l?%*Yv}eq9`tOj!R-+7`n2gK
zQuT)B>x`|Ue+mG6209@LH`UU0wHxIGBFu$t>4F(UkAzTQ#Cz~a`W!c}sUvg0hyl0O
z;XW=V-Des^0_A|hA+Gsf(_EwZarimR{nXZzpTMTVFmAjxmznT*>JejegcmkYLH#-e
zwl>H)ItoK@o1#tykEa0^EZo>g7F7d@++77(S*M49QP`*#HqE0#Gf-tTN)G~i=P~IB
zZmv&3ij>}u3_UZO*LpDkd*&K|LrOY}K-|5uC3>w_$MB5^q?g4h9!U|%qwq<O-g12K
z=Ll|CW2OTrHDaa@n6^ed_AMi3+THua)wn)Q^tkFVo6Xy1ToqB2I7P1vKM&e$L|m8R
zDn?XN_w)su)s*I`qUbL|k47|y$1jh=jJ`Pf!d3H$qt`?qoX@0(QAYHdyAc&-(Yb)}
z==-Rg9nXl)bKwyqoqz`&`6@p=thkW}<KE%QCWhtGWAKh3=WQunJXSh(;q<f~`VEH`
zkU_=vbV}Xbj58VsYrm1}&2nx`-7OA6BEAL8Da8UT9!CSi)eFg?Z%aC-`;7P&GG|BZ
z16q6?mDVnzQrpN~q>tSC#SE<s(bV9L_bz7ANwiuY6o(K2J%tPfp`*i^^m|AzL7Kv6
z5$hg1{za&^I9i+nL;4g(yh;DRXFC29Xx`(R9_4raTEoO>X85QYmcbn(c0@mj@-{Qq
zyVEQjT*C0--h#uTNZk?^8pOHmx*QIwaMZk33)hFKIK&k?%vlyjblvR>2V2Okdnlpq
zj)YoxPc&S`rZ7H<I=H3NXbDBru}l1YBxwXS$AajHl{e}LI$kjP*@d-EI)kfeghc!c
zn5$Fo5ejHWYMNL8-=a!KPqdE=4xr;{{D*6o>OEmuv#O!Morsn0q?&YuP?NSB)ui7%
zAHzx$u3E-IVA~Hw>D-ui8Pj{77_Y3U3el;1p3dWTq*HAKf$pML|4Y{Dcg1Kx&0T%F
z+nTDf+a&sk9P2(GvHG+iscT{(L_|st9Vk6`^wN{qL+Vh->-(raW@X2fe5#mKchHX#
zgwH>?vCl6bF=iNnp3A4Lo{w66;t9&z9%^Eq$rI-<-*?PX!?mJ@es40N?8p_fqH>Q}
z9bMDlsdJB(4jrF7_1xuC&syA-8yxgw(aG&l(`aqDzLot-W1$gMK`+v;1rlncxs}cT
zL~P9j{#I|<vO1M&*|>2{HoK-!_~hwn&irv+1zH#4wx(SA{Bx8058&Q06AbMh4cI<U
z0l&>C7TUr!5t=a=iTa_pth7e(ki<m6{CEnkX@2N^`&E7)8txt4;zo^4tlAjvrE~XB
z9(oY`EUmpw+|gT+P*tTvp!*}6zh2>QQ4?z{z3@=!@X^UL7fZ*^&*qi3Wkx$f0X45C
zGWu>rxPE#L*VMh2j(u(N=|?R!EO)QBB3;;-NRu0!iG3YT#2)(@WW*kuHayQlFm`F!
zl+ic0Z*oCDf;Tp0&v8xP;Pzopc7ZGU4oBk4qx3DVTXrPh=9+Dfd(l+Gb;}u!7lK=r
zH2;}Rq-Hq_Y|Ja^kK+tGk--k;PfTOl(?5^2*wa(P#HQ4Uy!ORWzZYPn@8d;{U*w9V
zW-oD#YSy2}nS2&E`;Mu40(AJIAC}M|;>(a}nVj+DkiL(SW|Y{T9?~mZ)lXr1aSHPT
zu25LJbl=6&XU|TZJ70R?1a`}>nq@e*eGN(DJO8^#>0O6oK<O$nqU$Ior9lu~NBe2~
z5XKPny>l1sogG~AzJX&fY(bq|us-`FI_%b6l{bxUQzGOQNbAVYXlykW=`!+ga0NTV
z1LBn{nAiCEK?hpo!9~VbDU2){YF;i_e%#?RH8eYjBsCTX*GN$W!Y$21iekae{{=r=
B+p+)v

diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.cs
index df656e4..d6b5944 100644
--- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.cs
+++ b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B92E7E61C39C901A7FA4616B61E410627571E415C6089F472C16239020DF5B90"
+#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "78352914B9142AAC31B7370C1E4947E13871C6386E9E928CF46E67383F325ED7"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -90,7 +90,15 @@ namespace XGL.Views {
         #line hidden
         
         
-        #line 378 "..\..\..\..\Views\LanJu_Operator.xaml"
+        #line 383 "..\..\..\..\Views\LanJu_Operator.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button HFPlcvalue;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 397 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid dgWorkOrderInfo;
         
@@ -98,7 +106,7 @@ namespace XGL.Views {
         #line hidden
         
         
-        #line 518 "..\..\..\..\Views\LanJu_Operator.xaml"
+        #line 537 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ContentControl Window1;
         
@@ -214,29 +222,38 @@ namespace XGL.Views {
             #line hidden
             return;
             case 10:
-            this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target));
-            
-            #line 389 "..\..\..\..\Views\LanJu_Operator.xaml"
-            this.dgWorkOrderInfo.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgWorkOrderInfo_LoadingRow);
-            
-            #line default
-            #line hidden
+            this.HFPlcvalue = ((System.Windows.Controls.Button)(target));
             
             #line 394 "..\..\..\..\Views\LanJu_Operator.xaml"
-            this.dgWorkOrderInfo.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.dgWorkOrderInfo_SelectionChanged);
+            this.HFPlcvalue.Click += new System.Windows.RoutedEventHandler(this.HFPlcvalue_Click);
             
             #line default
             #line hidden
             return;
             case 11:
+            this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target));
             
-            #line 450 "..\..\..\..\Views\LanJu_Operator.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click);
+            #line 408 "..\..\..\..\Views\LanJu_Operator.xaml"
+            this.dgWorkOrderInfo.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgWorkOrderInfo_LoadingRow);
+            
+            #line default
+            #line hidden
+            
+            #line 413 "..\..\..\..\Views\LanJu_Operator.xaml"
+            this.dgWorkOrderInfo.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.dgWorkOrderInfo_SelectionChanged);
             
             #line default
             #line hidden
             return;
             case 12:
+            
+            #line 469 "..\..\..\..\Views\LanJu_Operator.xaml"
+            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 13:
             this.Window1 = ((System.Windows.Controls.ContentControl)(target));
             return;
             }