From 46c21ce3f418a01b00253df8c27e488841333e85 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Sun, 24 Dec 2023 11:25:27 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=B3=A1=E5=89=8D=E5=BA=93?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=A4=9A=E4=B8=AA=E5=9E=8B=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Model_New/BaseMaterialInfo.cs             |   6 +
 .../Aucma.Core.BoxFoam.csproj.user            |   6 +
 Aucma.Core.BoxFoam/Models/SpaceInfoModel.cs   |   7 +-
 .../ViewModels/BeforeFoamingPageModelView.cs  |  33 +-
 .../ViewModels/SelectTypeViewModel.cs         | 297 ++++++++++++++++++
 .../Views/UserPage/BeforeFoamingPageView.xaml |  39 ++-
 .../Views/UserPage/SelectType.xaml            | 133 ++++++++
 .../Views/UserPage/SelectType.xaml.cs         |  42 +++
 8 files changed, 552 insertions(+), 11 deletions(-)
 create mode 100644 Aucma.Core.BoxFoam/ViewModels/SelectTypeViewModel.cs
 create mode 100644 Aucma.Core.BoxFoam/Views/UserPage/SelectType.xaml
 create mode 100644 Aucma.Core.BoxFoam/Views/UserPage/SelectType.xaml.cs

diff --git a/Admin.Core.Model/Model_New/BaseMaterialInfo.cs b/Admin.Core.Model/Model_New/BaseMaterialInfo.cs
index 133873ee..db5eefd4 100644
--- a/Admin.Core.Model/Model_New/BaseMaterialInfo.cs
+++ b/Admin.Core.Model/Model_New/BaseMaterialInfo.cs
@@ -31,6 +31,12 @@ namespace Admin.Core.Model
         [SugarColumn(ColumnName = "MATERIAL_NAME")]
         public string MaterialName { get; set; }
 
+        /// <summary>
+        /// 物料小类
+        /// </summary>
+        [SugarColumn(ColumnName = "MATERIAL_SUBCLASS")]
+        public string MaterialSubclass { get; set; }
+
         /// <summary>
         /// 入库方向-A/B
         /// </summary>
diff --git a/Aucma.Core.BoxFoam/Aucma.Core.BoxFoam.csproj.user b/Aucma.Core.BoxFoam/Aucma.Core.BoxFoam.csproj.user
index 3c3d823c..e3ec02f0 100644
--- a/Aucma.Core.BoxFoam/Aucma.Core.BoxFoam.csproj.user
+++ b/Aucma.Core.BoxFoam/Aucma.Core.BoxFoam.csproj.user
@@ -37,6 +37,9 @@
     <Compile Update="Views\UserPage\LinerInventory.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Update="Views\UserPage\SelectType.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Update="Views\UserPage\ShellInventory.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -93,6 +96,9 @@
     <Page Update="Views\UserPage\LinerInventory.xaml">
       <SubType>Designer</SubType>
     </Page>
+    <Page Update="Views\UserPage\SelectType.xaml">
+      <SubType>Designer</SubType>
+    </Page>
     <Page Update="Views\UserPage\ShellInventory.xaml">
       <SubType>Designer</SubType>
     </Page>
diff --git a/Aucma.Core.BoxFoam/Models/SpaceInfoModel.cs b/Aucma.Core.BoxFoam/Models/SpaceInfoModel.cs
index b8ad5c14..c959cffc 100644
--- a/Aucma.Core.BoxFoam/Models/SpaceInfoModel.cs
+++ b/Aucma.Core.BoxFoam/Models/SpaceInfoModel.cs
@@ -37,7 +37,10 @@ namespace Aucma.Core.BoxFoam.Models
         /// 物料型号
         /// </summary>
         public string materialType { get; set; }
-
+        /// <summary>
+        /// 物料型号B
+        /// </summary>
+        public string typeCodeB { get; set; }
         /// <summary>
         /// 入库状态
         /// </summary>
@@ -66,5 +69,7 @@ namespace Aucma.Core.BoxFoam.Models
         /// 禁用
         /// </summary>
         public string? setEnable { get; set; }
+
+
     }
 }
