From cec943d5005a7ec89eae631bd9026e56be728921 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Tue, 22 Apr 2025 17:32:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=97=B6channel=5Flist?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=ADcol=5Fno=E7=94=B1=E8=8E=B7=E5=8F=96=E6=80=BB?=
 =?UTF-8?q?=E8=A1=8C=E6=95=B0=E6=94=B9=E4=B8=BA=E8=8E=B7=E5=8F=96=E6=9C=80?=
 =?UTF-8?q?=E5=A4=A7=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BindBoxPackageWindowViewModel.cs          |   2 +-
 DM_Weight/Views/CheckOrderNewWindow.xaml      |   4 +-
 DM_Weight/Views/CheckSelfOrderWindow.xaml     |   4 +-
 DM_Weight/Views/CheckStockWindow.xaml         | 251 ++++++++++++++++++
 DM_Weight/Views/CheckStockWindow.xaml.cs      |  28 ++
 5 files changed, 284 insertions(+), 5 deletions(-)
 create mode 100644 DM_Weight/Views/CheckStockWindow.xaml
 create mode 100644 DM_Weight/Views/CheckStockWindow.xaml.cs

diff --git a/DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs b/DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs
index 6ffc0b5..0f06551 100644
--- a/DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs
+++ b/DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs
@@ -282,7 +282,7 @@ namespace DM_Weight.ViewModels
 
                 int colNoCount = SqlSugarHelper.Db.Queryable<ChannelList>()
                         .Where(cs => cs.MachineId == ConfigurationManager.AppSettings["machineId"].ToString() && cs.DrawerNo == DrawerNo + 1)
