From 619794a1921bfcb3cac8efda4307003471ed86ad Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Thu, 14 Nov 2024 14:01:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=9A=E6=89=B9=E6=AC=A1?=
 =?UTF-8?q?=E5=8A=A0=E8=8D=AF=E9=A1=B5=E9=9D=A2=E5=8F=8A=E5=A4=9A=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=E8=8D=AF=E5=93=81=E7=BB=91=E5=AE=9A=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/App.config                                     | 2 +-
 DM_Weight/Port/PortUtil.cs                               | 2 +-
 DM_Weight/ViewModels/AddDrugControlViewModel.cs          | 2 +-
 DM_Weight/ViewModels/BindingChannelNewDialogViewModel.cs | 3 ++-
 DM_Weight/Views/Dialog/BindingChannelNewDialog.xaml      | 3 ++-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index 4493cbd..e8b74b7 100644
--- a/DM_Weight/App.config
+++ b/DM_Weight/App.config
@@ -105,7 +105,7 @@
 		<add  key="MultiOrder" value="1"/>
 		<!-- 多批次抽屉加药 0:不启用 1：启用
 		     启用channel_list记录库位信息 -->
-		<add  key="MultiBatch" value="0"/>
+		<add  key="MultiBatch" value="1"/>
 
 		<!--海康威视IP-->
 		<add key="HIKIP" value="192.168.1.15"/>
diff --git a/DM_Weight/Port/PortUtil.cs b/DM_Weight/Port/PortUtil.cs
index b9a68b3..4777f23 100644
--- a/DM_Weight/Port/PortUtil.cs
+++ b/DM_Weight/Port/PortUtil.cs
@@ -68,7 +68,7 @@ namespace DM_Weight.Port
         // 取药操作的窗口名【处方取药、抽屉取药、自选取药、调拨出库】
         private string[] TakeNames = new string[] { "DrawerTakeDrugWindow", "OrderTakeDrugWindow", "SelfTakeDrugWindow", "InvoiceTakeDrugWindow" };
         // 加药操作的窗口名【自选加药、抽屉加药、还药】
-        private string[] AddNames = new string[] { "SelfAddWindow", "ReturnDrugWindow", "ReturnDrug1Window", "DrawerAddDrugWindow" };
+        private string[] AddNames = new string[] { "SelfAddWindow", "ReturnDrugWindow", "ReturnDrug1Window", "DrawerAddDrugWindow", "AddDrugControl" };
         // 盘点操作的窗口名【盘点】
         private string[] CheckNames = new string[] { "CheckStockWindow" };
         // 归还空瓶操作的窗口名【盘点】
diff --git a/DM_Weight/ViewModels/AddDrugControlViewModel.cs b/DM_Weight/ViewModels/AddDrugControlViewModel.cs
index 4511402..b37816d 100644
--- a/DM_Weight/ViewModels/AddDrugControlViewModel.cs
+++ b/DM_Weight/ViewModels/AddDrugControlViewModel.cs
@@ -190,7 +190,7 @@ namespace DM_Weight.ViewModels
                     //List<ChannelStock> singleChannels = ChannelStocks.FindAll(it => it.BoardType != 1);
                     List<ChannelList> singleChannels = ChannelLsts.FindAll(it => it.BoardType != 1);
 
-                    _portUtil.WindowName = "DrawerAddDrugWindow";
+                    _portUtil.WindowName = "AddDrugControl";
                     _portUtil.Operate = true;
                     _portUtil.BoardType = singleChannels.Count > 0 ? singleChannels[0].BoardType : 1;
                     _portUtil.ColNos = singleChannels.Select(it => it.ColNo).ToArray();
diff --git a/DM_Weight/ViewModels/BindingChannelNewDialogViewModel.cs b/DM_Weight/ViewModels/BindingChannelNewDialogViewModel.cs
index 9849ac1..e76156d 100644
--- a/DM_Weight/ViewModels/BindingChannelNewDialogViewModel.cs
+++ b/DM_Weight/ViewModels/BindingChannelNewDialogViewModel.cs
@@ -184,7 +184,7 @@ namespace DM_Weight.ViewModels
             }
         }
 
-        private int _pageSize = 8;
+        private int _pageSize = 9;
         public int PageSize
         {
             get => _pageSize;
@@ -413,6 +413,7 @@ namespace DM_Weight.ViewModels
                         item.Drug = null;
                         item.DrugSpec = null;
                         SqlSugarHelper.Db.Updateable(item).UpdateColumns(it => new { it.DrugId,it.DrugSpec }).ExecuteCommand();
+                        SqlSugarHelper.Db.Updateable<ChannelStock>().SetColumns(it => new ChannelStock { DrugId = null, ManuNo = null, EffDate = null }).Where(it => it.Chnguid == item.Id).ExecuteCommand();
                         if (item.BoardType == 5)
                         {
                             // 清除显示屏库位信息
diff --git a/DM_Weight/Views/Dialog/BindingChannelNewDialog.xaml b/DM_Weight/Views/Dialog/BindingChannelNewDialog.xaml
index e68c16c..6801679 100644
--- a/DM_Weight/Views/Dialog/BindingChannelNewDialog.xaml
+++ b/DM_Weight/Views/Dialog/BindingChannelNewDialog.xaml
@@ -100,7 +100,7 @@
                 Margin="12 0 12 0">
             <ItemsControl.ItemsPanel>
                 <ItemsPanelTemplate>
-                    <UniformGrid Columns="4" />
+                    <UniformGrid Columns="3" />
                 </ItemsPanelTemplate>
             </ItemsControl.ItemsPanel>
             <ItemsControl.ItemTemplate>
@@ -146,6 +146,7 @@
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="Auto" />
                                     <ColumnDefinition />
+                                    <ColumnDefinition />
                                 </Grid.ColumnDefinitions>
                                 <Grid.Resources>
                                     <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource MaterialDesignSubtitle1TextBlock}">