diff --git a/Aucma.Core.BoxFoam/ViewModels/BeforeFoamingPageModelView.cs b/Aucma.Core.BoxFoam/ViewModels/BeforeFoamingPageModelView.cs
index c3b49231..f2472ad6 100644
--- a/Aucma.Core.BoxFoam/ViewModels/BeforeFoamingPageModelView.cs
+++ b/Aucma.Core.BoxFoam/ViewModels/BeforeFoamingPageModelView.cs
@@ -28,17 +28,45 @@ namespace Aucma.Core.BoxFoam.ViewModels
 
 
         public BeforeFoamingPageModelView() {
+
+            // 设置型号
+            SubmitCommand = new RelayCommand<string>(obj => SubmitCommandExecute(obj));
+            SubmitCommand2 = new RelayCommand<string>(obj => SubmitCommandExecute2(obj));
             _baseSpaceDetailServices = App.ServiceProvider.GetService<IBaseSpaceDetailServices>();
             _baseSpaceInfoServices = App.ServiceProvider.GetService<IBaseSpaceInfoServices>();
-
+            SelectTypeViewModel.RefreshPageEvent += LoadSpaceStoreMedthAsync;
             this.LoadSpaceStoreMedthAsync();
         }
+        #region 参数定义
+        /// <summary>
+        /// 设置型号
+        /// </summary>
+        public RelayCommand<string> SubmitCommand { get; set; }
+
+        private void SubmitCommandExecute(string spaceCode)
+        {
+            
+            SelectType type = new SelectType(1, spaceCode);
+            type.ShowDialog();
+
+        }
+
+        public RelayCommand<string> SubmitCommand2 { get; set; }
+
+        private void SubmitCommandExecute2(string spaceCode)
+        {
+
+            SelectType type = new SelectType(2, spaceCode);
+            type.ShowDialog();
+
+        }
+        #endregion
 
         #region 加载泡前库货道信息
         /// <summary>
         /// 加载泡前库货道信息
         /// </summary>
