From 70242d2c2aa5e8e908c572056fb5b739e5cd4c0e Mon Sep 17 00:00:00 2001
From: zhaojian <qj120227@163.com>
Date: Mon, 13 Nov 2023 14:09:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BD=8D=E6=9C=BA?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shangjian/WPFupdate/update.cs                 |  2 +-
 .../FinishProdDBService.cs                    |  2 +-
 shangjian/XGL/Views/DryingRoomUC.xaml         | 28 ++++++++++++++++++-
 shangjian/XGL/Views/DryingRoomUC.xaml.cs      |  6 ++++
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/shangjian/WPFupdate/update.cs b/shangjian/WPFupdate/update.cs
index 581ca02..9420637 100644
--- a/shangjian/WPFupdate/update.cs
+++ b/shangjian/WPFupdate/update.cs
@@ -33,7 +33,7 @@ class Update
 
 
         // 设置要启动的应用程序名称和参数
-        string appName = "XGL.exe"; // 替换为你的目标控制台应用程序的名称
+        string appName = "XGLFinishPro.exe"; // 替换为你的目标控制台应用程序的名称
         string appArguments = " ";// 替换为你的应用程序需要的参数
 
         // 创建进程启动信息
diff --git a/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs b/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs
index 41ac621..f4c154f 100644
--- a/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs
+++ b/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs
@@ -490,7 +490,7 @@ product_spc,shifts.shift_desc,prod_line_code,workorder.status,route_code,quantit
 from  pro_order_workorder workorder 
 left JOIN base_shifts_t shifts on workorder.shift_id = shifts.shift_id
 where 1=1 and 
- workorder.end_flag = '1' and CONVERT(VARCHAR(10), workorder.product_date , 120)= CONVERT(VARCHAR(10), '{date}' , 120) and workorder.prod_line_code like '%{deviceCode}%'";
+ workorder.parent_order ='0' ";
             DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
             if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
             {
diff --git a/shangjian/XGL/Views/DryingRoomUC.xaml b/shangjian/XGL/Views/DryingRoomUC.xaml
index 1ae122e..de75c87 100644
--- a/shangjian/XGL/Views/DryingRoomUC.xaml
+++ b/shangjian/XGL/Views/DryingRoomUC.xaml
@@ -5,7 +5,7 @@
              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">
+             d:DesignHeight="450" d:DesignWidth="800"  Loaded="UserControl_Loaded">
     <UserControl.Resources>
         <Style x:Key="ApplicantList_ListBox_Style" TargetType="{x:Type ListBox}">
             <Setter Property="Background" Value="#00000000"/>
@@ -29,7 +29,22 @@
                 </Setter.Value>
             </Setter>
         </Style>
+        <Style x:Key="btnKey" TargetType="Button">
+            <Setter Property="Width" Value="150" />
+            <Setter Property="Height" Value="60" />
+            <Setter Property="Margin" Value="5.5"/>
+            <Setter Property="HorizontalContentAlignment" Value="Center"/>
+            <Setter Property="Template" >
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Border Background="#2B7EE6"  BorderThickness="2" CornerRadius="10">
+                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        </Border>
+                    </ControlTemplate>
 
+                </Setter.Value>
+            </Setter>
+        </Style>
 
         <Style x:Key="ApplicantList_ListBoxItem_Style" TargetType="{x:Type ListBoxItem}">
             <Setter Property="Margin" Value="10,10,10,0" />
@@ -455,6 +470,17 @@
                         FontSize="20"
                         Foreground="White"
                 Click="btnViewPlcvalue_Click" Content="查看Plc值"></Button>
+                <Button
+                        x:Name="HFPlcvalue"
+                        Width="120"
+                        Height="40"
+                        Margin="25,5"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        Background="#2B7EE6" 
+                        FontSize="20"
+                        Foreground="White"
+                Click="HFPlcvalue_Click" Content="查看烘房值"></Button>
             </StackPanel> 
         </StackPanel>
         <!--ItemContainerStyle="{DynamicResource ApplicantList_ListBoxItem_Style}"-->
diff --git a/shangjian/XGL/Views/DryingRoomUC.xaml.cs b/shangjian/XGL/Views/DryingRoomUC.xaml.cs
index b271592..18a83ed 100644
--- a/shangjian/XGL/Views/DryingRoomUC.xaml.cs
+++ b/shangjian/XGL/Views/DryingRoomUC.xaml.cs
@@ -291,6 +291,12 @@ namespace XGL.Views
                 e.Handled = true;
             }
         }
+
+        private void HFPlcvalue_Click(object sender, RoutedEventArgs e)
+        {
+            HFstatus hFstatus = new HFstatus();
+            hFstatus.ShowDialog();
+        }
     }
     public class EquipmentMode
     {