diff --git a/.vs/HighWayIot/FileContentIndex/17c4cbf0-405e-47cd-9c6d-7c09f592e00f.vsidx b/.vs/HighWayIot/FileContentIndex/17c4cbf0-405e-47cd-9c6d-7c09f592e00f.vsidx
deleted file mode 100644
index 16bc7e42..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/17c4cbf0-405e-47cd-9c6d-7c09f592e00f.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/FileContentIndex/3a7d4d14-6f80-4bf9-888d-4da9e3812652.vsidx b/.vs/HighWayIot/FileContentIndex/3a7d4d14-6f80-4bf9-888d-4da9e3812652.vsidx
deleted file mode 100644
index be9add90..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/3a7d4d14-6f80-4bf9-888d-4da9e3812652.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/FileContentIndex/487d5983-1b1e-48e6-9d56-ec079e1c717b.vsidx b/.vs/HighWayIot/FileContentIndex/487d5983-1b1e-48e6-9d56-ec079e1c717b.vsidx
deleted file mode 100644
index 332fe2da..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/487d5983-1b1e-48e6-9d56-ec079e1c717b.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/FileContentIndex/6f4e38f9-264f-4edc-b032-550c2b14fe3e.vsidx b/.vs/HighWayIot/FileContentIndex/6f4e38f9-264f-4edc-b032-550c2b14fe3e.vsidx
new file mode 100644
index 00000000..90c6b3b5
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/6f4e38f9-264f-4edc-b032-550c2b14fe3e.vsidx differ
diff --git a/.vs/HighWayIot/FileContentIndex/8efbf8a6-9f2c-40b7-b820-5a0339d2c254.vsidx b/.vs/HighWayIot/FileContentIndex/8efbf8a6-9f2c-40b7-b820-5a0339d2c254.vsidx
new file mode 100644
index 00000000..62b183c4
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/8efbf8a6-9f2c-40b7-b820-5a0339d2c254.vsidx differ
diff --git a/.vs/HighWayIot/FileContentIndex/8fc155b2-466d-417e-aee1-d1b34c03ea6d.vsidx b/.vs/HighWayIot/FileContentIndex/8fc155b2-466d-417e-aee1-d1b34c03ea6d.vsidx
deleted file mode 100644
index 02206011..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/8fc155b2-466d-417e-aee1-d1b34c03ea6d.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/FileContentIndex/9f8e3afd-e844-4336-9c87-4b482e17940e.vsidx b/.vs/HighWayIot/FileContentIndex/9f8e3afd-e844-4336-9c87-4b482e17940e.vsidx
new file mode 100644
index 00000000..35d8f0e2
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/9f8e3afd-e844-4336-9c87-4b482e17940e.vsidx differ
diff --git a/.vs/HighWayIot/FileContentIndex/f6212b58-736f-47c6-aec0-cbf8afd61f9d.vsidx b/.vs/HighWayIot/FileContentIndex/f6212b58-736f-47c6-aec0-cbf8afd61f9d.vsidx
new file mode 100644
index 00000000..29e6a4a8
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/f6212b58-736f-47c6-aec0-cbf8afd61f9d.vsidx differ
diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo
index 2943e142..36ba4f74 100644
Binary files a/.vs/HighWayIot/v17/.suo and b/.vs/HighWayIot/v17/.suo differ
diff --git a/Aucma.Scada.Business/AssemblyPlanBusiness.cs b/Aucma.Scada.Business/AssemblyPlanBusiness.cs
index 9cd96bb9..d6936e7c 100644
--- a/Aucma.Scada.Business/AssemblyPlanBusiness.cs
+++ b/Aucma.Scada.Business/AssemblyPlanBusiness.cs
@@ -73,12 +73,20 @@ namespace Aucma.Scada.Business
         /// </summary>
         /// <param name="productLineCode"></param>
         /// <returns></returns>
