Merge branch 'master' of http://scddns.f3322.net:13000/sc/Audit_APP

View/QueryView.xaml

@@ -86,8 +86,8 @@
             <TextBox x:Name="Dyelots_Machine" HorizontalAlignment="Left" Height="30" Margin="200,0,0,50" VerticalAlignment="Bottom" Width="115" FontSize="16" MaxLines="1" MaxLength="9"/>
             <TextBox x:Name="Dyelots_CreationTime" HorizontalAlignment="Left" Height="30" Margin="450,0,0,50" VerticalAlignment="Bottom" Width="225" FontSize="16" IsReadOnly="True" MaxLines="1"/>
             <TextBox x:Name="Dyelots_ReDye" HorizontalAlignment="Left" Height="30" Margin="65,0,0,50" VerticalAlignment="Bottom" Width="80" FontSize="16" IsReadOnly="True" MaxLines="1"/>
-            <DatePicker HorizontalAlignment="Left" Height="30" Margin="450,0,0,100" VerticalAlignment="Bottom" Width="225" FontSize="16"/>
-            <DatePicker HorizontalAlignment="Left" Height="30" Margin="715,0,0,100" VerticalAlignment="Bottom" Width="225" FontSize="16"/>
+            <DatePicker x:Name="query_date_start" HorizontalAlignment="Left" Height="30" Margin="450,0,0,100" VerticalAlignment="Bottom" Width="225" FontSize="16"/>
+            <DatePicker x:Name="query_date_end" HorizontalAlignment="Left" Height="30" Margin="715,0,0,100" VerticalAlignment="Bottom" Width="225" FontSize="16"/>
             <TextBlock HorizontalAlignment="Left" Height="30" Margin="15,0,0,100" TextWrapping="Wrap" Text="工单" VerticalAlignment="Bottom" Width="45" FontSize="20"/>
             <TextBlock HorizontalAlignment="Left" Height="30" Margin="15,0,0,50" TextWrapping="Wrap" Text="重染" VerticalAlignment="Bottom" Width="45" FontSize="20"/>
             <TextBlock HorizontalAlignment="Left" Height="30" Margin="155,0,0,50" TextWrapping="Wrap" Text="染机" VerticalAlignment="Bottom" Width="45" FontSize="20"/>

View/QueryView.xaml.cs

@@ -28,18 +28,42 @@ namespace Audit.View
             InitializeComponent();
         }
 
-        private void Button_Click(object sender, RoutedEventArgs e)
+        private void Button_Click(object sender, RoutedEventArgs e)//确认按钮事件
         {
-            string DataGridDyelots_Button = this.Dyelots_Dyelot.Text;
-            string DataGridMachine_Button = this.Dyelots_Machine.Text;
-            if ((DataGridDyelots_Button == null) && (DataGridMachine_Button != null))
+            string DataGridDyelots_Button = this.Dyelots_Dyelot.Text;//定义工单输入框          
+            string DataGridMachine_Button = this.Dyelots_Machine.Text;//定义机台输入框
+            DateTime query_start = DateTime.Parse(query_date_start);//定义并转换开始时间
+            DateTime query_end = DateTime.Parse(query_date_end);//定义并转换结束时间
+            int query_DateTime = DateTime.Compare(query_end,query_start);
+            if (query_date_start != null && query_date_end != null)//判断查询时间
             {
-                
+                if (query_DateTime <= 0)//查询时间是否有效
+                {
+
+                }
+                else 
+                {
+                    MessageBox.Show("SC:请输入有效查询时间");//返回弹窗
+                }
             }
-            if ((DataGridDyelots_Button != null) && (DataGridMachine_Button == null))
+            else
             {
-                
-            }
+                if ((DataGridDyelots_Button == null) && (DataGridMachine_Button != null))//优先以工单查询
+                {
+
+                }
+                else
+                {
+                    if ((DataGridDyelots_Button != null) && (DataGridMachine_Button == null))//以机台查询
+                    {
+
+                    }
+                    else
+                    {
+                        MessageBox.Show("SC:请输入有效查询信息");//返回弹窗
+                    }
+                }
+            }                  
         }
 
         private void DataGrid_Detailed(object sender, SelectionChangedEventArgs e)
@@ -51,11 +75,11 @@ namespace Audit.View
         {
 
         }
-        private void DataGridDyelot_MouseDoubleClick(object sender, MouseButtonEventArgs e)
+        private void DataGridDyelot_MouseDoubleClick(object sender, MouseButtonEventArgs e)// DataGridDyelot表格双击事件
         {
-            int rownum = this.DataGridDyelots.SelectedIndex;
-            string DataGridDyelots_value = (DataGridDyelots.Columns[0].GetCellContent(DataGridDyelots.Items[rownum]) as TextBlock).Text;
-            Dyelots_Dyelot.Text = DataGridDyelots_value.ToString();
+            int rownum = this.DataGridDyelots.SelectedIndex;//获取鼠标选中行并定义变量
+            string DataGridDyelots_value = (DataGridDyelots.Columns[0].GetCellContent(DataGridDyelots.Items[rownum]) as TextBlock).Text;//定位第0列选中行单元格
+            Dyelots_Dyelot.Text = DataGridDyelots_value.ToString();//获取单元格变量填入工单输入框
             if (DataGridDyelots_value != null) 
             {