maqiao
/
HKC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改多批次加药页面及多批次药品绑定页面

This commit is contained in:
maqiao 2024-11-14 14:01:06 +08:00
parent e14bb8f767
commit 619794a192
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DM_Weight/App.config
View File

@ -105,7 +105,7 @@
<add key="MultiOrder" value="1"/> <add key="MultiOrder" value="1"/>
<!-- 多批次抽屉加药 0:不启用 1：启用 <!-- 多批次抽屉加药 0:不启用 1：启用
启用channel_list记录库位信息 --> 启用channel_list记录库位信息 -->
<add key="MultiBatch" value="0"/> <add key="MultiBatch" value="1"/>
<!--海康威视IP--> <!--海康威视IP-->
<add key="HIKIP" value="192.168.1.15"/> <add key="HIKIP" value="192.168.1.15"/>

2
DM_Weight/Port/PortUtil.cs
View File

@ -68,7 +68,7 @@ namespace DM_Weight.Port
// 取药操作的窗口名【处方取药、抽屉取药、自选取药、调拨出库】 // 取药操作的窗口名【处方取药、抽屉取药、自选取药、调拨出库】
private string[] TakeNames = new string[] { "DrawerTakeDrugWindow", "OrderTakeDrugWindow", "SelfTakeDrugWindow", "InvoiceTakeDrugWindow" }; 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" }; private string[] CheckNames = new string[] { "CheckStockWindow" };
// 归还空瓶操作的窗口名【盘点】 // 归还空瓶操作的窗口名【盘点】

2
DM_Weight/ViewModels/AddDrugControlViewModel.cs
View File

@ -190,7 +190,7 @@ namespace DM_Weight.ViewModels
//List<ChannelStock> singleChannels = ChannelStocks.FindAll(it => it.BoardType != 1); //List<ChannelStock> singleChannels = ChannelStocks.FindAll(it => it.BoardType != 1);
List<ChannelList> singleChannels = ChannelLsts.FindAll(it => it.BoardType != 1); List<ChannelList> singleChannels = ChannelLsts.FindAll(it => it.BoardType != 1);
_portUtil.WindowName = "DrawerAddDrugWindow"; _portUtil.WindowName = "AddDrugControl";
_portUtil.Operate = true; _portUtil.Operate = true;
_portUtil.BoardType = singleChannels.Count > 0 ? singleChannels[0].BoardType : 1; _portUtil.BoardType = singleChannels.Count > 0 ? singleChannels[0].BoardType : 1;
_portUtil.ColNos = singleChannels.Select(it => it.ColNo).ToArray(); _portUtil.ColNos = singleChannels.Select(it => it.ColNo).ToArray();

3
DM_Weight/ViewModels/BindingChannelNewDialogViewModel.cs
View File

@ -184,7 +184,7 @@ namespace DM_Weight.ViewModels
} }
} }
private int _pageSize = 8; private int _pageSize = 9;
public int PageSize public int PageSize
{ {
get => _pageSize; get => _pageSize;
@ -413,6 +413,7 @@ namespace DM_Weight.ViewModels
item.Drug = null; item.Drug = null;
item.DrugSpec = null; item.DrugSpec = null;
SqlSugarHelper.Db.Updateable(item).UpdateColumns(it => new { it.DrugId,it.DrugSpec }).ExecuteCommand(); 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) if (item.BoardType == 5)
{ {
// 清除显示屏库位信息 // 清除显示屏库位信息

3
DM_Weight/Views/Dialog/BindingChannelNewDialog.xaml
View File

@ -100,7 +100,7 @@
Margin="12 0 12 0"> Margin="12 0 12 0">
<ItemsControl.ItemsPanel> <ItemsControl.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<UniformGrid Columns="4" /> <UniformGrid Columns="3" />
</ItemsPanelTemplate> </ItemsPanelTemplate>
</ItemsControl.ItemsPanel> </ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
@ -146,6 +146,7 @@
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition /> <ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.Resources> <Grid.Resources>
<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource MaterialDesignSubtitle1TextBlock}"> <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource MaterialDesignSubtitle1TextBlock}">