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

Audit.csproj

@@ -166,6 +166,7 @@
     </ApplicationDefinition>
     <Compile Include="AuditData.cs" />
     <Compile Include="ConvertMoels\ColorSQLConvert.cs" />
+    <Compile Include="ConvertMoels\GramsSQLConvert.cs" />
     <Compile Include="ConvertMoels\ProductTypeSQLConvert.cs" />
     <Compile Include="ViewModel\LogViewModel.cs" />
     <Compile Include="ViewModel\MainViewModel.cs" />

ConvertMoels/GramsSQLConvert.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace Audit.ConvertMoels
+{
+    internal class GramsSQLConvert : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            string G = value.ToString();
+            if (G == "0")
+            {
+                return "red";
+            }
+            else
+            {
+                return "black";
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return null;
+        }
+    }
+}

View/QueryView.xaml

@@ -4,10 +4,11 @@
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:Audit.View"
+      xmlns:ConvertMoels="clr-namespace:Audit.ConvertMoels"
       mc:Ignorable="d" DataContext="{Binding Source={StaticResource Locator},Path=Query}"
       d:DesignHeight="900" d:DesignWidth="1140">
     <UserControl.Resources>
-      
+        <ConvertMoels:GramsSQLConvert x:Key="GramsSQLConvert"/>
     </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
@@ -83,7 +84,15 @@
                     <DataGridTextColumn Header="原料代码" Width="100" FontSize="15" Binding="{Binding ProductCode}" MaxWidth="200" MinWidth="100" CanUserReorder="False"/>
                     <DataGridTextColumn Header="原料名称" Width="100" FontSize="15" Binding="{Binding ProductName}" MaxWidth="200" MinWidth="100" CanUserReorder="False"/>
                     <DataGridTextColumn Header="目标用量" Width="150" FontSize="15" Binding="{Binding Grams}" MaxWidth="250" MinWidth="150" CanUserReorder="False"/>
-                    <DataGridTextColumn Header="实际用量" Width="150" FontSize="15" Binding="{Binding DispenseGrams}" MaxWidth="250" MinWidth="150" CanUserReorder="False"/>
+                    <DataGridTextColumn Header="实际用量" Width="150" FontSize="15" Binding="{Binding DispenseGrams}" MaxWidth="250" MinWidth="150" CanUserReorder="False">
+                        <!--事件名称：数值为零时标红，转换器GramsSQLConvert-->
+                        <DataGridTextColumn.ElementStyle>
+                            <Style TargetType="{x:Type TextBlock}">
+                                <Setter Property="Foreground" Value="{Binding Path=DispenseGrams,Converter={StaticResource GramsSQLConvert}}">
+                                </Setter>
+                            </Style>
+                        </DataGridTextColumn.ElementStyle>
+                    </DataGridTextColumn>
                     <DataGridTextColumn Header="偏差" Width="70" FontSize="15" Visibility="Collapsed" MinWidth="70" MaxWidth="150" CanUserReorder="False"/>
                     <DataGridTextColumn Header="结束时间" Width="300" FontSize="15" Binding="{Binding DispenseEndTime,StringFormat='yyyy-MM-dd HH:mm:ss'}" MaxWidth="200" MinWidth="500" CanUserReorder="False"/>
                 </DataGrid.Columns>

View/QueryView.xaml.cs

@@ -86,7 +86,7 @@ namespace Audit.View
             {
                 string DataGridDyelots_value = (DataGridDyelots.Columns[0].GetCellContent(DataGridDyelots.Items[rownum]) as TextBlock).Text;//定位第0列选中行单元格，单号
                 string DataGridReDye_value = (DataGridDyelots.Columns[1].GetCellContent(DataGridDyelots.Items[rownum]) as TextBlock).Text;//定位第1列选中行单元格，重染
-                string DataGridMachine_value = (DataGridDyelots.Columns[2].GetCellContent(DataGridDyelots.Items[rownum]) as TextBlock).Text;//定位第2列选中行单元格，机台
+                //string DataGridMachine_value = (DataGridDyelots.Columns[2].GetCellContent(DataGridDyelots.Items[rownum]) as TextBlock).Text;//定位第2列选中行单元格，机台
                 string DataGridCreationTime_value = (DataGridDyelots.Columns[3].GetCellContent(DataGridDyelots.Items[rownum]) as TextBlock).Text;//定位第3列选中行单元格，开单时间
                 //Dyelots_Dyelot.Text = DataGridDyelots_value.ToString();//获取工单单元格字符串填入工单输入框
                 Dyelots_ReDye.Text = DataGridReDye_value.ToString(); //获取重染单元格字符串填入重染框