-                        .Count();
+                        .Max(cs=>cs.ColNo);
                 string chnguid = $"DM5_{(DrawerNo + 1)}_{(colNoCount+1)}_{DrugInfo.DrugId}";
                 SqlSugarHelper.Db.Insertable(new ChannelList()
                 {
diff --git a/DM_Weight/Views/CheckOrderNewWindow.xaml b/DM_Weight/Views/CheckOrderNewWindow.xaml
index b71b40b..3fb27ab 100644
--- a/DM_Weight/Views/CheckOrderNewWindow.xaml
+++ b/DM_Weight/Views/CheckOrderNewWindow.xaml
@@ -111,9 +111,9 @@
             </Grid.RowDefinitions>
             <Grid Margin="0 6 0 6" Grid.Row="0" Grid.ColumnSpan="3">
                 <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="3*" />
+                    <ColumnDefinition Width="4*" />
                     <ColumnDefinition Width="2*" />
-                    <ColumnDefinition Width="8*" />
-                    <ColumnDefinition Width="5*" />
                 </Grid.ColumnDefinitions>
                 <DatePicker
                 Grid.Column="0"
diff --git a/DM_Weight/Views/CheckSelfOrderWindow.xaml b/DM_Weight/Views/CheckSelfOrderWindow.xaml
index 346365f..ab1f998 100644
--- a/DM_Weight/Views/CheckSelfOrderWindow.xaml
+++ b/DM_Weight/Views/CheckSelfOrderWindow.xaml
@@ -110,9 +110,9 @@
             </Grid.RowDefinitions>
             <Grid Margin="0 6 0 6" Grid.Row="0" Grid.ColumnSpan="2">
                 <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="3*" />
+                    <ColumnDefinition Width="4*" />
                     <ColumnDefinition Width="2*" />
-                    <ColumnDefinition Width="8*" />
-                    <ColumnDefinition Width="5*" />
                 </Grid.ColumnDefinitions>
                 <DatePicker
                 Grid.Column="0"
diff --git a/DM_Weight/Views/CheckStockWindow.xaml b/DM_Weight/Views/CheckStockWindow.xaml
new file mode 100644
index 0000000..93f8835
--- /dev/null
+++ b/DM_Weight/Views/CheckStockWindow.xaml
@@ -0,0 +1,251 @@
+<UserControl x:Class="DM_Weight.Views.CheckStockWindow"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:DM_Weight.Views"
+             xmlns:pagination="clr-namespace:DM_Weight.Components.pagination"  
+             xmlns:prism="http://prismlibrary.com/"
+             prism:ViewModelLocator.AutoWireViewModel="True"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:convert="clr-namespace:DM_Weight.Converter"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+             mc:Ignorable="d">
+    <UserControl.Resources>
+        <convert:DrawerSelectConverter x:Key="DrawerSelectConverter" />
+        <convert:StatusConverter x:Key="StatusConverter" />
+        <!--<convert:InputQuantityConverter x:Key="InputQuantityConverter" />
+        <convert:QuantityCountConverter x:Key="QuantityCountConverter"/>-->
+        <Style x:Key="st" TargetType="GridViewColumnHeader">
+            <Style.Setters>
+                <Setter Property="Height">
+                    <Setter.Value>55</Setter.Value>
+                </Setter>
+                <Setter Property="Background">
+                    <Setter.Value>#31ccec</Setter.Value>
+                </Setter>
+                <Setter Property="Foreground">
+                    <Setter.Value>white</Setter.Value>
+                </Setter>
+            </Style.Setters>
+        </Style>
+    </UserControl.Resources>
+
+    <Grid>
+        <!--<Grid.RowDefinitions>
+            -->
+        <!--<RowDefinition/>-->
+        <!--
+            <RowDefinition/>
+        </Grid.RowDefinitions>-->
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="15*" />
+            <ColumnDefinition />
+        </Grid.ColumnDefinitions>
+
+        <!--<Grid Grid.Row="0" Margin="0 4 0 4" Grid.ColumnSpan="3" >
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <StackPanel HorizontalAlignment="Right" Grid.Column="2" Orientation="Horizontal">
+                <Button
+                        Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                        ToolTip="绑定库位"
+                        Content="绑定套餐"
+                        Command="{Binding BindingDrug}"/>
+                <Button
+                        Margin="6 0 6 0"
+                        Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                        ToolTip="解除绑定"
+                        Content="解绑"
+                        Command="{Binding RemoveBinding}" />
+                <Button
+                        Margin="0 0 6 0"
+                        Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                        ToolTip="刷新"
+                        Command="{Binding Query}"
+                        Content="{materialDesign:PackIcon Refresh}"/>
+            </StackPanel>
+        </Grid>-->
+        <Grid Margin="6" Grid.Column="0" >
+            <Grid.Resources>
+                <Style TargetType="{x:Type Button}" BasedOn="{StaticResource MaterialDesignPaperLightButton}">
+                    <Setter Property="Foreground" Value="#00a0ea" />
+                    <Setter Property="BorderBrush" Value="#00a0ea" />
+                    <Style.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="#d1e7f5" />
+                            <Setter Property="BorderBrush" Value="#d1e7f5" />
+                        </Trigger>
+                        <DataTrigger Value="True">
+                            <DataTrigger.Binding>
+                                <MultiBinding Converter="{StaticResource DrawerSelectConverter}">
+                                    <Binding RelativeSource="{ RelativeSource Mode=Self }" Path="Content" />
+                                    <Binding Path="DrawerNo" />
+                                </MultiBinding>
+                            </DataTrigger.Binding>
+                            <Setter Property="Background" Value="#d1e7f5" />
+                            <Setter Property="BorderBrush" Value="#d1e7f5" />
+                        </DataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </Grid.Resources>
+            <!--<Grid.RowDefinitions>
+                <RowDefinition />
+            </Grid.RowDefinitions>-->
+
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <!--<RowDefinition />-->
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+
+                <Button Margin="0 0  3 0" Grid.Row="0" Grid.Column="0" Width="120" Content="一号手术间" Command="{Binding UpdateDrawerNo}" CommandParameter="0" />
+                <Button Margin="0 0  3 0" Grid.Row="1" Grid.Column="0" Width="120" Content="二号手术间" Command="{Binding UpdateDrawerNo}" CommandParameter="1" />
+                <Button Margin="0 0  3 0" Grid.Row="2" Grid.Column="0" Width="120" Content="三号手术间" Command="{Binding UpdateDrawerNo}" CommandParameter="2" />
+                <Button Margin="0 0  3 0" Grid.Row="3" Grid.Column="0" Width="120" Content="四号手术间" Command="{Binding UpdateDrawerNo}" CommandParameter="3" />
+                <Button Margin="0 0  3 0" Grid.Row="4" Grid.Column="0" Width="120" Content="五号手术间" Command="{Binding UpdateDrawerNo}" CommandParameter="4" />
+                <Button Margin="0 0  3 0" Grid.Row="5" Grid.Column="0" Width="120" Content="六号手术间" Command="{Binding UpdateDrawerNo}" CommandParameter="5" />
+                <Button Margin="0 0  3 0" Grid.Row="6" Grid.Column="0" Width="120" Content="七号手术间" Command="{Binding UpdateDrawerNo}" CommandParameter="6" />
+                <Button Margin="0 0  3 0" Grid.Row="7" Grid.Column="0" Width="120" Content="八号手术间" Command="{Binding UpdateDrawerNo}" CommandParameter="7" />
+
+                <Button Margin="0 0  3 0" Grid.Row="8" Grid.Column="0" Width="120" Content="九号手术间" Command="{Binding UpdateDrawerNo}" CommandParameter="8" />
+                <Button Margin="0 0  3 0" Grid.Row="0" Grid.Column="1" Width="120" Content="十号手术间" Command="{Binding UpdateDrawerNo}" CommandParameter="9" />
+                <Button Margin="0 0  3 0" Grid.Row="1" Grid.Column="1" Width="120" Content="十一号手术间" Command="{Binding UpdateDrawerNo}" CommandParameter="10" />
+                <Button Margin="0 0  3 0" Grid.Row="2" Grid.Column="1" Width="120" Content="十二号手术间" Command="{Binding UpdateDrawerNo}" CommandParameter="11" />
+                <Button Margin="0 0  3 0" Grid.Row="3" Grid.Column="1" Width="120" Content="十三号手术间" Command="{Binding UpdateDrawerNo}" CommandParameter="12" />
+                <Button Margin="0 0  3 0" Grid.Row="4" Grid.Column="1" Width="120" Content="十四号手术间" Command="{Binding UpdateDrawerNo}" CommandParameter="13" />
+                <Button Margin="0 0  3 0" Grid.Row="5" Grid.Column="1" Width="120" Content="十五号手术间" Command="{Binding UpdateDrawerNo}" CommandParameter="14" />
+                <Button Margin="0 0  3 0" Grid.Row="6" Grid.Column="1" Width="120" Content="十六号手术间" Command="{Binding UpdateDrawerNo}" CommandParameter="15" />
+                <Button Margin="0 0  3 0" Grid.Row="7" Grid.Column="1" Width="120" Content="十七号手术间" Command="{Binding UpdateDrawerNo}" CommandParameter="16" />
+                <Button Margin="0 0  3 0" Grid.Row="8" Grid.Column="1" Width="120" Content="十八号手术间" Command="{Binding UpdateDrawerNo}" CommandParameter="17" />
+                <!--<Button Grid.Row="8" Grid.Column="1" Width="120" Content="19号药箱" Command="{Binding UpdateDrawerNo}" CommandParameter="19" />
+                <Button Grid.Row="9" Grid.Column="1" Width="120" Content="20号药箱" Command="{Binding UpdateDrawerNo}" CommandParameter="20" />-->
+
+            </Grid>
+        </Grid>
+        <Grid Grid.Column="1" Margin="6">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" Grid.ColumnSpan="2">
+                <ComboBox
+                    Margin="0 0 6 0"
+                    Grid.Column="0"
+                    materialDesign:HintAssist.Hint="药品名称/拼音码"
+                    IsEditable="True"
+                    ItemsSource="{Binding DrugInfos}"
+                    SelectedItem="{Binding DrugInfo}"
+                    DisplayMemberPath="drug_name_spec" IsEnabled="True" IsTextSearchEnabled="False" 
+                />
+                <TextBox
+                Grid.Column="1"
+                Text="{Binding BaseQuantity}"
+                materialDesign:HintAssist.Hint="基数"
+                Margin="16 0 32 6" Width="100"
+                Style="{StaticResource MaterialDesignTextBoxBase}"/>
+                <Button
+                        Margin="6 0 6 6"
+                        Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                        ToolTip="绑定库位"
+                        Content="绑定"
+                        Command="{Binding BindingDrug}"/>
+                <Button
+                        Margin="6 0 6 6"
+                        Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                        ToolTip="解绑"
+                        Content="解绑"
+                        Command="{Binding RemoveBinding}" />
+                <!--<Button
+                        Margin="6 0 6 6"
+                        ToolTip="打开药箱"
+                        Content="打开全部药箱"
+                        IsEnabled="{Binding IsEnable}"
+                        Command="{Binding OpenBox}" 
+                        materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                        materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                        Style="{StaticResource MaterialDesignOutlinedLightButton}" />-->
+                <Button Margin="6 0 6 6"
+                        Content="保存修改"
+                        Command="{Binding SaveCommand}" 
+                        Style="{StaticResource MaterialDesignOutlinedLightButton}" />
+                <Button
+                        Margin="0 0 6 6"
+                        Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                        ToolTip="刷新"
+                        Command="{Binding Query}"
+                        Content="{materialDesign:PackIcon Refresh}"/>
+            </StackPanel>
+            <ListView  Grid.ColumnSpan="2"
+                Padding="0 6 0 0" Grid.Row="1"
+                ItemsSource="{Binding _ChannelLists, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"                
+                SelectedItem="{Binding _ChannelList}"
+                materialDesign:ListViewAssist.HeaderRowBackground="#31ccec"
+                materialDesign:DataGridAssist.ColumnHeaderPadding="10"
+                materialDesign:ListViewAssist.ListViewItemPadding="13">
+                <ListView.Resources>
+                    <Style TargetType="{x:Type GridViewColumnHeader}" BasedOn="{StaticResource {x:Type GridViewColumnHeader}}">
+                        <Setter Property="Foreground" Value="White" />
+                    </Style>
+                </ListView.Resources>
+                <ListView.View>
+                    <GridView  ColumnHeaderContainerStyle="{StaticResource st}">
+                        <GridViewColumn Width="180"
+                        DisplayMemberBinding="{Binding Drug.DrugName}"
+                        Header="药品名称"/>
+                        <GridViewColumn Width="150"
+                        DisplayMemberBinding="{Binding Drug.Manufactory}"
+                        Header="厂家"/>
+                        <GridViewColumn Width="100"
+                        DisplayMemberBinding="{Binding Drug.DrugSpec}"
+                        Header="规格"/>
+                        <GridViewColumn Width="50"
+                        DisplayMemberBinding="{Binding BaseQuantity}"
+                        Header="基数"/>
+                        <GridViewColumn Header="批次">
+                            <GridViewColumn.CellTemplate>
+                                <DataTemplate>
+                                    <ListBox Width="130" ItemsSource="{Binding channelStocks}" DisplayMemberPath="ManuNo" materialDesign:ListBoxItemAssist.ShowSelection="False"></ListBox>
+                                </DataTemplate>
+                            </GridViewColumn.CellTemplate>
+                        </GridViewColumn>
+                        <GridViewColumn Header="库存" Width="50">
+                            <GridViewColumn.CellTemplate>
+                                <DataTemplate>
+                                    <ListBox ItemsSource="{Binding channelStocks}" DisplayMemberPath="Quantity" materialDesign:ListBoxItemAssist.ShowSelection="False"></ListBox>
+                                </DataTemplate>
+                            </GridViewColumn.CellTemplate>
+                        </GridViewColumn>
+                        <!--<GridViewColumn Header="效期" Width="100">
+                            <GridViewColumn.CellTemplate>
+                                <DataTemplate>
+                                    <ListBox ItemsSource="{Binding channelStocks}" DisplayMemberPath="EffDate" materialDesign:ListBoxItemAssist.ShowSelection="False"></ListBox>
+                                </DataTemplate>
+                            </GridViewColumn.CellTemplate>
+                        </GridViewColumn>-->
+
+                    </GridView>
+                </ListView.View>
+            </ListView>
+            <materialDesign:Snackbar
+                Background="{Binding SnackbarBackground}"
+                MessageQueue="{Binding SnackbarMessageQueue}"/>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/DM_Weight/Views/CheckStockWindow.xaml.cs b/DM_Weight/Views/CheckStockWindow.xaml.cs
new file mode 100644
index 0000000..437ab07
--- /dev/null
+++ b/DM_Weight/Views/CheckStockWindow.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace DM_Weight.Views
+{
+    /// <summary>
+    /// CheckStockWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class CheckStockWindow : UserControl
+    {
+        public CheckStockWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}