-        public List<ProductPlanInfo> GetProductPlanInfosByProductLineCode()
+        public List<ProductPlanInfo> GetProductPlanInfosByProductLineCode(string orderCode)
         {
             List<ProductPlanInfo> productPlanInfos = null;
             try
             {
                 productPlanInfos = _productPlanInfoService.GetProductPlanInfosByProductLineCode(appConfig.stationCode);
+
+                if(productPlanInfos.Count>0 )
+                {
+                    if(!string.IsNullOrEmpty(orderCode))
+                    {
+                        productPlanInfos = productPlanInfos.Where(x=>x.orderCode.Contains(orderCode)).ToList();
+                    }
+                }
             }
             catch (Exception ex)
             {
diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll
index add4d681..c1b87831 100644
Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll differ
diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb
index 3d3ef6a5..4e912974 100644
Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb differ
diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache
index 1493e5a1..92548a06 100644
Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache differ
diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll
index add4d681..c1b87831 100644
Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll differ
diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb
index 3d3ef6a5..4e912974 100644
Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb differ
diff --git a/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache
index d63f4912..cb2b0a34 100644
Binary files a/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache and b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache differ
diff --git a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache
index 75f86db8..63ddfe65 100644
Binary files a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache and b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache differ
diff --git a/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml b/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml
index ba4a166a..72d6523a 100644
--- a/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml
+++ b/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml
@@ -22,12 +22,12 @@
                     <TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding Search}" Foreground="Gray" VerticalAlignment="Center" FontSize="15"/>
                     <!--resourceStyle 413行修改边框颜色-->
 
-                    <TextBlock Text="产品型号" VerticalAlignment="Center" Foreground="Gray" FontSize="15" Margin="20,0,0,0"/>
+                    <!--<TextBlock Text="产品型号" VerticalAlignment="Center" Foreground="Gray" FontSize="15" Margin="20,0,0,0"/>
                     <ComboBox Text="{Binding MaterialTypeCombox}" Width="150" Height="25" Margin="10 0 0 0"  Foreground="Black" VerticalAlignment="Center" FontSize="15">
                         <ComboBoxItem Content="所有" IsSelected="True"/>
                         <ComboBoxItem Content="SC232" />
                         <ComboBoxItem Content="SC485" />
-                    </ComboBox>
+                    </ComboBox>-->
 
                     <Button Content="查询" Command="{Binding QueryCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30"  Width="80" />
                     <Button Content="重置" Command="{Binding ResetCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" Width="80" />
diff --git a/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml b/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml
index 045250c4..1914fbc0 100644
--- a/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml
+++ b/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml
@@ -140,11 +140,11 @@
                 <Border Grid.Row="0" BorderBrush="CadetBlue" BorderThickness="0,0,0,1">
                     <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20,0,0,0">
                         <TextBlock Text="物料条码" VerticalAlignment="Center" Foreground="Gray" FontSize="15"/>
-                        <TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding Search}" Foreground="Gray" VerticalAlignment="Center" FontSize="15"/>
+                        <TextBox Width="150" Height="25" Margin="10 0 0 0" Text="{Binding Search}" Foreground="Gray" VerticalAlignment="Center" FontSize="15"/>
                         <!--resourceStyle 413行修改边框颜色-->
 
-                        <TextBlock Text="物料类型" VerticalAlignment="Center" Foreground="Gray" FontSize="15" Margin="20,0,0,0"/>
-                        <ComboBox Text="{Binding MaterialTypeCombox}" Width="200" Height="25" Margin="10 0 0 0"  Foreground="Black" VerticalAlignment="Center" FontSize="15">
+                        <TextBlock Text="仓库类型" VerticalAlignment="Center" Foreground="Gray" FontSize="15" Margin="20,0,0,0"/>
+                        <ComboBox Text="{Binding MaterialTypeCombox}" Width="100" Height="25" Margin="10 0 0 0"  Foreground="Black" VerticalAlignment="Center" FontSize="15">
                             <ComboBoxItem Content="所有" IsSelected="True"/>
                             <ComboBoxItem Content="箱壳" />
                             <ComboBoxItem Content="内胆" />
diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll
index add4d681..c1b87831 100644
Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll differ
diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb
index 3d3ef6a5..4e912974 100644
Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb differ
diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe
index 86714b7e..ab20a553 100644
Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe differ
diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb
index ba0d7037..36cc7654 100644
Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb differ
diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache
index 2faa3f90..fbde9f1b 100644
Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache differ
diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe
index 86714b7e..ab20a553 100644
Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe differ
diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.g.resources b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.g.resources
index 0866c954..503b64d3 100644
Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.g.resources and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.g.resources differ
diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb
index ba0d7037..36cc7654 100644
Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb differ
diff --git a/Aucma.Scada.UI/obj/Debug/MainWindow.baml b/Aucma.Scada.UI/obj/Debug/MainWindow.baml
index 22b1e4a3..87646e25 100644
Binary files a/Aucma.Scada.UI/obj/Debug/MainWindow.baml and b/Aucma.Scada.UI/obj/Debug/MainWindow.baml differ
diff --git a/Aucma.Scada.UI/obj/Debug/MainWindow.g.cs b/Aucma.Scada.UI/obj/Debug/MainWindow.g.cs
index 77014b5f..1951b60e 100644
--- a/Aucma.Scada.UI/obj/Debug/MainWindow.g.cs
+++ b/Aucma.Scada.UI/obj/Debug/MainWindow.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "761197E72019FA48DD888520668F10CC0A0310CFF8A6F9336B14C0A351ACC259"
+#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "638A8878353241AB42E35E5685925D9F0CFF05E8C4379C5912D6CA9388326C41"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -81,14 +81,6 @@ namespace Aucma.Scada.UI {
         #line hidden
         
         
-        #line 82 "..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button logInfo;
-        
-        #line default
-        #line hidden
-        
-        
         #line 85 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button Minimized;
@@ -150,12 +142,9 @@ namespace Aucma.Scada.UI {
             this.assemblyPlan = ((System.Windows.Controls.Button)(target));
             return;
             case 6:
-            this.logInfo = ((System.Windows.Controls.Button)(target));
-            return;
-            case 7:
             this.Minimized = ((System.Windows.Controls.Button)(target));
             return;
-            case 8:
+            case 7:
             this.Exit = ((System.Windows.Controls.Button)(target));
             return;
             }
diff --git a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.baml b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.baml
index 9a701d1b..034ceb40 100644
Binary files a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.baml and b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.baml differ
diff --git a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.g.cs b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.g.cs
index 7efed3dd..80f36fee 100644
--- a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.g.cs
+++ b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E14629875FB628F7D746EDF2F700170786DE8BBCE34B9BA27F9EDF260682AFAA"
+#pragma checksum "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6870CE886CE3FFE090DC2219378B52EBB4CA146E642D78853D79C3946079A5B2"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
diff --git a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.g.i.cs b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.g.i.cs
index 7efed3dd..80f36fee 100644
--- a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.g.i.cs
+++ b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E14629875FB628F7D746EDF2F700170786DE8BBCE34B9BA27F9EDF260682AFAA"
+#pragma checksum "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6870CE886CE3FFE090DC2219378B52EBB4CA146E642D78853D79C3946079A5B2"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
diff --git a/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.baml b/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.baml
index a926cf8a..794ea365 100644
Binary files a/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.baml and b/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.baml differ
diff --git a/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.cs b/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.cs
index 6411d54b..78e6e3f0 100644
--- a/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.cs
+++ b/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A05E59C5C19F8D68AD26227566090DA3164C037974EBC97A5B9A5093BEF8411F"
+#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C8ECCDA975C8C8811A376621E5A0A06C8522C6E28CCAE7D4A3032F92EEAA8235"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
diff --git a/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.i.cs b/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.i.cs
index 6411d54b..78e6e3f0 100644
--- a/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.i.cs
+++ b/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A05E59C5C19F8D68AD26227566090DA3164C037974EBC97A5B9A5093BEF8411F"
+#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C8ECCDA975C8C8811A376621E5A0A06C8522C6E28CCAE7D4A3032F92EEAA8235"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
diff --git a/Aucma.Scada.UI/viewModel/AssemblyPlan/PlanInfoEditViewModel.cs b/Aucma.Scada.UI/viewModel/AssemblyPlan/PlanInfoEditViewModel.cs
index 37c8fa5d..e23c7b8c 100644
--- a/Aucma.Scada.UI/viewModel/AssemblyPlan/PlanInfoEditViewModel.cs
+++ b/Aucma.Scada.UI/viewModel/AssemblyPlan/PlanInfoEditViewModel.cs
@@ -2,8 +2,13 @@
 using Aucma.Scada.Model.domain;
 using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
