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

Models/ProductProvider.cs

@@ -8,19 +8,29 @@ namespace Models
 {
     public class ProductProvider : IProvider<Product>
     {
+        private readonly TicketEntities db = new TicketEntities();
         public int Delete(Product t)
         {
-            throw new NotImplementedException();
+            if (t == null) return 0;
+            var model = db.Product.ToList().FirstOrDefault(item => t.ProductCode == item.ProductCode);
+            if (model == null) return 0;
+            db.Product.Remove(model);
+            int count = db.SaveChanges();
+            return count;
         }
 
         public int Insert(Product t)
         {
-            throw new NotImplementedException();
+            if (t == null) return 0;
+            if (String.IsNullOrEmpty(t.ProductCode)) return 0;
+            db.Product.Add(t);
+            int count = db.SaveChanges();
+            return count;
         }
 
         public List<Product> Select()
         {
-            throw new NotImplementedException();
+            return db.Product.SqlQuery("select * from Product").ToList();//查询
         }
 
         public int Update(Product t)

View/QueryView.xaml.cs

@@ -85,5 +85,6 @@ namespace Audit.View
                 
             }
         }
+
     }
 }

View/StuffView.xaml

@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Audit.View"
-             mc:Ignorable="d" DataContext="{Binding Source={StaticResource Locator},Path=Statistics}"
+             mc:Ignorable="d" DataContext="{Binding Source={StaticResource Locator},Path=Stuff}"
              d:DesignHeight="900" d:DesignWidth="1140"
     xmlns:mah="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro">
     <UserControl.Resources>
@@ -60,11 +60,65 @@
         </Border>
         <Grid Grid.Row="0"/>
         <Grid Grid.Row="1">