-        private  void LoadSpaceStoreMedthAsync()
+        private void LoadSpaceStoreMedthAsync()
         {
             string storeCode = Appsettings.app("StoreInfo", "BeforeStoreCode");//泡前库code
 
@@ -54,6 +82,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
                 model.onTheWay = item.OnRouteAmount;
                 model.totalAmount = item.SpaceStock + item.OnRouteAmount;
                 model.materialType = item.MaterialType;
+                model.typeCodeB = item.typeCodeB;
                 model.unusualFlag = item.UnusualFlag == 2 ? "Red" : "White";
                 if (item.SpaceStatus == 2)
                 {
diff --git a/Aucma.Core.BoxFoam/ViewModels/SelectTypeViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/SelectTypeViewModel.cs
new file mode 100644
index 00000000..a222db3b
--- /dev/null
+++ b/Aucma.Core.BoxFoam/ViewModels/SelectTypeViewModel.cs
@@ -0,0 +1,297 @@
+using Admin.Core.Common;
+using Admin.Core.IService;
+using Admin.Core.Model;
+using Admin.Core.Service;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using log4net;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.IdentityModel.Logging;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace Aucma.Core.BoxFoam.ViewModels
+{
+    public class SelectTypeViewModel : ObservableObject
+    {
+
+        /// <summary>
+        /// 委托，关闭窗口
+        /// </summary>
+        /// <param name="message"></param>
+        public delegate void close();
+        public event close closeEvent;
+
+        /// <summary>
+        /// 刷新泡后库页面
+        /// </summary>
+        /// <param name="message"></param>
+        public delegate void RefreshPage();
+        public static event RefreshPage RefreshPageEvent;
+
+
+        public RelayCommand QueryCommand { get; set; }
+        public RelayCommand deleteCommand { get; set; }
+        public RelayCommand SaveCommand { get; set; }
+        private string storeCode = Appsettings.app("StoreInfo", "BeforeStoreCode");//泡前库code
+
+        private static readonly log4net.ILog logHelper = LogManager.GetLogger(typeof(BaseSpaceInfoServices));
+
+
+        private readonly IBaseMaterialInfoServices? _baseMaterialInfoServices;
+
+        private readonly IBaseSpaceInfoServices _baseSpaceInfoServices;
+
+        public RelayCommand<object> MouseClickCommand { get; set; }
+
+        private string spaceCodes = string.Empty;
+
+        public SelectTypeViewModel()
+        {
+
+        }
+        public SelectTypeViewModel(int ncount, string spaceCode)
+        {
+            _baseSpaceInfoServices = App.ServiceProvider.GetService<IBaseSpaceInfoServices>();
+            _baseMaterialInfoServices = App.ServiceProvider.GetService<IBaseMaterialInfoServices>();
+            QueryCommand = new RelayCommand(searchData);
+            SaveCommand = new RelayCommand(updateDirection);
+            deleteCommand = new RelayCommand(deleteModel);
+            spaceCodes = spaceCode;
+            MouseClickCommand = new RelayCommand<object>(MouseClick);
+            materialDataGrid = new ObservableCollection<BaseMaterialInfo>();
+            Console.WriteLine(spaceCode);
+            Load();
+            if (ncount == 1)
+            {
+                IsSelectedOptionA = true;
+            }
+            else if (ncount == 2)
+            {
+                IsSelectedOptionB = true;
+            }
+            else if (ncount == 3)
+            {
+                IsSelectedOptionC = true;
+            }
+        }
+        public async void Load()
+        {
+            var infos = await _baseMaterialInfoServices.QueryAsync(x=>x.MaterialSubclass=="200");
+            MaterialDataGrid.Clear();
+            Application.Current.Dispatcher.Invoke(() =>
+            {
+                foreach (BaseMaterialInfo info in infos)
+                {
+                    MaterialDataGrid.Add(info);
+                }
+            });
+        }
+
+        private ObservableCollection<BaseMaterialInfo> materialDataGrid;
+
+        public ObservableCollection<BaseMaterialInfo> MaterialDataGrid
+        {
+            get { return materialDataGrid; }
+            set => SetProperty(ref materialDataGrid, value);
+        }
+
+        private BaseMaterialInfo selectedDataItem;
+        public BaseMaterialInfo SelectedDataItem
+        {
+            get { return selectedDataItem; }
+            set => SetProperty(ref selectedDataItem, value);
+           
+        }
+
+        public void MouseClick(object obj)
+        {
+            var info = SelectedDataItem as BaseMaterialInfo;
+            if (info != null)
+            {
+                PlanInfo = info;
+                // SelectTypeWindow window = new SelectTypeWindow(spaceCodes, SelectedDataItem);
+                // window.ShowDialog();
+
+            }
+        }
+
+
+        private BaseMaterialInfo planInfo = new BaseMaterialInfo();
+        public BaseMaterialInfo PlanInfo
+        {
+            get { return planInfo; }
+            set => SetProperty(ref planInfo, value);
+        }
+        private string searchText;
+        public string SearchText
+        {
+            get { return searchText; }
+            set => SetProperty(ref searchText, value);
+        }
+
+
+        #region 单选框
+        private bool _isSelectedOptionA;
+        public bool IsSelectedOptionA
+        {
+            get { return _isSelectedOptionA; }
+            set
+            {
+                if (_isSelectedOptionA != value)
+                {
+                    _isSelectedOptionA = value;
+                    OnPropertyChanged(nameof(IsSelectedOptionA));
+                    // 如果选择了A选项，将BC选项设为false
+                    if (_isSelectedOptionA)
+                    {
+                        IsSelectedOptionB = false;
+                        IsSelectedOptionC = false;
+                    }
+                }
+            }
+        }
+
+        private bool _isSelectedOptionB;
+        public bool IsSelectedOptionB
+        {
+            get { return _isSelectedOptionB; }
+            set
+            {
+                if (_isSelectedOptionB != value)
+                {
+                    _isSelectedOptionB = value;
+                    OnPropertyChanged(nameof(IsSelectedOptionB));
+
+                    // 如果选择了B选项，将A选项设为false
+                    if (_isSelectedOptionB)
+                    {
+                        IsSelectedOptionA = false;
+                        IsSelectedOptionC = false;
+                    }
+                }
+            }
+        }
+
+        private bool _isSelectedOptionC;
+        public bool IsSelectedOptionC
+        {
+            get { return _isSelectedOptionC; }
+            set
+            {
+                if (_isSelectedOptionC != value)
+                {
+                    _isSelectedOptionC = value;
+                    OnPropertyChanged(nameof(IsSelectedOptionC));
+                    if (_isSelectedOptionC)
+                    {
+                        IsSelectedOptionA = false;
+                        IsSelectedOptionB = false;
+                    }
+                }
+            }
+        }
+        #endregion
+        private async void deleteModel()
+        {
+            if (!IsSelectedOptionA && !IsSelectedOptionB && !IsSelectedOptionC)
+            {
+                MessageBox.Show("请至少选择一个型号！");
+                return;
+            }
+            // 查询货道信息
+            BaseSpaceInfo space = await _baseSpaceInfoServices.GetSpaceInfoBySpaceCode(storeCode, spaceCodes);
+            if (IsSelectedOptionA)
+            {
+                space.MaterialType = null;
+                space.typeNameA = null;
+            }
+            else if (IsSelectedOptionB)
+            {
+                space.typeCodeB = null;
+                space.typeNameB = null;
+            }
+            else if (IsSelectedOptionC)
+            {
+                space.typeCodeC = null;
+                space.typeNameC = null;
+            }
+            bool result = await _baseSpaceInfoServices.UpdateSpaceInfo(space);
+            if (result)
+            {
+                MessageBox.Show("清除型号成功!");
+            }
+            //关闭窗口
+            closeEvent?.Invoke();
+            //刷新界面
+            RefreshPageEvent?.Invoke();
+        }
+        /// <summary>
+        /// 设置型号
+        /// </summary>
+        private async void updateDirection()
+        {
+
+            if (!IsSelectedOptionA && !IsSelectedOptionB && !IsSelectedOptionC)
+            {
+                MessageBox.Show("请至少选择一个型号！");
+                return;
+            }
+            // 查询货道信息
+            BaseSpaceInfo space =await  _baseSpaceInfoServices.GetSpaceInfoBySpaceCode(storeCode, spaceCodes);
+            if (IsSelectedOptionA)
+            {
+                space.MaterialType = PlanInfo.MaterialCode;
+                space.typeNameA = PlanInfo.MaterialName;
+            }
+            else if (IsSelectedOptionB)
+            {
+                space.typeCodeB = PlanInfo.MaterialCode;
+                space.typeNameB = PlanInfo.MaterialName;
+            }
+            else if (IsSelectedOptionC)
+            {
+                space.typeCodeC = PlanInfo.MaterialCode;
+                space.typeNameC = PlanInfo.MaterialName;
+            }
+            bool result = await _baseSpaceInfoServices.UpdateSpaceInfo(space);
+            if (result)
+            {
+                MessageBox.Show("型号设置成功");
+            }
+
+            //关闭窗口
+            closeEvent?.Invoke();
+            //刷新界面
+            RefreshPageEvent?.Invoke();
+        }
+
+        ///<summary>
+        ///条件查询型号
+        /// </summary>
+        private async void searchData()
+        {
+            if (!string.IsNullOrEmpty(searchText))
+            {
+                var infos =await  _baseMaterialInfoServices.QueryAsync(x=>x.MaterialSubclass=="200" && (x.MaterialName.Contains(searchText) || x.MaterialCode.Contains(searchText)));
+                MaterialDataGrid.Clear();
+                Application.Current.Dispatcher.Invoke(() =>
+                {
+                    foreach (BaseMaterialInfo info in infos)
+                    {
+                        MaterialDataGrid.Add(info);
+                    }
+                });
+            }
+            else
+            {
+                Load();
+            }
+        }
+    }
+}
diff --git a/Aucma.Core.BoxFoam/Views/UserPage/BeforeFoamingPageView.xaml b/Aucma.Core.BoxFoam/Views/UserPage/BeforeFoamingPageView.xaml
index e5e17a80..04a5d322 100644
--- a/Aucma.Core.BoxFoam/Views/UserPage/BeforeFoamingPageView.xaml
+++ b/Aucma.Core.BoxFoam/Views/UserPage/BeforeFoamingPageView.xaml
@@ -105,9 +105,9 @@
                                                     <Border Margin="5,5" Background="#0288d1" BorderBrush="White" BorderThickness="2" >
                                                         <Grid Margin="3,3">
                                                             <Grid.RowDefinitions>
-                                                                <RowDefinition/>
-                                                                <RowDefinition/>
-                                                                <RowDefinition/>
+                                                                <RowDefinition Height="*"/>
+                                                                <RowDefinition Height="2*"/>
+                                                                <RowDefinition Height="*"/>
                                                             </Grid.RowDefinitions>
                                                             <Border Grid.Row="0">
                                                                 <Grid>
@@ -121,7 +121,7 @@
                                                                         <ColumnDefinition/>
                                                                     </Grid.ColumnDefinitions>
                                                                     <Border Grid.Column="0" BorderBrush="White" BorderThickness="1">
-                                                                        <TextBlock Text="{Binding spaceCode}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                                                                        <TextBlock x:Name="spaceCodeText" Text="{Binding spaceCode}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                                                                     </Border>
                                                                     <Border Grid.Column="1" BorderBrush="White" BorderThickness="1">
                                                                         <TextBlock Text="在库" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
@@ -145,16 +145,39 @@
                                                             </Border>
                                                             <Border Grid.Row="1">
                                                                 <Grid>
+                                                                    <Grid.RowDefinitions>
+                                                                        <RowDefinition/>
+                                                                        <RowDefinition/>
+                                                                      
+                                                                    </Grid.RowDefinitions>
                                                                     <Grid.ColumnDefinitions>
                                                                         <ColumnDefinition Width="1.5*"/>
                                                                         <ColumnDefinition Width="6*"/>
                                                                     </Grid.ColumnDefinitions>
-                                                                    <Border Grid.Column="0" BorderBrush="White" BorderThickness="1">
-                                                                        <TextBlock Text="型号" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                                                                    <Border Grid.Column="0" Grid.Row="0" BorderBrush="White" BorderThickness="1" >
+                                                                        <TextBlock Text="型号1" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                                                                     </Border>
-                                                                    <Border Grid.Column="1" BorderBrush="White" BorderThickness="1">
-                                                                        <TextBlock Text="{Binding materialType}" FontSize="16" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                                                                    <Border Grid.Column="1" Grid.Row="0" BorderBrush="White" BorderThickness="1">
+                                                                        <Button Command="{Binding DataContext.SubmitCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding Text, ElementName=spaceCodeText}" Background="Transparent">
+                                                                            <TextBlock Text="{Binding materialType}" FontSize="16" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"  />
+                                                                        </Button>
+                                                                    </Border>
+                                                                    <Border Grid.Column="0" Grid.Row="1" BorderBrush="White" BorderThickness="1"  >
+                                                                        <TextBlock Text="型号2" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                                                                     </Border>
+                                                                    <Border Grid.Column="1" Grid.Row="1" BorderBrush="White" BorderThickness="1">
+                                                                        <Button Command="{Binding DataContext.SubmitCommand2, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding Text, ElementName=spaceCodeText}" Background="Transparent">
+                                                                            <TextBlock Text="{Binding typeCodeB}" FontSize="16" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                                                                        </Button>
+                                                                    </Border>
+                                                                    <!--<Border Grid.Column="0" Grid.Row="2" BorderBrush="White" BorderThickness="1"  >
+                                                                        <TextBlock Text="型号3" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                                                                    </Border>
+                                                                    <Border Grid.Column="1" Grid.Row="2" BorderBrush="White" BorderThickness="1">
+                                                                        <Button Command="{Binding DataContext.SubmitCommand3, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding Text, ElementName=spaceCodeText}" Background="Transparent">
+                                                                            <TextBlock Text="{Binding typeCodeC}" FontSize="16" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                                                                        </Button>
+                                                                    </Border>-->
                                                                 </Grid>
                                                             </Border>
 
diff --git a/Aucma.Core.BoxFoam/Views/UserPage/SelectType.xaml b/Aucma.Core.BoxFoam/Views/UserPage/SelectType.xaml
new file mode 100644
index 00000000..89db9af3
--- /dev/null
+++ b/Aucma.Core.BoxFoam/Views/UserPage/SelectType.xaml
@@ -0,0 +1,133 @@
+<Window x:Class="Aucma.Core.BoxFoam.Views.UserPage.SelectType"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d"  FontFamily="Microsoft YaHei" 
+         Name="window" Background="#1254AB" d:DesignHeight="800" d:DesignWidth="1200">
+    <Window.Resources>
+        <Style TargetType="{x:Type Slider}">
+            <Style.Resources>
+                <!-- 重写重复触发按钮的样式 -->
+                <Style x:Key="RepeatButtonStyle" TargetType="{x:Type RepeatButton}">
+                    <Setter Property="Focusable" Value="false" />
+                    <Setter Property="IsTabStop" Value="false" />
+                    <Setter Property="Padding" Value="0" />
+                    <Setter Property="Width" Value="30" />
+                </Style>
+            </Style.Resources>
+            <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
+            <Setter Property="SmallChange" Value="1" />
+        </Style>
+    </Window.Resources>
+
+    <Border Margin="5" Background="#1254AB" CornerRadius="1">
+        <Border.Effect>
+            <DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>
+        </Border.Effect>
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="10*"/>
+            </Grid.RowDefinitions>
+            <StackPanel Grid.Row="0" Orientation="Horizontal" Grid.Column="0">
+                <TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding SearchText}" Foreground="White" VerticalAlignment="Center" FontSize="18"/>
+                <Button Content="查    询" Command="{Binding QueryCommand}" Background="#007DFA" BorderBrush="#007DFA"  VerticalAlignment="Center" Foreground="White" Height="30"  Width="100" Margin="0 0 50 0"/>
+                <Button Content="清除型号" Command="{Binding deleteCommand}" Background="#FF9900"  Foreground="white" BorderBrush="#FF9900"   VerticalAlignment="Center"  Height="30"  Width="100" />
+            </StackPanel>
+            <!--计划列表-->
+            <Border Grid.Row="1" Grid.Column="0" BorderBrush="#1254AB" Background="Transparent" BorderThickness="0" CornerRadius="5" Margin="1,1,5,5" >
+                <DataGrid  ItemsSource="{Binding MaterialDataGrid}" Background="Transparent"  
+                      FontSize="18" ColumnHeaderHeight="35" 
+                      RowHeight="40" AutoGenerateColumns="False" RowHeaderWidth="0" 
+                      GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
+                      ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
+                      Foreground="#FFFFFF" SelectedItem="{Binding SelectedDataItem}" SelectionChanged="DataGrid_SelectionChanged">
+                    <!--resourceStyle 399行修改选中字体颜色-->
+                    <DataGrid.Columns>
+                        <DataGridTextColumn Binding="{Binding MaterialCode}" Header="产品编码" Width="1*" IsReadOnly="True"/>
+                        <DataGridTextColumn Binding="{Binding MaterialName}" Header="产品名称" Width="2.5*" IsReadOnly="True"/>
+                    </DataGrid.Columns>
+                </DataGrid>
+
+            </Border>
+
+
+            <Border  Grid.Row="1" Grid.Column="1" BorderBrush="#1254AB" BorderThickness="3" CornerRadius="5" Background="Transparent" Margin="5,5">
+                <Border.Effect>
+                    <DropShadowEffect Color="#1254AB" Direction="270" BlurRadius="10" ShadowDepth="5" Opacity="0.5"/>
+                </Border.Effect>
+
+                <Grid>
+                    <Grid.RowDefinitions>
+
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
+
+                    </Grid.RowDefinitions>
+
+                    <StackPanel Grid.Row="0" Orientation="Horizontal"  VerticalAlignment="Center" Margin="50,0,0,0">
+                        <TextBlock Text="产品编码:" FontSize="20" Foreground="#FFFFFF" Margin="10,0,0,0"/>
+                        <TextBox x:Name="MaterialCode" FontSize="20" Text="{Binding PlanInfo.MaterialCode}" Foreground="#FFFFFF" Width="260" IsReadOnly="True" Margin="5,0,10,0"/>
+                    </StackPanel>
+                    <StackPanel Grid.Row="1" Orientation="Horizontal"  VerticalAlignment="Center" Margin="50,0,0,0">
+                        <TextBlock Text="产品型号:" FontSize="20" Foreground="#FFFFFF" Margin="10,0,0,0"/>
+                        <TextBox x:Name="MaterialName" FontSize="20" Text="{Binding PlanInfo.MaterialName}"  Foreground="#FFFFFF" Width="350" IsReadOnly="True" Margin="5,0,10,0"/>
+                    </StackPanel>
+                    <StackPanel Grid.Row="2" Orientation="Horizontal" VerticalAlignment="Center" Margin="60,0,0,0" >
+                        <!--单选框样式-->
+                        <StackPanel.Resources>
+                            <Style TargetType="RadioButton">
+                                <Setter Property="Foreground" Value="White"/>
+                                <Setter Property="FontSize" Value="20"/>
+                                <Setter Property="Background" Value="White"/>
+                                <Setter Property="Template">
+                                    <Setter.Value>
+                                        <ControlTemplate TargetType="RadioButton">
+                                            <BulletDecorator Background="Transparent">
+                                                <BulletDecorator.Bullet>
+                                                    <Grid Width="20" Height="20">
+                                                        <Ellipse x:Name="BulletRadio" Fill="{TemplateBinding Background}" Stroke="{TemplateBinding BorderBrush}" StrokeThickness="1"/>
+                                                    </Grid>
+                                                </BulletDecorator.Bullet>
+                                                <ContentPresenter Margin="4,0,0,0" VerticalAlignment="Center" RecognizesAccessKey="True"/>
+                                            </BulletDecorator>
+                                            <ControlTemplate.Triggers>
+                                                <Trigger Property="IsChecked" Value="True">
+                                                    <Setter TargetName="BulletRadio" Property="Fill" Value="Green"/>
+                                                </Trigger>
+                                            </ControlTemplate.Triggers>
+                                        </ControlTemplate>
+                                    </Setter.Value>
+                                </Setter>
+                                <Style.Triggers>
+                                    <Trigger Property="IsChecked" Value="True">
+                                        <Setter Property="Background" Value="Green"/>
+                                    </Trigger>
+                                </Style.Triggers>
+                            </Style>
+                        </StackPanel.Resources>
+
+                        <TextBlock Text="选择型号:  " FontSize="20" Foreground="#FFFFFF" />
+                        <RadioButton Content="型号1" GroupName="Direction" IsChecked="{Binding IsSelectedOptionA, Mode=TwoWay}" />
+                        <RadioButton Content="型号2" GroupName="Direction" IsChecked="{Binding IsSelectedOptionB, Mode=TwoWay}" Margin="10 0 0 0"/>
+                        <!--<RadioButton Content="型号3" GroupName="Direction" IsChecked="{Binding IsSelectedOptionC, Mode=TwoWay}" Margin="10 0 0 0"/>-->
+                    </StackPanel>
+
+                    <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
+                        <Button Content="保  存" FontSize="20" Command="{Binding SaveCommand}" Background="#FF36B5C1" BorderBrush="#FF36B5C1" Foreground="white" Margin="0,0,10,0"  Height="50" Width="100" />
+
+                    </StackPanel>
+                </Grid>
+            </Border>
+
+        </Grid>
+    </Border>
+
+</Window>
diff --git a/Aucma.Core.BoxFoam/Views/UserPage/SelectType.xaml.cs b/Aucma.Core.BoxFoam/Views/UserPage/SelectType.xaml.cs
new file mode 100644
index 00000000..9907ff9d
--- /dev/null
+++ b/Aucma.Core.BoxFoam/Views/UserPage/SelectType.xaml.cs
@@ -0,0 +1,42 @@
+using Aucma.Core.BoxFoam.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace Aucma.Core.BoxFoam.Views.UserPage
+{
+    /// <summary>
+    /// SelectType.xaml 的交互逻辑
+    /// </summary>
+    public partial class SelectType : Window
+    {
+        private SelectTypeViewModel viewModel = null;
+        public SelectType(int ncount, string spaceCode)
+        {
+            InitializeComponent();
+            viewModel = new SelectTypeViewModel(ncount, spaceCode);
+            this.DataContext = viewModel;
+            viewModel.closeEvent += closeWindow;
+        }
+
+        private void DataGrid_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            viewModel.MouseClick(sender);
+        }
+
+        private void closeWindow()
+        {
+            this.Close();
+        }
+    }
+}