更新master

DM_Weight/App.config

@@ -3,7 +3,7 @@
   <connectionStrings>
 	<!-- 数据库连接字符串 -->
 	<!--<add name="database" connectionString="server=127.0.0.1;database=wpf_dm_program;userid=root;password=qq1223" />-->
-	<add name="database" connectionString="server=127.0.0.1;port=3306;database=xiangtan_mazuike_xx;userid=root;password=root" />
+	<add name="database" connectionString="server=127.0.0.1;port=3306;database=xiangtan_mazuike_xx;userid=root;password=qq1223" />
   </connectionStrings>
 	<!--<runtime>
 		--><!--配置之后，Appdomain.CurrentDomain.UnhandledException 事件的 IsTerminating 就变成了 false 啦！也就是说，程序并不会因为这次的异常而崩溃退出。--><!--

DM_Weight/DM_Weight.csproj

@@ -27,15 +27,6 @@
 	</ItemGroup>
 
   <ItemGroup>
-    <COMReference Include="zkemkeeper">
-      <WrapperTool>tlbimp</WrapperTool>
-      <VersionMinor>0</VersionMinor>
-      <VersionMajor>1</VersionMajor>
-      <Guid>fe9ded34-e159-408e-8490-b720a5e632c7</Guid>
-      <Lcid>0</Lcid>
-      <Isolated>false</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
     <COMReference Include="gregn6Lib">
       <WrapperTool>tlbimp</WrapperTool>
       <VersionMinor>0</VersionMinor>
@@ -45,6 +36,15 @@
       <Isolated>false</Isolated>
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </COMReference>
+    <COMReference Include="zkemkeeper">
+      <WrapperTool>tlbimp</WrapperTool>
+      <VersionMinor>0</VersionMinor>
+      <VersionMajor>1</VersionMajor>
+      <Guid>fe9ded34-e159-408e-8490-b720a5e632c7</Guid>
+      <Lcid>0</Lcid>
+      <Isolated>false</Isolated>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </COMReference>
   </ItemGroup>
 
   <ItemGroup>
@@ -132,7 +132,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\DM_Weight.Commons\DM_Weight.Commons.csproj" />
+    <Reference Include="Interop.zkemkeeper">
+      <HintPath>bin\Debug\net6.0-windows\Interop.zkemkeeper.dll</HintPath>
+    </Reference>
   </ItemGroup>
 
 </Project>

DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs

@@ -215,11 +215,11 @@ namespace DM_Weight.ViewModels
             }
             var f = SqlSugarHelper.Db.UseTran(() =>
             {
-                string chnguid = SqlSugarHelper.Db.Queryable<ChannelList>().Where(cs => cs.MachineId == ConfigurationManager.AppSettings["machineId"].ToString() && cs.DrawerNo == DrawerNo).Select(cs => cs.Id).First();
+                string chnguid = SqlSugarHelper.Db.Queryable<ChannelList>().Where(cs => cs.MachineId == ConfigurationManager.AppSettings["machineId"].ToString() && cs.DrawerNo == DrawerNo+1).Select(cs => cs.Id).First();
                 SqlSugarHelper.Db.Insertable(new ChannelStock()
                 {
                     Chnguid = chnguid,
-                    DrawerNo = DrawerNo,
+                    DrawerNo = DrawerNo+1,
                     DrugId = DrugInfo.DrugId.ToString(),
                     BaseQuantity = baseQuantity,
                     Id = Guid.NewGuid().ToString(),
@@ -231,7 +231,7 @@ namespace DM_Weight.ViewModels
                 SqlSugarHelper.Db.Insertable(new MachineRecord()
                 {
                     MachineId = "DM5",
-                    DrawerNo = DrawerNo,
+                    DrawerNo = DrawerNo + 1,
                     DrugId = DrugInfo.DrugId.ToString(),
                     Operator = HomeWindowViewModel.Operator?.Id,
                     OperationTime = DateTime.Now,
@@ -291,7 +291,7 @@ namespace DM_Weight.ViewModels
                     SqlSugarHelper.Db.Insertable(new MachineRecord()
                     {
                         MachineId = "DM5",
-                        DrawerNo = DrawerNo,
+                        DrawerNo = DrawerNo + 1,
                         DrugId = Channel.DrugId.ToString(),
                         Operator = HomeWindowViewModel.Operator?.Id,
                         OperationTime = DateTime.Now,
@@ -312,7 +312,7 @@ namespace DM_Weight.ViewModels
                         SqlSugarHelper.Db.Insertable(new MachineRecord()
                         {
                             MachineId = "DM5",
-                            DrawerNo = DrawerNo,
+                            DrawerNo = DrawerNo + 1,
                             DrugId = item.DrugId.ToString(),
                             Operator = HomeWindowViewModel.Operator?.Id,
                             OperationTime = DateTime.Now,
@@ -399,7 +399,7 @@ namespace DM_Weight.ViewModels
                     SqlSugarHelper.Db.Insertable(new MachineRecord()
                     {
                         MachineId = "DM5",
-                        DrawerNo = DrawerNo,
+                        DrawerNo = DrawerNo + 1,
                         Operator = HomeWindowViewModel.Operator?.Id,
                         OperationTime = DateTime.Now,
                         Type = 55,

DM_Weight/Views/BindBoxPackageWindow.xaml

@@ -43,7 +43,6 @@
             <ColumnDefinition Width="15*" />
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
-
         <!--<Grid Grid.Row="0" Margin="0 4 0 4" Grid.ColumnSpan="3" >
             <Grid.ColumnDefinitions>
                 <ColumnDefinition />
@@ -142,7 +141,7 @@
         <Grid Grid.Column="1" Margin="6">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
+                <RowDefinition Height="550px" />
             </Grid.RowDefinitions>
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" Grid.ColumnSpan="2">
                 <ComboBox