+using HighWayIot.Config;
+using SqlSugar;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Runtime.CompilerServices;
 using System.Windows;
+using System.Windows.Documents;
 
 namespace Aucma.Scada.UI.viewModel.AssemblyPlan
 {
@@ -16,10 +21,37 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
             PlanInfoTransmitCommand = new RelayCommand(PlanInfoTransmit);
             MouseClickCommand = new RelayCommand<object>(MouseClick);
             CloseWindowCommand = new RelayCommand<object>(t => CloseWindow(t));
+            QueryCommand = new RelayCommand(Query);
+            ResetCommand = new RelayCommand(Reset);
             Query();
         }
 
         #region 参数定义
+
+        private string _search = string.Empty;
+        public string Search
+        {
+            get { return _search; }
+            set { _search = value; RaisePropertyChanged(nameof(Search)); }
+        }
+
+        /// <summary>
+        /// 下拉框
+        /// </summary>
+        public string _materialTypeCombox;
+        public string MaterialTypeCombox
+        {
+            get { return _materialTypeCombox; }
+            set
+            {
+                if (_materialTypeCombox != value)
+                {
+                    _materialTypeCombox = value;
+                    RaisePropertyChanged(() => MaterialTypeCombox);
+                }
+            }
+        }
+
         /// <summary>
         /// 生产计划编号
         /// </summary>
@@ -84,6 +116,10 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
         public RelayCommand<object> MouseClickCommand { get; set; }
 
         public RelayCommand<object> CloseWindowCommand { get; set; }
+
+        public RelayCommand QueryCommand { get; set; }
+
+        public RelayCommand ResetCommand { get; set; }
         #endregion
 
 
@@ -93,19 +129,30 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
         public void Query()
         {
 
-            var models = assemblyPlanBusiness.GetProductPlanInfosByProductLineCode();
+            List<ProductPlanInfo> planInfos = assemblyPlanBusiness.GetProductPlanInfosByProductLineCode(_search);
 
             PlanInfoDataGrid = new ObservableCollection<ProductPlanInfo>();
-            if (models != null)
+            if (planInfos != null)
             {
-                models.ForEach(
+                planInfos.ForEach(
                 arg =>
                 {
                     PlanInfoDataGrid.Add(arg);
+
                 });
             }
         }
 
+        /// <summary>
+        /// 重置
+        /// </summary>
+        public void Reset()
+        {
+            Search = string.Empty;
+            MaterialTypeCombox = string.Empty;
+            this.Query();
+        }
+
         private void PlanInfoTransmit()
         {
             bool result = assemblyPlanBusiness.PlanTransmitByProductPlan(_ProductPlanCode, _TransmitAmount);
diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache
index 3d734225..d80d9ce2 100644
Binary files a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache and b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache
index 73f015ca..abd82577 100644
Binary files a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache and b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache
index f481fc12..ba1a49f9 100644
Binary files a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache and b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache
index ea6828b3..d2a1b77a 100644
Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache
index 0911ee0a..a257223f 100644
Binary files a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache and b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache
index 596fa0f7..edf0435c 100644
Binary files a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache and b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache differ