-            <Grid Grid.Column="1">
+            <DataGrid x:Name="DataGridStuff"  MouseDoubleClick="DataGridStuff_MouseDoubleClick"  ItemsSource="{Binding Product}" SelectionMode="Single" AlternationCount="2" IsReadOnly="True" HorizontalAlignment="Left" Margin="15,15,0,150" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" VerticalContentAlignment="Stretch" ScrollViewer.VerticalScrollBarVisibility="Disabled" Grid.ColumnSpan="2">
-                <ContentControl x:Name="ContentControl" Margin="0,31,0,0">
+                <DataGrid.RowStyle >
-                    <TextBlock HorizontalAlignment="Left" Height="290" Margin="385,194,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="415"><Run Language="zh-cn" Text="原料" FontSize="72"/></TextBlock>
+                    <Style TargetType="{x:Type DataGridRow}">
-                </ContentControl>
+                        <Style.Triggers>
-            </Grid>
+                            <Trigger Property="ItemsControl.AlternationIndex" Value="0">
+                                <Setter Property="Background" Value="#FFFFFFFF" />
+                            </Trigger>
+                            <Trigger Property="ItemsControl.AlternationIndex" Value="1">
+                                <Setter Property="Background" Value="#FFF5F5F5" />
+                            </Trigger>
+                            <Trigger Property="IsMouseOver" Value="False">
+                            </Trigger>
+                        </Style.Triggers>
+                    </Style>
+                </DataGrid.RowStyle>
+                <DataGrid.CellStyle>
+                    <Style TargetType="DataGridCell">
+                        <Setter Property="BorderThickness" Value="0"/>
+                        <Setter Property="MinWidth" Value="20"/>
+                        <Style.Triggers>
+                            <Trigger Property="IsSelected" Value="False">
+                            </Trigger>
+                        </Style.Triggers>
+                    </Style>
+                </DataGrid.CellStyle>
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="序号" Width="50" FontSize="15" Binding="{Binding ProductCode}" MaxWidth="200" MinWidth="20" CanUserReorder="False"/>
+                    <DataGridTextColumn Header="原料代码" Width="130" FontSize="15" Binding="{Binding ProductCode}" MaxWidth="200" MinWidth="100" CanUserReorder="False"/>
+                    <DataGridTextColumn Header="原料名称" Width="200" FontSize="15" Binding="{Binding ProductName}" MaxWidth="300" MinWidth="200" CanUserReorder="False"/>
+                    <DataGridTextColumn Header="价格" Width="100" FontSize="15" Binding="{Binding Price}" MaxWidth="200" MinWidth="100" CanUserReorder="False"/>
+                    <DataGridTextColumn Header="供应商" Width="150" FontSize="15" Binding="{Binding ProductUnit}" MaxWidth="250" MinWidth="150" CanUserReorder="False"/>
+                    <DataGridTextColumn Header="原料类型" Width="80" FontSize="15" Binding="{Binding ProductType}" MaxWidth="200" MinWidth="70" CanUserReorder="False"/>
+                    <DataGridTextColumn Header="色彩" Width="100" FontSize="15" Binding="{Binding Color}" MaxWidth="500" MinWidth="50" CanUserReorder="False"/>
+                    <DataGridTextColumn Header="浓度" Width="70" FontSize="15" Binding="{Binding Concentration}" MaxWidth="200" MinWidth="20" CanUserReorder="False"/>
+                    <DataGridTextColumn Header="比重" Width="70" FontSize="15" Binding="{Binding GRAVITY}" MaxWidth="200" MinWidth="20" CanUserReorder="False"/>
+                </DataGrid.Columns>
+            </DataGrid>
+            <RadioButton Content="染料" HorizontalAlignment="Left" Height="40" Margin="995,265,0,0" VerticalAlignment="Top" Width="100" FontSize="18" BorderBrush="{x:Null}" Background="{x:Null}" Grid.Column="1"/>
+            <RadioButton Content="助剂" HorizontalAlignment="Left" Height="40" Margin="995,305,0,0" VerticalAlignment="Top" Width="100" FontSize="18" BorderBrush="{x:Null}" Background="{x:Null}" Grid.Column="1"/>
+            <RadioButton Content="粉体助剂" HorizontalAlignment="Left" Height="40" Margin="995,345,0,0" VerticalAlignment="Top" Width="100" FontSize="18" BorderBrush="{x:Null}" Background="{x:Null}" Grid.Column="1"/>
+            <RadioButton Content="全部原料" HorizontalAlignment="Left" Height="40" Margin="995,385,0,0" VerticalAlignment="Top" Width="100" FontSize="18" BorderBrush="{x:Null}" Background="{x:Null}" Grid.Column="1"/>
+            <TextBox x:Name="stuff_ProductCode"   HorizontalAlignment="Left" Height="30" Margin="105,0,0,100" Text="" VerticalAlignment="Bottom" Width="130" FontSize="16" MaxLines="1" MaxLength="25" Grid.ColumnSpan="2"/>
+            <TextBlock HorizontalAlignment="Left" Height="30" Margin="15,0,0,100" TextWrapping="Wrap" Text="原料代码" VerticalAlignment="Bottom" Width="100" FontSize="20"/>
+            <TextBox x:Name="stuff_ProductName"   HorizontalAlignment="Left" Height="30" Margin="345,0,0,100" Text="" VerticalAlignment="Bottom" Width="200" FontSize="16" MaxLines="1" MaxLength="25" Grid.Column="1"/>
+            <TextBlock HorizontalAlignment="Left" Height="30" Margin="255,0,0,100" TextWrapping="Wrap" Text="原料名称" VerticalAlignment="Bottom" Width="100" FontSize="20" Grid.Column="1"/>
+            <ComboBox x:Name="stuff_ProductType"   HorizontalAlignment="Left" Height="30" Margin="645,0,0,100" Text="" VerticalAlignment="Bottom" Width="100" FontSize="16" Grid.Column="1"/>
+            <TextBlock HorizontalAlignment="Left" Height="30" Margin="560,0,0,100" TextWrapping="Wrap" Text="原料类型" VerticalAlignment="Bottom" Width="100" FontSize="20" Grid.Column="1"/>
+            <TextBox x:Name="stuff_Color"   HorizontalAlignment="Left" Height="30" Margin="465,0,0,50" Text="" VerticalAlignment="Bottom" Width="60" FontSize="16" MaxLines="1" MaxLength="25" Grid.Column="1"/>
+            <TextBlock HorizontalAlignment="Left" Height="30" Margin="420,0,0,50" TextWrapping="Wrap" Text="色彩" VerticalAlignment="Bottom" Width="50" FontSize="20" Grid.Column="1"/>
+            <TextBox x:Name="stuff_ProductUnit"   HorizontalAlignment="Left" Height="30" Margin="105,0,0,50" Text="" VerticalAlignment="Bottom" Width="130" FontSize="16" MaxLines="1" MaxLength="25" Grid.ColumnSpan="2"/>
+            <TextBlock HorizontalAlignment="Left" Height="30" Margin="15,0,0,50" TextWrapping="Wrap" Text="供应商" VerticalAlignment="Bottom" Width="100" FontSize="20"/>
+            <TextBox x:Name="stuff_Pricee"   HorizontalAlignment="Left" Height="30" Margin="305,0,0,50" Text="" VerticalAlignment="Bottom" Width="100" FontSize="16" MaxLines="1" MaxLength="25" Grid.Column="1"/>
+            <TextBlock HorizontalAlignment="Left" Height="30" Margin="255,0,0,50" TextWrapping="Wrap" Text="价格" VerticalAlignment="Bottom" Width="100" FontSize="20" Grid.Column="1"/>
+            <TextBox x:Name="stuff_Concentration"   HorizontalAlignment="Left" Height="30" Margin="585,0,0,50" Text="" VerticalAlignment="Bottom" Width="50" FontSize="16" MaxLines="1" MaxLength="25" Grid.Column="1"/>
+            <TextBlock HorizontalAlignment="Left" Height="30" Margin="540,0,0,50" TextWrapping="Wrap" Text="浓度" VerticalAlignment="Bottom" Width="50" FontSize="20" Grid.Column="1"/>
+            <TextBox x:Name="stuff_GRAVITY"   HorizontalAlignment="Left" Height="30" Margin="695,0,0,50" Text="" VerticalAlignment="Bottom" Width="50" FontSize="16" MaxLines="1" MaxLength="25" Grid.Column="1"/>
+            <TextBlock HorizontalAlignment="Left" Height="30" Margin="650,0,0,50" TextWrapping="Wrap" Text="比重" VerticalAlignment="Bottom" Width="50" FontSize="20" Grid.Column="1"/>
+            <Button Content="存储" HorizontalAlignment="Left" Height="65" Margin="795,0,0,60" VerticalAlignment="Bottom" Width="145" FontSize="40" BorderBrush="{x:Null}" Background="#FFCECECE" Click="Button_Preservation"/>
+            <Button Content="删除" HorizontalAlignment="Left" Height="65" Margin="975,0,0,60" VerticalAlignment="Bottom" Width="145" FontSize="40" BorderBrush="{x:Null}" Background="#FFCECECE" Click="Button_Delete"/>
         </Grid>
     </Grid>
 </UserControl>

