Merge branch 'master' of http://192.168.0.12:13000/sc/Audit_APP

Audit.csproj

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

ConvertMoels/DeviationConvert.cs

@@ -0,0 +1,32 @@
+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 DeviationConvert : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            string a = System.Convert.ToString(values[0]);
+            string b = System.Convert.ToString(values[1]);
+            if (a != "" && b != "")
+            {
+                  string c = (System.Convert.ToSingle(b) - System.Convert.ToSingle(a)).ToString("0.0");
+                //string c = "0";
+                return c;
+            }
+            return null;
+        }
+
+        public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+
+    }
+}

View/QueryView.xaml

@@ -9,6 +9,7 @@
       d:DesignHeight="900" d:DesignWidth="1140">
     <UserControl.Resources>
         <ConvertMoels:GramsSQLConvert x:Key="GramsSQLConvert"/>
+        <ConvertMoels:DeviationConvert x:Key="DeviationConvert"/>
     </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
@@ -93,7 +94,16 @@
                             </Style>
                         </DataGridTextColumn.ElementStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Header="偏差" Width="70" FontSize="15" Visibility="Collapsed" MinWidth="70" MaxWidth="150" CanUserReorder="False"/>
+                    <!--事件名称：偏差值计算，转换器DeviationConvert-->
+                    <DataGridTextColumn Header="偏差" Width="70" FontSize="15" MinWidth="70" MaxWidth="150" CanUserReorder="False">
+                        <DataGridTextColumn.Binding>
+                            <MultiBinding StringFormat="{}{0}" Converter="{StaticResource DeviationConvert}">
+                                <Binding Path="Grams"></Binding>
+                                <Binding Path="DispenseGrams"></Binding>
+                            </MultiBinding>
+                        </DataGridTextColumn.Binding>
+
+                    </DataGridTextColumn>
                     <DataGridTextColumn Header="结束时间" Width="300" FontSize="15" Binding="{Binding DispenseEndTime,StringFormat='yyyy-MM-dd HH:mm:ss'}" MaxWidth="200" MinWidth="500" CanUserReorder="False"/>
                 </DataGrid.Columns>
             </DataGrid>