diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index abc5764..beb969e 100644
--- a/DM_Weight/App.config
+++ b/DM_Weight/App.config
@@ -42,7 +42,7 @@
 		<!-- 无操作退出录像时间，单位秒，为0时不退出录像 -->
 		<add key="stopRecord" value="180"/>
 
-		<add key="gridConnectionString" value="MYSQL; Database=xiangtanTest; Password=root; Port=3306; Server=192.168.50.84; User=root;"/>
+		<add key="gridConnectionString" value="MYSQL; Database=xtTest; Password=qq1223; Port=3306; Server=127.0.0.1; User=root;"/>
 		<!-- 查询处方是orderNo还是orderGroupNo -->
 		<add key="OrderNoName" value="orderNo" />
 		<!-- 后门耗材板地址 没有则填写0-->
diff --git a/DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs b/DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs
index 24618d7..c043393 100644
--- a/DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs
+++ b/DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs
@@ -452,7 +452,7 @@ namespace DM_Weight.ViewModels
                 int baseQty = 0;
                 if (int.TryParse(BaseQuantity, out baseQty))
                 {
-                    logger.Info($"修改药品基数{_ChannelList.BaseQuantity}改为{baseQty}");
+                    logger.Info($"修改药品{DrugInfo.DrugName}基数{_ChannelList.BaseQuantity}改为{baseQty}");
                     if (baseQty > _ChannelList.BaseQuantity)
                     {
                         //基数变大，需要补药
@@ -490,7 +490,7 @@ namespace DM_Weight.ViewModels
                             OperationTime = DateTime.Now,
                             Quantity = _ChannelList.channelStocks[0].NeedNum,
                             Type = 55,
-                            InvoiceId = $"修改药品基数{oldBaseQty}改为{baseQty},Quantity值为需要加药数量",
+                            InvoiceId = $"修改药品{DrugInfo.DrugName}基数{oldBaseQty}改为{baseQty},Quantity值为需要加药数量",
                         }).ExecuteCommand();
                         SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#00e676"));
                         SnackbarMessageQueue.Enqueue("保存修改完成！");
diff --git a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
index 4d776e1..4051b0b 100644
--- a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
+++ b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
@@ -518,7 +518,7 @@ namespace DM_Weight.ViewModels
                        
                         // 获取更新完库存后的药品库存
                         List<ChannelStock> nowChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()
-                            .Where(it => it.MachineId.Equals(cs.MachineId) || it.MachineId.Equals(ConfigurationManager.AppSettings["dm_machineId"]))
+                            .Where(it => it.MachineId.Equals(ConfigurationManager.AppSettings["machineId"]) || it.MachineId.Equals(ConfigurationManager.AppSettings["dm_machineId"]))
                             .Where(it => it.DrugId.Equals(cs.DrugId))
                             .Where(it => it.ManuNo.Equals(cs.ManuNo))
                             .Where(it => it.DrawerType == 1)
diff --git a/DM_Weight/Views/BindBoxPackageWindow.xaml b/DM_Weight/Views/BindBoxPackageWindow.xaml
index 95f648c..894aba9 100644
--- a/DM_Weight/Views/BindBoxPackageWindow.xaml
+++ b/DM_Weight/Views/BindBoxPackageWindow.xaml
@@ -142,7 +142,7 @@
         <Grid Grid.Column="1" Margin="6">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
-                <RowDefinition Height="550" />
+                <RowDefinition />
             </Grid.RowDefinitions>
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" Grid.ColumnSpan="2">
                 <ComboBox
diff --git a/DM_Weight/Views/ExchangeWindow.xaml b/DM_Weight/Views/ExchangeWindow.xaml
index fcd8680..9e219b1 100644
--- a/DM_Weight/Views/ExchangeWindow.xaml
+++ b/DM_Weight/Views/ExchangeWindow.xaml
@@ -100,7 +100,7 @@
         <Grid Grid.Column="1" Margin="6">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
-                <RowDefinition Height="550" />
+                <RowDefinition />
             </Grid.RowDefinitions>
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" Grid.ColumnSpan="2">
                 <Button Margin="6 0 6 6"
diff --git a/DM_Weight/Views/MachineRecordWindow.xaml b/DM_Weight/Views/MachineRecordWindow.xaml
index c0128b3..35f682c 100644
--- a/DM_Weight/Views/MachineRecordWindow.xaml
+++ b/DM_Weight/Views/MachineRecordWindow.xaml
@@ -28,7 +28,7 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
-            <RowDefinition Height="550" />
+            <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <Grid Margin="0 6 0 6" Grid.Row="0">
@@ -93,11 +93,13 @@
                 </GridView>
             </ListView.View>
         </ListView>
-        <pagination:Pagination Grid.Row="2"
+        <DockPanel Grid.Row="2">
+            <pagination:Pagination 
                                    CurrentPage="{Binding PageNum}"
                                    PageSize="{Binding PageSize}"
                                    TotalPages="{Binding TotalCount}"
                                    InfoTextIsEnabel="True"
                                 />
+        </DockPanel>
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/DM_Weight/Views/WSDRecordWindow.xaml b/DM_Weight/Views/WSDRecordWindow.xaml
index 54e5aab..39efac6 100644
--- a/DM_Weight/Views/WSDRecordWindow.xaml
+++ b/DM_Weight/Views/WSDRecordWindow.xaml
@@ -28,7 +28,7 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
-            <RowDefinition Height="550"/>
+            <RowDefinition  Height="Auto" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <Grid Margin="0 6 0 6" Grid.Row="0">