View/StuffView.xaml.cs

@@ -27,5 +27,20 @@ namespace Audit.View
         {
             InitializeComponent();
         }
+
+        private void Button_Preservation(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void Button_Delete(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void DataGridStuff_MouseDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+
+        }
     }
 }

ViewModel/StuffViewModel.cs

@@ -1,4 +1,6 @@
-using System;
+using GalaSoft.MvvmLight;
+using Models;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -6,7 +8,34 @@ using System.Threading.Tasks;
 
 namespace Audit.ViewModel
 {
-    internal class StuffViewModel
+    ///<Summary>
+    /// StuffViewModel
+    ///</Summary>
+    public class StuffViewModel : ViewModelBase
     {
+        private List<Product> products = new List<Product>();
+        /// <summary>
+        /// 所有工单
+        /// </summary>
+        public List<Product> Product
+        {
+            get
+            {
+                return products;
+            }
+            set
+            {
+                products = value;
+                RaisePropertyChanged();
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public StuffViewModel()
+        {
+            products = new ProductProvider().Select();
+        }
     }
 }

ViewModel/ViewModelLocator.cs

@@ -47,6 +47,7 @@ namespace Audit.ViewModel
             SimpleIoc.Default.Register<LogViewModel>();
             SimpleIoc.Default.Register<StatisticsViewModel>();
             SimpleIoc.Default.Register<QueryViewModel>();
+            SimpleIoc.Default.Register<StuffViewModel>();
         }
 
         ///<Summary>
@@ -93,6 +94,16 @@ namespace Audit.ViewModel
             }
         }
 
+        ///<Summary>
+        /// QueryViewModel
+        ///</Summary>
+        public StuffViewModel Stuff
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<StuffViewModel>();
+            }
+        }
         ///<Summary>
         /// Cleanup
         ///</Summary>