diff --git a/Admin.Core.Repository/Repository_New/BaseBomInfoRepository.cs b/Admin.Core.Repository/Repository_New/BaseBomInfoRepository.cs
index 390c065f..aeea537c 100644
--- a/Admin.Core.Repository/Repository_New/BaseBomInfoRepository.cs
+++ b/Admin.Core.Repository/Repository_New/BaseBomInfoRepository.cs
@@ -5,11 +5,11 @@ using Admin.Core.Repository;
 namespace Admin.Core.IRepository
 {
     /// <summary>
-    /// OrderBomInfoRepository
+    /// BaseBomInfoRepository
     /// </summary>	
-    public class OrderBomInfoRepository : BaseRepository<OrderBomInfo>, IOrderBomInfoRepository
+    public class BaseBomInfoRepository : BaseRepository<BaseBomInfo>, IBaseBomInfoRepository
     {
-        public OrderBomInfoRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
+        public BaseBomInfoRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
         {
         }
     }
diff --git a/Admin.Core.Repository/Repository_New/OrderBomInfoRepository.cs b/Admin.Core.Repository/Repository_New/OrderBomInfoRepository.cs
new file mode 100644
index 00000000..64688eb2
--- /dev/null
+++ b/Admin.Core.Repository/Repository_New/OrderBomInfoRepository.cs
@@ -0,0 +1,18 @@
+锘縰sing Admin.Core.IRepository;
+using Admin.Core.Model;
+using Admin.Core.Model.Model_New;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Admin.Core.Repository
+{
+   public class OrderBomInfoRepository : BaseRepository<OrderBomInfo>, IOrderBomInfoRepository
+    {
+        public OrderBomInfoRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
+        {
+        }
+    }
+}
diff --git a/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs b/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs
index 7aecfd8b..d25b3f64 100644
--- a/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs
+++ b/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs
@@ -23,7 +23,7 @@ namespace Admin.Core.Service
         private readonly IPrintOrderInfoRepository _printOrderInfoRepository;
         private readonly IBaseOrderInfoRepository _baseOrderInfoRepository;
         private readonly IOrderBomInfoRepository _orderBomInfoRepository;
-        //private readonly IBaseBomInfoRepository _baseBomInfoRepository;
+
 
         private readonly IBaseRepository<BaseTest> baseRepository;
 
diff --git a/Admin.Core.Tasks/QuartzNet/JobFactory.cs b/Admin.Core.Tasks/QuartzNet/JobFactory.cs
index de8d93ad..787c42dc 100644
--- a/Admin.Core.Tasks/QuartzNet/JobFactory.cs
+++ b/Admin.Core.Tasks/QuartzNet/JobFactory.cs
@@ -2,6 +2,7 @@
 using Quartz;
 using Quartz.Spi;
 using System;
+using System.Threading.Tasks;
 
 namespace Admin.Core.Tasks
 {
diff --git a/Aucma.Core.BoxFoam/Startup.cs b/Aucma.Core.BoxFoam/Startup.cs
index 2522c24d..7d31283f 100644
--- a/Aucma.Core.BoxFoam/Startup.cs
+++ b/Aucma.Core.BoxFoam/Startup.cs
@@ -61,7 +61,7 @@ namespace Aucma.Core.BoxFoam
             AddServices(services);
 
             //任务调度
-            services.AddJobSetup();
+            //services.AddJobSetup();
 
             //支持编码大全 例如:支持 System.Text.Encoding.GetEncoding("GB2312")  System.Text.Encoding.GetEncoding("GB18030") 
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
@@ -83,7 +83,7 @@ namespace Aucma.Core.BoxFoam
         /// </summary>
         /// <param name="app"></param>
         /// <param name="env"></param>
-        public void Configure(IApplicationBuilder app, ISysTasksQzService tasksQzService, ISchedulerCenter schedulerCenter)
+        public void Configure(IApplicationBuilder app)//, ISysTasksQzService tasksQzService, ISchedulerCenter schedulerCenter
         {
             // 使用静态文件
             app.UseStaticFiles();
@@ -91,7 +91,7 @@ namespace Aucma.Core.BoxFoam
             //app.UseAuthorization();
 
             // 开启QuartzNetJob调度服务
-            app.UseQuartzJobMildd(tasksQzService, schedulerCenter);
+            //app.UseQuartzJobMildd(tasksQzService, schedulerCenter);
 
         }
 
diff --git a/Aucma.Core.PrintTo/Views/IndexPage.xaml b/Aucma.Core.PrintTo/Views/IndexPage.xaml
index e139dd83..ad0710c4 100644
--- a/Aucma.Core.PrintTo/Views/IndexPage.xaml
+++ b/Aucma.Core.PrintTo/Views/IndexPage.xaml
@@ -115,7 +115,7 @@
                                 <ColumnDefinition />
                                 <ColumnDefinition Width="Auto" />
                             </Grid.ColumnDefinitions>
-                            <TextBox Grid.RowSpan="2" Height="Auto" Margin="0" Padding="0"  VerticalAlignment="Stretch" 
+                            <TextBox Grid.RowSpan="2" Height="Auto" Margin="0" Padding="0"  VerticalAlignment="Stretch" BorderBrush="White"
                                      VerticalContentAlignment="Center" Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=Value}">
                                 <!-- 缁橳extBox缁戝畾涓婁笅鍛戒护 -->
                                 <TextBox.InputBindings>
@@ -162,7 +162,7 @@
                         <TextBox x:Name="queryParam" Text="" Style="{x:Null}" Width="200" HorizontalAlignment="Left" VerticalContentAlignment="Center" />
                         <Button Content="鏌ヨ" Background="#4285DE" Margin="9,0,4,0" Width="100" Command="{Binding QueryStringCommand}" CommandParameter="{Binding ElementName=queryParam,Path=Text}"/>
                     </WrapPanel>
-                    <UniformGrid Grid.Row="1"  Margin="5 5 0 0" x:Name="HeightPanel">
+                    <UniformGrid Grid.Row="1"  Margin="0 5 0 0" x:Name="HeightPanel">
                         <!-- 
 	                        AlternationCount="2"   琛ㄧず涓よ浜ゆ浛鏄剧ず鑳屾櫙鑹诧紱
 	                        AutoGenerateColumns="False"   琛ㄧず涓嶈DataGrid鑷姩鐢熸垚鍒椼�傚鏋滆缃垚true锛屽垯鏁堟灉锛� 澶氬嚭浜嗕笉闇�瑕佺殑鍒楋紱
@@ -191,7 +191,7 @@
                 </Grid>
             </Border>
         </UniformGrid>
-        <UniformGrid Grid.Column="1" Margin="0 5 3 5">
+        <UniformGrid Grid.Column="1" Margin="0 10 3 5">
             <Border BorderBrush="#0288d1" BorderThickness="1" Margin="0 0 0 5"  CornerRadius="5">
                 <Grid Margin="0 30">
                     <Grid.RowDefinitions>
@@ -205,26 +205,25 @@
 
                     <WrapPanel Grid.Row="0"  HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
                         <TextBlock Text="浜у搧缂栫爜" FontSize="15" Foreground="white" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                        <TextBox  x:Name="ProductNo" Foreground="white" Text="{Binding SelectedItem.ProductCode, ElementName=dgvMH}"  IsReadOnly="True" Margin="15 0 0 0 "   FontSize="15"  VerticalContentAlignment="Center" HorizontalContentAlignment="Left"  Width="400"  
+                        <TextBox  x:Name="ProductNo" Foreground="white" BorderBrush="White" Text="{Binding SelectedItem.ProductCode, ElementName=dgvMH}"  IsReadOnly="True" Margin="15 0 0 0 "   FontSize="15"  VerticalContentAlignment="Center" HorizontalContentAlignment="Left"  Width="400"  
                            materialDesign:HintAssist.Hint="浜у搧缂栫爜"    />
                     </WrapPanel>
 
                     <WrapPanel Grid.Row="1"  HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
                         <TextBlock Text="浜у搧鍚嶇О" FontSize="15" Foreground="white" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                        <TextBox   x:Name="ProductName" Foreground="white" Text="{Binding SelectedItem.ProductName, ElementName=dgvMH}"  IsReadOnly="True" Margin="15 0 0 0"    FontSize="15"  VerticalContentAlignment="Center" HorizontalContentAlignment="Left" Width="{Binding Path=ActualWidth, ElementName=ProductNo}"
+                        <TextBox   x:Name="ProductName" Foreground="white" BorderBrush="White" Text="{Binding SelectedItem.ProductName, ElementName=dgvMH}"  IsReadOnly="True" Margin="15 0 0 0"    FontSize="15"  VerticalContentAlignment="Center" HorizontalContentAlignment="Left" Width="{Binding Path=ActualWidth, ElementName=ProductNo}"
                                    materialDesign:HintAssist.Hint="浜у搧鍚嶇О" />
                     </WrapPanel>
                     <WrapPanel Grid.Row="2"  HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
                         <TextBlock Text="鐗╂枡鍚嶇О" FontSize="15" Foreground="white" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                        <TextBox   x:Name="MaterialName"  Foreground="white" Text="{Binding SelectedItem.MaterialName, ElementName=dgvMH}"  IsReadOnly="True" Margin="15 0 0 0"    FontSize="15"  VerticalContentAlignment="Center" HorizontalContentAlignment="Left" Width="{Binding Path=ActualWidth, ElementName=ProductNo}"
+                        <TextBox   x:Name="MaterialName"  Foreground="white" BorderBrush="White" Text="{Binding SelectedItem.MaterialName, ElementName=dgvMH}"  IsReadOnly="True" Margin="15 0 0 0"    FontSize="15"  VerticalContentAlignment="Center" HorizontalContentAlignment="Left" Width="{Binding Path=ActualWidth, ElementName=ProductNo}"
                                    materialDesign:HintAssist.Hint="鐗╂枡鍚嶇О" />
                     </WrapPanel>
                     <WrapPanel Grid.Row="3"  HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
                         <TextBlock Text="鎵撳嵃鏁伴噺" FontSize="15" Foreground="white" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                        <!--<TextBox   x:Name="PlanAmount" Foreground="white" Text="{Binding SelectedItem.StandardAmount, ElementName=dgvMH}"  Margin="15 0 0 0"   FontSize="15"   VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Width="{Binding Path=ActualWidth, ElementName=ProductNo}"
-                             materialDesign:HintAssist.Hint="鎵撳嵃鏁伴噺"/>-->
-                        <Slider  x:Name="PlanAmount"  Minimum="0" Maximum="500" Value="{Binding SelectedItem.StandardAmount, ElementName=dgvMH}" Foreground="white" Height="30" VerticalContentAlignment="Center"  HorizontalContentAlignment="Left"  VerticalAlignment="Center" HorizontalAlignment="Center"  Margin="15 0 0 0"   FontSize="15"   Width="340"/>
-                        <TextBlock Text="1~500" Width="50" Margin="10 0 0 0" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                        <Slider  x:Name="PlanAmount"  Minimum="0" Maximum="500" BorderBrush="White" Value="{Binding SelectedItem.StandardAmount, ElementName=dgvMH}" Foreground="white" Height="30" VerticalContentAlignment="Center" 
+                                 HorizontalContentAlignment="Left"  VerticalAlignment="Center" HorizontalAlignment="Center"  Margin="15 0 0 0"   FontSize="15"   Width="340"/>
+                        <TextBlock Text="1~500" Width="50" Margin="10 0 0 0"  Foreground="White" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center" />
                     </WrapPanel>
                     <Border Grid.Row="4" BorderBrush="#0288d1" BorderThickness="1"  CornerRadius="5" Margin="100 5" >
                         <StackPanel >
diff --git a/Aucma.Core.PrintTo/Views/PrintToDevView.xaml b/Aucma.Core.PrintTo/Views/PrintToDevView.xaml
index 27a35af9..dd233ff3 100644
--- a/Aucma.Core.PrintTo/Views/PrintToDevView.xaml
+++ b/Aucma.Core.PrintTo/Views/PrintToDevView.xaml
@@ -5,8 +5,8 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Aucma.Core.PrintTo.Views"
         mc:Ignorable="d"
-        Background="#0C4CA3" Name="window"
-        Title="鎵撳嵃" Height="500" Width="500"  WindowStartupLocation="CenterScreen" WindowStyle="None">
+        Background="#0C4CA3" Name="window" 
+        Title="浜岀淮鐮佹墦鍗�" Height="700" Width="700"  WindowStartupLocation="CenterScreen" WindowStyle="None">
 
     <Grid Margin="15">
         <Grid.RowDefinitions>
diff --git a/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.dll b/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.dll
index c3ebe06f..096f68d1 100644
Binary files a/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.dll and b/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.dll differ
diff --git a/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.pdb b/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.pdb
index b983cb51..f395d2e3 100644
Binary files a/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.pdb and b/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.pdb differ