From 2a636e10c2e173d911af72e0d8e853b94b444d98 Mon Sep 17 00:00:00 2001
From: "625215135@qq.com" <625215135@qq.com>
Date: Mon, 13 Nov 2023 14:00:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight.sln                                 |   25 +
 DM_Weight/App.config                          |   62 +
 DM_Weight/App.xaml                            |   19 +
 DM_Weight/App.xaml.cs                         |  252 ++++
 DM_Weight/AssemblyInfo.cs                     |   10 +
 .../Components/pagination/Pagination.xaml     |   43 +
 .../Components/pagination/Pagination.xaml.cs  |  265 ++++
 .../pagination/PaginationViewModel.cs         |   81 +
 DM_Weight/Converter/BoardTypeConverter.cs     |  106 ++
 .../Converter/ChangeShiftsStatusConverter.cs  |   25 +
 DM_Weight/Converter/DrawerSelectConverter.cs  |   26 +
 DM_Weight/Converter/ForeColorConverter.cs     |   31 +
 DM_Weight/Converter/GroupSumConverter.cs      |   40 +
 DM_Weight/Converter/InputQuantityConverter.cs |   26 +
 DM_Weight/Converter/MachineTypeConverter.cs   |   59 +
 .../Converter/NullableToEnabelConverter.cs    |   27 +
 DM_Weight/Converter/OrderStatusConverter.cs   |   38 +
 DM_Weight/Converter/PaginationConverter.cs    |   56 +
 DM_Weight/Converter/QuantityCountConverter.cs |   34 +
 DM_Weight/Converter/ShiftsStateConverter.cs   |   30 +
 DM_Weight/Converter/StatusConverter.cs        |   85 ++
 DM_Weight/CustomAttribute/MessageAttribute.cs |   20 +
 DM_Weight/DM_Weight.csproj                    |  128 ++
 DM_Weight/Finger/FingerprintUtil.cs           |  174 +++
 DM_Weight/Images/TbExit.png                   |  Bin 0 -> 5613 bytes
 DM_Weight/Images/TbJiay.png                   |  Bin 0 -> 5521 bytes
 DM_Weight/Images/TbKuc.png                    |  Bin 0 -> 20283 bytes
 DM_Weight/Images/TbQyao.png                   |  Bin 0 -> 5774 bytes
 DM_Weight/Images/TbSet.png                    |  Bin 0 -> 5554 bytes
 DM_Weight/Images/TbTuiy.png                   |  Bin 0 -> 5708 bytes
 DM_Weight/Images/body-bg.jpg                  |  Bin 0 -> 19588 bytes
 DM_Weight/Images/box-16.jpg                   |  Bin 0 -> 18695 bytes
 DM_Weight/Images/box.png                      |  Bin 0 -> 5630 bytes
 DM_Weight/Images/favicon.ico                  |  Bin 0 -> 270398 bytes
 DM_Weight/Images/finger-bg-r.png              |  Bin 0 -> 54076 bytes
 DM_Weight/Images/logo.png                     |  Bin 0 -> 3660 bytes
 DM_Weight/Models/AddChannelStockManuNo.cs     |   26 +
 DM_Weight/Models/ChannelList.cs               |  196 +++
 DM_Weight/Models/ChannelStock.cs              |  197 +++
 DM_Weight/Models/DrugInfo.cs                  |   89 ++
 DM_Weight/Models/DrugManuNo.cs                |   39 +
 DM_Weight/Models/HkcChangeShifts.cs           |   45 +
 DM_Weight/Models/InOutInvoice.cs              |  149 ++
 DM_Weight/Models/Invoice.cs                   |   20 +
 DM_Weight/Models/MachineRecord.cs             |  147 ++
 DM_Weight/Models/OrderDetail.cs               |  131 ++
 DM_Weight/Models/OrderFinish.cs               |   32 +
 DM_Weight/Models/OrderInfo.cs                 |  192 +++
 DM_Weight/Models/PremissionDm.cs              |   35 +
 DM_Weight/Models/RoleDm.cs                    |   40 +
 DM_Weight/Models/ShiftsReport.cs              |   55 +
 DM_Weight/Models/UserList.cs                  |   77 +
 DM_Weight/Port/PortUtil.cs                    | 1309 +++++++++++++++++
 DM_Weight/Port/ScreenUtil.cs                  |  171 +++
 DM_Weight/Report/GridReportUtil.cs            |  200 +++
 DM_Weight/ReportTemp/account_book_temp.grf    |  606 ++++++++
 DM_Weight/ReportTemp/changeShifts_temp.grf    |  346 +++++
 DM_Weight/ReportTemp/machine_log_add.grf      |  283 ++++
 DM_Weight/ReportTemp/machine_log_check.grf    |  283 ++++
 DM_Weight/ReportTemp/machine_log_return.grf   |  283 ++++
 DM_Weight/ReportTemp/machine_log_take.grf     |  283 ++++
 DM_Weight/ReportTemp/stock_template.grf       |  346 +++++
 .../Validation/NotEmptyValidationRule.cs      |   20 +
 .../ViewModels/AddDrugControlViewModel.cs     |  534 +++++++
 .../ViewModels/AddManunoDialogViewModel.cs    |  151 ++
 .../BindingChannelDialogViewModel.cs          |  506 +++++++
 .../BindingChannelNewDialogViewModel.cs       |  465 ++++++
 .../ViewModels/ChangeShiftsDialogViewModel.cs |  660 +++++++++
 .../ChangeShiftsListWindowViewModel.cs        |  185 +++
 .../ChangeShiftsRecordWindowViewModel.cs      |  161 ++
 .../ViewModels/ChangeShiftsWindowViewModel.cs |  562 +++++++
 .../ViewModels/CheckStockWindowViewModel.cs   |  319 ++++
 .../ViewModels/CollectionViewGroupInternal.cs |    6 +
 DM_Weight/ViewModels/DebugWindowViewModel.cs  |   40 +
 .../DrawerAddDrugWindowViewModel.cs           |  392 +++++
 .../DrawerTakeDrugWindowViewModel.cs          |  334 +++++
 .../ViewModels/DrugListWindowViewModel.cs     |  283 ++++
 .../ViewModels/EditUserDialogViewModel.cs     |  210 +++
 .../ViewModels/FingerprintDialogViewModel.cs  |  133 ++
 DM_Weight/ViewModels/HomeWindowViewModel.cs   |  316 ++++
 .../ViewModels/InvoiceAddDialogViewModel.cs   |  355 +++++
 .../ViewModels/InvoiceInWindowViewModel.cs    |  384 +++++
 .../ViewModels/InvoiceOutWindowViewModel.cs   |  270 ++++
 .../ViewModels/InvoiceTakeDialogViewModel.cs  |  424 ++++++
 DM_Weight/ViewModels/LoginWindowViewModel.cs  |  396 +++++
 .../MachineRecordWindowViewModel.cs           |  302 ++++
 DM_Weight/ViewModels/MainWindowViewModel.cs   |  119 ++
 .../ViewModels/OrderReturnDialogViewModel.cs  |  406 +++++
 .../ViewModels/OrderTakeDialogViewModel.cs    |  444 ++++++
 .../OrderTakeDrugWindowViewModel.cs           |  265 ++++
 DM_Weight/ViewModels/PremissionViewModel.cs   |   36 +
 .../ViewModels/ReturnDrugDialogViewModel.cs   |  333 +++++
 .../ViewModels/ReturnDrugWindow2ViewModel.cs  |  254 ++++
 .../ViewModels/ReturnDrugWindowViewModel.cs   |  208 +++
 .../ViewModels/ReturnEmptyDialogViewModel.cs  |  358 +++++
 .../ViewModels/ReturnEmptyWindowViewModel.cs  |  134 ++
 .../ViewModels/RoleManagerWindowViewModel.cs  |  665 +++++++++
 .../ViewModels/SelfAddDialogViewModel.cs      |  348 +++++
 .../ViewModels/SelfAddWindowViewModel.cs      |  201 +++
 .../ViewModels/SelfTakeDialogViewModel.cs     |  327 ++++
 .../ViewModels/SelfTakeDrugWindowViewModel.cs |  192 +++
 .../ViewModels/SettingWindowViewModel.cs      |   83 ++
 .../ViewModels/ShowMessageDialogViewModel.cs  |   54 +
 .../ViewModels/StockListWindowViewModel.cs    |  199 +++
 .../ViewModels/TakeDrugControlViewModel.cs    |   12 +
 .../ViewModels/UserManagerWindowViewModel.cs  |  198 +++
 DM_Weight/Views/AddDrugControl.xaml           |  395 +++++
 DM_Weight/Views/AddDrugControl.xaml.cs        |   41 +
 DM_Weight/Views/ChangeShiftsListWindow.xaml   |  136 ++
 .../Views/ChangeShiftsListWindow.xaml.cs      |   28 +
 DM_Weight/Views/ChangeShiftsRecordWindow.xaml |  143 ++
 .../Views/ChangeShiftsRecordWindow.xaml.cs    |   28 +
 DM_Weight/Views/ChangeShiftsWindow.xaml       |  288 ++++
 DM_Weight/Views/ChangeShiftsWindow.xaml.cs    |   28 +
 DM_Weight/Views/CheckStockWindow.xaml         |  314 ++++
 DM_Weight/Views/CheckStockWindow.xaml.cs      |   28 +
 DM_Weight/Views/DebugWindow.xaml              |   23 +
 DM_Weight/Views/DebugWindow.xaml.cs           |   28 +
 DM_Weight/Views/Dialog/AddManunoDialog.xaml   |  116 ++
 .../Views/Dialog/AddManunoDialog.xaml.cs      |   28 +
 .../Views/Dialog/BindingChannelDialog.xaml    |  217 +++
 .../Views/Dialog/BindingChannelDialog.xaml.cs |   28 +
 .../Views/Dialog/BindingChannelNewDialog.xaml |  210 +++
 .../Dialog/BindingChannelNewDialog.xaml.cs    |   28 +
 .../Views/Dialog/ChangeShiftsDialog.xaml      |  322 ++++
 .../Views/Dialog/ChangeShiftsDialog.xaml.cs   |   28 +
 DM_Weight/Views/Dialog/EditUserDialog.xaml    |  106 ++
 DM_Weight/Views/Dialog/EditUserDialog.xaml.cs |   28 +
 DM_Weight/Views/Dialog/FingerprintDialog.xaml |   59 +
 .../Views/Dialog/FingerprintDialog.xaml.cs    |   28 +
 DM_Weight/Views/Dialog/InvoiceAddDialog.xaml  |  180 +++
 .../Views/Dialog/InvoiceAddDialog.xaml.cs     |   28 +
 DM_Weight/Views/Dialog/InvoiceTakeDialog.xaml |  181 +++
 .../Views/Dialog/InvoiceTakeDialog.xaml.cs    |   28 +
 DM_Weight/Views/Dialog/OrderReturnDialog.xaml |  239 +++
 .../Views/Dialog/OrderReturnDialog.xaml.cs    |   28 +
 DM_Weight/Views/Dialog/OrderTakeDialog.xaml   |  222 +++
 .../Views/Dialog/OrderTakeDialog.xaml.cs      |   28 +
 DM_Weight/Views/Dialog/ReturnDrugDialog.xaml  |  201 +++
 .../Views/Dialog/ReturnDrugDialog.xaml.cs     |   28 +
 DM_Weight/Views/Dialog/ReturnEmptyDialog.xaml |  211 +++
 .../Views/Dialog/ReturnEmptyDialog.xaml.cs    |   28 +
 DM_Weight/Views/Dialog/SelfAddDialog.xaml     |  147 ++
 DM_Weight/Views/Dialog/SelfAddDialog.xaml.cs  |   28 +
 DM_Weight/Views/Dialog/SelfTakeDialog.xaml    |  143 ++
 DM_Weight/Views/Dialog/SelfTakeDialog.xaml.cs |   28 +
 DM_Weight/Views/Dialog/ShowMessageDialog.xaml |   23 +
 .../Views/Dialog/ShowMessageDialog.xaml.cs    |   28 +
 DM_Weight/Views/DrawerAddDrugWindow.xaml      |  368 +++++
 DM_Weight/Views/DrawerAddDrugWindow.xaml.cs   |   46 +
 DM_Weight/Views/DrawerTakeDrugWindow.xaml     |  267 ++++
 DM_Weight/Views/DrawerTakeDrugWindow.xaml.cs  |   28 +
 DM_Weight/Views/DrugListWindow.xaml           |  219 +++
 DM_Weight/Views/DrugListWindow.xaml.cs        |   28 +
 DM_Weight/Views/HomeWindow.xaml               |  142 ++
 DM_Weight/Views/HomeWindow.xaml.cs            |   28 +
 DM_Weight/Views/InvoiceInWindow.xaml          |  243 +++
 DM_Weight/Views/InvoiceInWindow.xaml.cs       |   28 +
 DM_Weight/Views/InvoiceOutWindow.xaml         |  121 ++
 DM_Weight/Views/InvoiceOutWindow.xaml.cs      |   28 +
 DM_Weight/Views/LoginWindow.xaml              |  203 +++
 DM_Weight/Views/LoginWindow.xaml.cs           |   37 +
 DM_Weight/Views/MachineRecordWindow.xaml      |  181 +++
 DM_Weight/Views/MachineRecordWindow.xaml.cs   |   54 +
 DM_Weight/Views/MainWindow.xaml               |   40 +
 DM_Weight/Views/MainWindow.xaml.cs            |   47 +
 DM_Weight/Views/OrderTakeDrugWindow.xaml      |  134 ++
 DM_Weight/Views/OrderTakeDrugWindow.xaml.cs   |   33 +
 DM_Weight/Views/ReturnDrugWindow.xaml         |  117 ++
 DM_Weight/Views/ReturnDrugWindow.xaml.cs      |   28 +
 DM_Weight/Views/ReturnDrugWindow2.xaml        |  127 ++
 DM_Weight/Views/ReturnDrugWindow2.xaml.cs     |   28 +
 DM_Weight/Views/ReturnEmptyWindow.xaml        |   88 ++
 DM_Weight/Views/ReturnEmptyWindow.xaml.cs     |   28 +
 DM_Weight/Views/RoleManagerWindow.xaml        |  193 +++
 DM_Weight/Views/RoleManagerWindow.xaml.cs     |   28 +
 DM_Weight/Views/SelfAddWindow.xaml            |  238 +++
 DM_Weight/Views/SelfAddWindow.xaml.cs         |   28 +
 DM_Weight/Views/SelfTakeDrugWindow.xaml       |  171 +++
 DM_Weight/Views/SelfTakeDrugWindow.xaml.cs    |   28 +
 DM_Weight/Views/SettingWindow.xaml            |   38 +
 DM_Weight/Views/SettingWindow.xaml.cs         |   28 +
 DM_Weight/Views/StockListWindow.xaml          |  222 +++
 DM_Weight/Views/StockListWindow.xaml.cs       |   28 +
 DM_Weight/Views/TakeDrugControl.xaml          |   12 +
 DM_Weight/Views/TakeDrugControl.xaml.cs       |   28 +
 DM_Weight/Views/Test.xaml                     |  138 ++
 DM_Weight/Views/Test.xaml.cs                  |   28 +
 DM_Weight/Views/UserManagerWindow.xaml        |  123 ++
 DM_Weight/Views/UserManagerWindow.xaml.cs     |   28 +
 DM_Weight/favicon.ico                         |  Bin 0 -> 270398 bytes
 DM_Weight/log4net.config                      |   53 +
 DM_Weight/msg/AddDrugEvent.cs                 |   14 +
 DM_Weight/msg/FingerprintEvent.cs             |   14 +
 DM_Weight/msg/PortUtilEvent.cs                |   14 +
 DM_Weight/msg/SnackbarEvent.cs                |   14 +
 DM_Weight/select/OrderTakeSelect.cs           |   14 +
 DM_Weight/util/AlertMsg.cs                    |   19 +
 DM_Weight/util/BindingProxy.cs                |   18 +
 DM_Weight/util/CheckComputerFreeState.cs      |   53 +
 DM_Weight/util/DeviceMsg.cs                   |   33 +
 DM_Weight/util/DialogServiceExtensions.cs     |   55 +
 DM_Weight/util/FingerprintMsg.cs              |   25 +
 DM_Weight/util/GridViewExtensions.cs          |   70 +
 DM_Weight/util/MD5.cs                         |   34 +
 DM_Weight/util/MaterialDialogService.cs       |  159 ++
 DM_Weight/util/MsgType.cs                     |   16 +
 DM_Weight/util/SqlSugarHelper.cs              |   25 +
 DM_Weight/util/TabTip/AnimationHelper.cs      |  328 +++++
 DM_Weight/util/TabTip/EnvironmentEx.cs        |   40 +
 DM_Weight/util/TabTip/HardwareKeyboard.cs     |  111 ++
 DM_Weight/util/TabTip/PoolingTimer.cs         |   26 +
 DM_Weight/util/TabTip/Screen.cs               |  101 ++
 DM_Weight/util/TabTip/TabTip.cs               |  166 +++
 DM_Weight/util/TabTip/TabTipAutomation.cs     |  121 ++
 DM_Weight/util/TabTip/Taskbar.cs              |  132 ++
 DM_Weight/util/TransExpV2.cs                  |   41 +
 DM_WeightTests/DM_WeightTests.csproj          |   23 +
 DM_WeightTests/Port/ScreenUtilTests.cs        |   12 +
 219 files changed, 29744 insertions(+)
 create mode 100644 DM_Weight.sln
 create mode 100644 DM_Weight/App.config
 create mode 100644 DM_Weight/App.xaml
 create mode 100644 DM_Weight/App.xaml.cs
 create mode 100644 DM_Weight/AssemblyInfo.cs
 create mode 100644 DM_Weight/Components/pagination/Pagination.xaml
 create mode 100644 DM_Weight/Components/pagination/Pagination.xaml.cs
 create mode 100644 DM_Weight/Components/pagination/PaginationViewModel.cs
 create mode 100644 DM_Weight/Converter/BoardTypeConverter.cs
 create mode 100644 DM_Weight/Converter/ChangeShiftsStatusConverter.cs
 create mode 100644 DM_Weight/Converter/DrawerSelectConverter.cs
 create mode 100644 DM_Weight/Converter/ForeColorConverter.cs
 create mode 100644 DM_Weight/Converter/GroupSumConverter.cs
 create mode 100644 DM_Weight/Converter/InputQuantityConverter.cs
 create mode 100644 DM_Weight/Converter/MachineTypeConverter.cs
 create mode 100644 DM_Weight/Converter/NullableToEnabelConverter.cs
 create mode 100644 DM_Weight/Converter/OrderStatusConverter.cs
 create mode 100644 DM_Weight/Converter/PaginationConverter.cs
 create mode 100644 DM_Weight/Converter/QuantityCountConverter.cs
 create mode 100644 DM_Weight/Converter/ShiftsStateConverter.cs
 create mode 100644 DM_Weight/Converter/StatusConverter.cs
 create mode 100644 DM_Weight/CustomAttribute/MessageAttribute.cs
 create mode 100644 DM_Weight/DM_Weight.csproj
 create mode 100644 DM_Weight/Finger/FingerprintUtil.cs
 create mode 100644 DM_Weight/Images/TbExit.png
 create mode 100644 DM_Weight/Images/TbJiay.png
 create mode 100644 DM_Weight/Images/TbKuc.png
 create mode 100644 DM_Weight/Images/TbQyao.png
 create mode 100644 DM_Weight/Images/TbSet.png
 create mode 100644 DM_Weight/Images/TbTuiy.png
 create mode 100644 DM_Weight/Images/body-bg.jpg
 create mode 100644 DM_Weight/Images/box-16.jpg
 create mode 100644 DM_Weight/Images/box.png
 create mode 100644 DM_Weight/Images/favicon.ico
 create mode 100644 DM_Weight/Images/finger-bg-r.png
 create mode 100644 DM_Weight/Images/logo.png
 create mode 100644 DM_Weight/Models/AddChannelStockManuNo.cs
 create mode 100644 DM_Weight/Models/ChannelList.cs
 create mode 100644 DM_Weight/Models/ChannelStock.cs
 create mode 100644 DM_Weight/Models/DrugInfo.cs
 create mode 100644 DM_Weight/Models/DrugManuNo.cs
 create mode 100644 DM_Weight/Models/HkcChangeShifts.cs
 create mode 100644 DM_Weight/Models/InOutInvoice.cs
 create mode 100644 DM_Weight/Models/Invoice.cs
 create mode 100644 DM_Weight/Models/MachineRecord.cs
 create mode 100644 DM_Weight/Models/OrderDetail.cs
 create mode 100644 DM_Weight/Models/OrderFinish.cs
 create mode 100644 DM_Weight/Models/OrderInfo.cs
 create mode 100644 DM_Weight/Models/PremissionDm.cs
 create mode 100644 DM_Weight/Models/RoleDm.cs
 create mode 100644 DM_Weight/Models/ShiftsReport.cs
 create mode 100644 DM_Weight/Models/UserList.cs
 create mode 100644 DM_Weight/Port/PortUtil.cs
 create mode 100644 DM_Weight/Port/ScreenUtil.cs
 create mode 100644 DM_Weight/Report/GridReportUtil.cs
 create mode 100644 DM_Weight/ReportTemp/account_book_temp.grf
 create mode 100644 DM_Weight/ReportTemp/changeShifts_temp.grf
 create mode 100644 DM_Weight/ReportTemp/machine_log_add.grf
 create mode 100644 DM_Weight/ReportTemp/machine_log_check.grf
 create mode 100644 DM_Weight/ReportTemp/machine_log_return.grf
 create mode 100644 DM_Weight/ReportTemp/machine_log_take.grf
 create mode 100644 DM_Weight/ReportTemp/stock_template.grf
 create mode 100644 DM_Weight/Validation/NotEmptyValidationRule.cs
 create mode 100644 DM_Weight/ViewModels/AddDrugControlViewModel.cs
 create mode 100644 DM_Weight/ViewModels/AddManunoDialogViewModel.cs
 create mode 100644 DM_Weight/ViewModels/BindingChannelDialogViewModel.cs
 create mode 100644 DM_Weight/ViewModels/BindingChannelNewDialogViewModel.cs
 create mode 100644 DM_Weight/ViewModels/ChangeShiftsDialogViewModel.cs
 create mode 100644 DM_Weight/ViewModels/ChangeShiftsListWindowViewModel.cs
 create mode 100644 DM_Weight/ViewModels/ChangeShiftsRecordWindowViewModel.cs
 create mode 100644 DM_Weight/ViewModels/ChangeShiftsWindowViewModel.cs
 create mode 100644 DM_Weight/ViewModels/CheckStockWindowViewModel.cs
 create mode 100644 DM_Weight/ViewModels/CollectionViewGroupInternal.cs
 create mode 100644 DM_Weight/ViewModels/DebugWindowViewModel.cs
 create mode 100644 DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs
 create mode 100644 DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs
 create mode 100644 DM_Weight/ViewModels/DrugListWindowViewModel.cs
 create mode 100644 DM_Weight/ViewModels/EditUserDialogViewModel.cs
 create mode 100644 DM_Weight/ViewModels/FingerprintDialogViewModel.cs
 create mode 100644 DM_Weight/ViewModels/HomeWindowViewModel.cs
 create mode 100644 DM_Weight/ViewModels/InvoiceAddDialogViewModel.cs
 create mode 100644 DM_Weight/ViewModels/InvoiceInWindowViewModel.cs
 create mode 100644 DM_Weight/ViewModels/InvoiceOutWindowViewModel.cs
 create mode 100644 DM_Weight/ViewModels/InvoiceTakeDialogViewModel.cs
 create mode 100644 DM_Weight/ViewModels/LoginWindowViewModel.cs
 create mode 100644 DM_Weight/ViewModels/MachineRecordWindowViewModel.cs
 create mode 100644 DM_Weight/ViewModels/MainWindowViewModel.cs
 create mode 100644 DM_Weight/ViewModels/OrderReturnDialogViewModel.cs
 create mode 100644 DM_Weight/ViewModels/OrderTakeDialogViewModel.cs
 create mode 100644 DM_Weight/ViewModels/OrderTakeDrugWindowViewModel.cs
 create mode 100644 DM_Weight/ViewModels/PremissionViewModel.cs
 create mode 100644 DM_Weight/ViewModels/ReturnDrugDialogViewModel.cs
 create mode 100644 DM_Weight/ViewModels/ReturnDrugWindow2ViewModel.cs
 create mode 100644 DM_Weight/ViewModels/ReturnDrugWindowViewModel.cs
 create mode 100644 DM_Weight/ViewModels/ReturnEmptyDialogViewModel.cs
 create mode 100644 DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs
 create mode 100644 DM_Weight/ViewModels/RoleManagerWindowViewModel.cs
 create mode 100644 DM_Weight/ViewModels/SelfAddDialogViewModel.cs
 create mode 100644 DM_Weight/ViewModels/SelfAddWindowViewModel.cs
 create mode 100644 DM_Weight/ViewModels/SelfTakeDialogViewModel.cs
 create mode 100644 DM_Weight/ViewModels/SelfTakeDrugWindowViewModel.cs
 create mode 100644 DM_Weight/ViewModels/SettingWindowViewModel.cs
 create mode 100644 DM_Weight/ViewModels/ShowMessageDialogViewModel.cs
 create mode 100644 DM_Weight/ViewModels/StockListWindowViewModel.cs
 create mode 100644 DM_Weight/ViewModels/TakeDrugControlViewModel.cs
 create mode 100644 DM_Weight/ViewModels/UserManagerWindowViewModel.cs
 create mode 100644 DM_Weight/Views/AddDrugControl.xaml
 create mode 100644 DM_Weight/Views/AddDrugControl.xaml.cs
 create mode 100644 DM_Weight/Views/ChangeShiftsListWindow.xaml
 create mode 100644 DM_Weight/Views/ChangeShiftsListWindow.xaml.cs
 create mode 100644 DM_Weight/Views/ChangeShiftsRecordWindow.xaml
 create mode 100644 DM_Weight/Views/ChangeShiftsRecordWindow.xaml.cs
 create mode 100644 DM_Weight/Views/ChangeShiftsWindow.xaml
 create mode 100644 DM_Weight/Views/ChangeShiftsWindow.xaml.cs
 create mode 100644 DM_Weight/Views/CheckStockWindow.xaml
 create mode 100644 DM_Weight/Views/CheckStockWindow.xaml.cs
 create mode 100644 DM_Weight/Views/DebugWindow.xaml
 create mode 100644 DM_Weight/Views/DebugWindow.xaml.cs
 create mode 100644 DM_Weight/Views/Dialog/AddManunoDialog.xaml
 create mode 100644 DM_Weight/Views/Dialog/AddManunoDialog.xaml.cs
 create mode 100644 DM_Weight/Views/Dialog/BindingChannelDialog.xaml
 create mode 100644 DM_Weight/Views/Dialog/BindingChannelDialog.xaml.cs
 create mode 100644 DM_Weight/Views/Dialog/BindingChannelNewDialog.xaml
 create mode 100644 DM_Weight/Views/Dialog/BindingChannelNewDialog.xaml.cs
 create mode 100644 DM_Weight/Views/Dialog/ChangeShiftsDialog.xaml
 create mode 100644 DM_Weight/Views/Dialog/ChangeShiftsDialog.xaml.cs
 create mode 100644 DM_Weight/Views/Dialog/EditUserDialog.xaml
 create mode 100644 DM_Weight/Views/Dialog/EditUserDialog.xaml.cs
 create mode 100644 DM_Weight/Views/Dialog/FingerprintDialog.xaml
 create mode 100644 DM_Weight/Views/Dialog/FingerprintDialog.xaml.cs
 create mode 100644 DM_Weight/Views/Dialog/InvoiceAddDialog.xaml
 create mode 100644 DM_Weight/Views/Dialog/InvoiceAddDialog.xaml.cs
 create mode 100644 DM_Weight/Views/Dialog/InvoiceTakeDialog.xaml
 create mode 100644 DM_Weight/Views/Dialog/InvoiceTakeDialog.xaml.cs
 create mode 100644 DM_Weight/Views/Dialog/OrderReturnDialog.xaml
 create mode 100644 DM_Weight/Views/Dialog/OrderReturnDialog.xaml.cs
 create mode 100644 DM_Weight/Views/Dialog/OrderTakeDialog.xaml
 create mode 100644 DM_Weight/Views/Dialog/OrderTakeDialog.xaml.cs
 create mode 100644 DM_Weight/Views/Dialog/ReturnDrugDialog.xaml
 create mode 100644 DM_Weight/Views/Dialog/ReturnDrugDialog.xaml.cs
 create mode 100644 DM_Weight/Views/Dialog/ReturnEmptyDialog.xaml
 create mode 100644 DM_Weight/Views/Dialog/ReturnEmptyDialog.xaml.cs
 create mode 100644 DM_Weight/Views/Dialog/SelfAddDialog.xaml
 create mode 100644 DM_Weight/Views/Dialog/SelfAddDialog.xaml.cs
 create mode 100644 DM_Weight/Views/Dialog/SelfTakeDialog.xaml
 create mode 100644 DM_Weight/Views/Dialog/SelfTakeDialog.xaml.cs
 create mode 100644 DM_Weight/Views/Dialog/ShowMessageDialog.xaml
 create mode 100644 DM_Weight/Views/Dialog/ShowMessageDialog.xaml.cs
 create mode 100644 DM_Weight/Views/DrawerAddDrugWindow.xaml
 create mode 100644 DM_Weight/Views/DrawerAddDrugWindow.xaml.cs
 create mode 100644 DM_Weight/Views/DrawerTakeDrugWindow.xaml
 create mode 100644 DM_Weight/Views/DrawerTakeDrugWindow.xaml.cs
 create mode 100644 DM_Weight/Views/DrugListWindow.xaml
 create mode 100644 DM_Weight/Views/DrugListWindow.xaml.cs
 create mode 100644 DM_Weight/Views/HomeWindow.xaml
 create mode 100644 DM_Weight/Views/HomeWindow.xaml.cs
 create mode 100644 DM_Weight/Views/InvoiceInWindow.xaml
 create mode 100644 DM_Weight/Views/InvoiceInWindow.xaml.cs
 create mode 100644 DM_Weight/Views/InvoiceOutWindow.xaml
 create mode 100644 DM_Weight/Views/InvoiceOutWindow.xaml.cs
 create mode 100644 DM_Weight/Views/LoginWindow.xaml
 create mode 100644 DM_Weight/Views/LoginWindow.xaml.cs
 create mode 100644 DM_Weight/Views/MachineRecordWindow.xaml
 create mode 100644 DM_Weight/Views/MachineRecordWindow.xaml.cs
 create mode 100644 DM_Weight/Views/MainWindow.xaml
 create mode 100644 DM_Weight/Views/MainWindow.xaml.cs
 create mode 100644 DM_Weight/Views/OrderTakeDrugWindow.xaml
 create mode 100644 DM_Weight/Views/OrderTakeDrugWindow.xaml.cs
 create mode 100644 DM_Weight/Views/ReturnDrugWindow.xaml
 create mode 100644 DM_Weight/Views/ReturnDrugWindow.xaml.cs
 create mode 100644 DM_Weight/Views/ReturnDrugWindow2.xaml
 create mode 100644 DM_Weight/Views/ReturnDrugWindow2.xaml.cs
 create mode 100644 DM_Weight/Views/ReturnEmptyWindow.xaml
 create mode 100644 DM_Weight/Views/ReturnEmptyWindow.xaml.cs
 create mode 100644 DM_Weight/Views/RoleManagerWindow.xaml
 create mode 100644 DM_Weight/Views/RoleManagerWindow.xaml.cs
 create mode 100644 DM_Weight/Views/SelfAddWindow.xaml
 create mode 100644 DM_Weight/Views/SelfAddWindow.xaml.cs
 create mode 100644 DM_Weight/Views/SelfTakeDrugWindow.xaml
 create mode 100644 DM_Weight/Views/SelfTakeDrugWindow.xaml.cs
 create mode 100644 DM_Weight/Views/SettingWindow.xaml
 create mode 100644 DM_Weight/Views/SettingWindow.xaml.cs
 create mode 100644 DM_Weight/Views/StockListWindow.xaml
 create mode 100644 DM_Weight/Views/StockListWindow.xaml.cs
 create mode 100644 DM_Weight/Views/TakeDrugControl.xaml
 create mode 100644 DM_Weight/Views/TakeDrugControl.xaml.cs
 create mode 100644 DM_Weight/Views/Test.xaml
 create mode 100644 DM_Weight/Views/Test.xaml.cs
 create mode 100644 DM_Weight/Views/UserManagerWindow.xaml
 create mode 100644 DM_Weight/Views/UserManagerWindow.xaml.cs
 create mode 100644 DM_Weight/favicon.ico
 create mode 100644 DM_Weight/log4net.config
 create mode 100644 DM_Weight/msg/AddDrugEvent.cs
 create mode 100644 DM_Weight/msg/FingerprintEvent.cs
 create mode 100644 DM_Weight/msg/PortUtilEvent.cs
 create mode 100644 DM_Weight/msg/SnackbarEvent.cs
 create mode 100644 DM_Weight/select/OrderTakeSelect.cs
 create mode 100644 DM_Weight/util/AlertMsg.cs
 create mode 100644 DM_Weight/util/BindingProxy.cs
 create mode 100644 DM_Weight/util/CheckComputerFreeState.cs
 create mode 100644 DM_Weight/util/DeviceMsg.cs
 create mode 100644 DM_Weight/util/DialogServiceExtensions.cs
 create mode 100644 DM_Weight/util/FingerprintMsg.cs
 create mode 100644 DM_Weight/util/GridViewExtensions.cs
 create mode 100644 DM_Weight/util/MD5.cs
 create mode 100644 DM_Weight/util/MaterialDialogService.cs
 create mode 100644 DM_Weight/util/MsgType.cs
 create mode 100644 DM_Weight/util/SqlSugarHelper.cs
 create mode 100644 DM_Weight/util/TabTip/AnimationHelper.cs
 create mode 100644 DM_Weight/util/TabTip/EnvironmentEx.cs
 create mode 100644 DM_Weight/util/TabTip/HardwareKeyboard.cs
 create mode 100644 DM_Weight/util/TabTip/PoolingTimer.cs
 create mode 100644 DM_Weight/util/TabTip/Screen.cs
 create mode 100644 DM_Weight/util/TabTip/TabTip.cs
 create mode 100644 DM_Weight/util/TabTip/TabTipAutomation.cs
 create mode 100644 DM_Weight/util/TabTip/Taskbar.cs
 create mode 100644 DM_Weight/util/TransExpV2.cs
 create mode 100644 DM_WeightTests/DM_WeightTests.csproj
 create mode 100644 DM_WeightTests/Port/ScreenUtilTests.cs

diff --git a/DM_Weight.sln b/DM_Weight.sln
new file mode 100644
index 0000000..9c198ec
--- /dev/null
+++ b/DM_Weight.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32922.545
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DM_Weight", "DM_Weight\DM_Weight.csproj", "{439FA76B-F874-40DB-BAF2-E3647CD55B10}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{439FA76B-F874-40DB-BAF2-E3647CD55B10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{439FA76B-F874-40DB-BAF2-E3647CD55B10}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{439FA76B-F874-40DB-BAF2-E3647CD55B10}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{439FA76B-F874-40DB-BAF2-E3647CD55B10}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {E50E8179-1102-41F1-92F5-2905C75898A6}
+	EndGlobalSection
+EndGlobal
diff --git a/DM_Weight/App.config b/DM_Weight/App.config
new file mode 100644
index 0000000..1c3a5d3
--- /dev/null
+++ b/DM_Weight/App.config
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <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=hkcdb_dpc;userid=root;password=root" />
+  </connectionStrings>
+	<!--<runtime>
+		--><!--配置之后，Appdomain.CurrentDomain.UnhandledException 事件的 IsTerminating 就变成了 false 啦！也就是说，程序并不会因为这次的异常而崩溃退出。--><!--
+		<legacyUnhandledExceptionPolicy enabled="1"/>
+	</runtime>-->
+	<appSettings>
+		
+		<!-- 设备id -->
+		<add key="machineId" value="DM1" />
+		<!--2023/7/13 药房代码 有则写无则空 -->
+		<add key="storage" value="" />
+		<!-- 登录模式 1单人登录2双人登录 -->
+		<add key="loginMode" value="2" />
+		<!-- 登录顺序,指定先登录的人的名称有效值，只有在登录模式等于2时才会生效； 发药人：【operator】审核人：【reviewer】 -->
+		<add key="firstLogin" value="operator" />
+		<!-- 按处方还药或者按取药记录还药 1:处方2：药品-->
+		<add key="returnDrugMode" value="1" />
+		<!-- 自动退出时间，单位秒，为0时不自动退出 -->
+		<add key="autoExit" value="0"/>
+
+		<add key="gridConnectionString" value="MYSQL; Database=hkcdb; Password=root; Port=3306; Server=127.0.0.1; User=root;"/>
+		<!-- 查询处方是orderNo还是orderGroupNo -->
+		<add key="OrderNoName" value="orderNo" />
+		<!-- 后门耗材板地址 没有则填写0-->
+		<add key="DoorAddr" value="1" />
+		<!-- 是否有can总线串口-->
+		<add key="CanBusExsit" value="true" />
+		<!-- 单支抽屉储物箱有则写地址无则为0-->
+		<add key="StorageBoxAddr" value="1" />
+		<!-- 抽屉串口使用的协议232或者485 -->
+		<add key="DrawerProtocol" value="485" />
+		<!-- 抽屉串口的串口号 -->
+		<add key="DrawerPortPath" value="COM1" />
+		<!-- can总线串口的串口号 -->
+		<add key="CanBusPortPath" value="COM6" />
+		<!-- 条码枪串口的串口号 -->
+		<add key="ScanCodePortPath" value="COM8" />
+		<!-- 抽屉串口的串口号 --><!--
+		<add key="DrawerPortPath" value="COM11" />
+		--><!-- can总线串口的串口号 --><!--
+		<add key="CanBusPortPath" value="COM12" />
+		--><!-- 条码枪串口的串口号 --><!--
+		<add key="ScanPortPath" value="COM7" />-->
+
+
+		<!-- 指纹机类型 1：无屏幕；2：有屏幕 -->
+		<add  key="machineType" value="2"/>
+		<!-- 指纹机号码 -->
+		<add  key="machineNumber" value="1"/>
+		<!-- 指纹机ip -->
+		<add  key="fingerIp" value="192.168.1.201"/>
+		<!--一个抽屉对应标签数-->
+		<add  key="labelCount" value="2"/>
+
+	</appSettings>
+</configuration>
\ No newline at end of file
diff --git a/DM_Weight/App.xaml b/DM_Weight/App.xaml
new file mode 100644
index 0000000..ef8d445
--- /dev/null
+++ b/DM_Weight/App.xaml
@@ -0,0 +1,19 @@
+<prism:PrismApplication x:Class="DM_Weight.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:d1p1="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             d1p1:Ignorable="d"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:local="clr-namespace:DM_Weight"
+             xmlns:prism="http://prismlibrary.com/">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <materialDesign:BundledTheme BaseTheme="Light" PrimaryColor="Indigo" SecondaryColor="Cyan" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
+
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
+    </prism:PrismApplication>
diff --git a/DM_Weight/App.xaml.cs b/DM_Weight/App.xaml.cs
new file mode 100644
index 0000000..c6ca5dc
--- /dev/null
+++ b/DM_Weight/App.xaml.cs
@@ -0,0 +1,252 @@
+using DM_Weight.Finger;
+using DM_Weight.Port;
+using DM_Weight.util.TabTip;
+using DM_Weight.util;
+using DM_Weight.ViewModels;
+using DM_Weight.Views.Dialog;
+using DM_Weight.Views;
+using log4net.Config;
+using Prism.Ioc;
+using Prism.Services.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Configuration;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using Prism.Unity;
+using log4net;
+using System.Windows.Interop;
+using System.Windows.Threading;
+using System.Timers;
+using DM_Weight.Models;
+
+namespace DM_Weight
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : PrismApplication
+    {
+        #region 当前登录用户的发药人信息
+        private static UserList _currentFaUserList=new UserList();
+        public static UserList CurrentFaUserList
+        {
+            get => _currentFaUserList;
+            set=> _currentFaUserList = value;
+        }
+
+        #endregion 当前登录用户的发药人信息
+
+        #region 当前登录用户的审核人信息
+        private static UserList _currentShenUserList= new UserList();
+        public static UserList CurrentShenUserList
+        {
+            get => _currentShenUserList;
+            set => _currentShenUserList = value;
+        }
+        #endregion 当前登录用户的审核人信息
+
+        private readonly ILog logger = LogManager.GetLogger(typeof(App));
+        public App()
+        {
+            //TabTipAutomation.IgnoreHardwareKeyboard = HardwareKeyboardIgnoreOptions.IgnoreAll;
+            //TabTipAutomation.BindTo<TextBox>();
+            //TabTipAutomation.BindTo<PasswordBox>();
+        }
+
+
+
+        protected override Window CreateShell()
+        {
+            //UI线程未捕获异常处理事件
+            this.DispatcherUnhandledException += OnDispatcherUnhandledException;
+            //Task线程内未捕获异常处理事件
+            TaskScheduler.UnobservedTaskException += OnUnobservedTaskException;
+            //多线程异常
+            AppDomain.CurrentDomain.UnhandledException += OnUnhandledException;
+
+            return Container.Resolve<MainWindow>();
+        }
+
+        void OnDispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
+        {
+            logger.Error($"发生错误：{e.Exception.Message}");
+            e.Handled = true;
+        }
+
+        void OnUnobservedTaskException(object sender, UnobservedTaskExceptionEventArgs e)
+        {
+
+            foreach (Exception item in e.Exception.InnerExceptions)
+            {
+                logger.Error($"异常类型：{item.GetType()}{Environment.NewLine}来自：{item.Source}{Environment.NewLine}异常内容：{item.Message}");
+            }
+
+            //将异常标识为已经观察到 
+            e.SetObserved();
+        }
+
+        void OnUnhandledException(object sender, UnhandledExceptionEventArgs e)
+        {
+            logger.Error($"Unhandled exception.{e.ToString()}");
+        }
+
+
+        protected override void InitializeShell(Window shell)
+        {
+
+            base.InitializeShell(shell);
+        }
+
+        protected override void RegisterTypes(IContainerRegistry containerRegistry)
+        {
+            // 注入日志
+            XmlConfigurator.ConfigureAndWatch(new FileInfo(AppDomain.CurrentDomain.BaseDirectory + "log4net.config"));
+            //containerRegistry.RegisterInstance<ILog>(LogManager.GetLogger(""));
+
+            // 串口工具
+            containerRegistry.RegisterSingleton<PortUtil>();
+            // 指纹机工具
+            //containerRegistry.RegisterSingleton<FingerprintUtil>();
+            // 组态屏工具
+            containerRegistry.RegisterSingleton<ScreenUtil>();
+
+            containerRegistry.Register<IDialogService, MaterialDialogService>();
+
+            // 主窗口
+            containerRegistry.Register<MainWindow>();
+            containerRegistry.RegisterForNavigation<MainWindow, MainWindowViewModel>();
+
+            // 分页
+            //containerRegistry.Register<Pagination>();
+            //containerRegistry.Register<PaginationViewModel>();
+
+            // 登录页面
+            containerRegistry.RegisterForNavigation<LoginWindow, LoginWindowViewModel>();
+
+            // 布局页面
+            containerRegistry.RegisterForNavigation<HomeWindow, HomeWindowViewModel>();
+
+            // 录入指纹模态框
+            containerRegistry.RegisterDialog<FingerprintDialog>();
+            containerRegistry.RegisterForNavigation<FingerprintDialog, FingerprintDialogViewModel>();
+
+
+            #region 取药
+            // 处方取药页面
+            containerRegistry.RegisterForNavigation<OrderTakeDrugWindow, OrderTakeDrugWindowViewModel>();
+            // 处方取药模态框
+            containerRegistry.RegisterDialog<OrderTakeDialog>();
+            containerRegistry.RegisterForNavigation<OrderTakeDialog, OrderTakeDialogViewModel>();
+            // 调拨取药页面
+            containerRegistry.RegisterForNavigation<InvoiceOutWindow, InvoiceOutWindowViewModel>();
+            // 调拨取药模态框
+            containerRegistry.RegisterDialog<InvoiceTakeDialog>();
+            containerRegistry.RegisterForNavigation<InvoiceTakeDialog, InvoiceTakeDialogViewModel>();
+            // 抽屉取药页面
+            containerRegistry.RegisterForNavigation<DrawerTakeDrugWindow, DrawerTakeDrugWindowViewModel>();
+            // 自选取药模态框
+            containerRegistry.RegisterDialog<SelfTakeDialog>();
+            containerRegistry.RegisterForNavigation<SelfTakeDialog, SelfTakeDialogViewModel>();
+            // 自选取药页面
+            containerRegistry.RegisterForNavigation<SelfTakeDrugWindow, SelfTakeDrugWindowViewModel>();
+
+            //多批次抽屉取药
+            containerRegistry.RegisterForNavigation<TakeDrugControl, TakeDrugControlViewModel>();
+
+            #endregion
+
+            #region 加药
+            // 自选加药页面
+            containerRegistry.RegisterForNavigation<SelfAddWindow, SelfAddWindowViewModel>();
+            // 调拨加药页面
+            containerRegistry.RegisterForNavigation<InvoiceInWindow, InvoiceInWindowViewModel>();
+
+            // 调拨取药模态框
+            containerRegistry.RegisterDialog<InvoiceAddDialog>();
+            containerRegistry.RegisterForNavigation<InvoiceAddDialog, InvoiceAddDialogViewModel>();
+            // 抽屉加药页面
+            containerRegistry.RegisterForNavigation<DrawerAddDrugWindow, DrawerAddDrugWindowViewModel>();
+            containerRegistry.RegisterDialog<AddManunoDialog>();
+            containerRegistry.RegisterForNavigation<AddManunoDialog, AddManunoDialogViewModel>();
+            // 自选加药模态框
+            containerRegistry.RegisterDialog<SelfAddDialog>();
+            containerRegistry.RegisterForNavigation<SelfAddDialog, SelfAddDialogViewModel>();
+            //多批次抽屉加药
+            containerRegistry.RegisterForNavigation<AddDrugControl, AddDrugControlViewModel>();
+
+            #endregion
+
+            #region 还药
+            // 还药页面
+            containerRegistry.RegisterForNavigation<ReturnDrugWindow, ReturnDrugWindowViewModel>();
+            // 按记录归还药品模态框
+            containerRegistry.RegisterDialog<ReturnDrugDialog>();
+            containerRegistry.RegisterForNavigation<ReturnDrugDialog, ReturnDrugDialogViewModel>();
+
+            // 还药页面2
+            containerRegistry.RegisterForNavigation<ReturnDrugWindow2, ReturnDrugWindow2ViewModel>();
+            // 按处方归还药品模态框
+            containerRegistry.RegisterDialog<OrderReturnDialog>();
+            containerRegistry.RegisterForNavigation<OrderReturnDialog, OrderReturnDialogViewModel>();
+            // 还空瓶页面
+            containerRegistry.RegisterForNavigation<ReturnEmptyWindow, ReturnEmptyWindowViewModel>();
+            // 归还空瓶模态框
+            containerRegistry.RegisterDialog<ReturnEmptyDialog>();
+            containerRegistry.RegisterForNavigation<ReturnEmptyDialog, ReturnEmptyDialogViewModel>();
+            #endregion
+
+            #region 库存管理
+            // 库存列表页面
+            containerRegistry.RegisterForNavigation<StockListWindow, StockListWindowViewModel>();
+            // 库位绑定模态框
+            containerRegistry.RegisterDialog<BindingChannelDialog>();
+            containerRegistry.RegisterForNavigation<BindingChannelDialog, BindingChannelDialogViewModel>();
+            // 库位绑定模态框
+            containerRegistry.RegisterDialog<BindingChannelNewDialog>();
+            containerRegistry.RegisterForNavigation<BindingChannelNewDialog, BindingChannelNewDialogViewModel>();
+            // 库存盘点页面
+            containerRegistry.RegisterForNavigation<CheckStockWindow, CheckStockWindowViewModel>();
+            // 药品列表页面
+            containerRegistry.RegisterForNavigation<DrugListWindow, DrugListWindowViewModel>();
+
+            #endregion
+
+            #region 系统设置
+            // 用户管理页面
+            containerRegistry.RegisterForNavigation<UserManagerWindow, UserManagerWindowViewModel>();
+            // 编辑用户模态框
+            containerRegistry.RegisterDialog<EditUserDialog>();
+            containerRegistry.RegisterForNavigation<EditUserDialog, EditUserDialogViewModel>();
+            // 角色管理页面
+            containerRegistry.RegisterForNavigation<RoleManagerWindow, RoleManagerWindowViewModel>();
+            // 系统设置
+            containerRegistry.RegisterForNavigation<SettingWindow, SettingWindowViewModel>();
+            // 调试页面
+            containerRegistry.RegisterForNavigation<DebugWindow, DebugWindowViewModel>();
+
+            #endregion
+
+            // 设备记录页面
+            containerRegistry.RegisterForNavigation<MachineRecordWindow, MachineRecordWindowViewModel>();
+
+            containerRegistry.RegisterForNavigation<ShowMessageDialog, ShowMessageDialogViewModel>();
+
+            //交接班
+            containerRegistry.RegisterForNavigation<ChangeShiftsWindow, ChangeShiftsWindowViewModel>();
+            //交接班记录
+            containerRegistry.RegisterForNavigation<ChangeShiftsListWindow, ChangeShiftsListWindowViewModel>();
+
+
+
+            //交接班
+            containerRegistry.RegisterForNavigation<ChangeShiftsDialog, ChangeShiftsDialogViewModel>();
+
+        }
+    }
+}
diff --git a/DM_Weight/AssemblyInfo.cs b/DM_Weight/AssemblyInfo.cs
new file mode 100644
index 0000000..8b5504e
--- /dev/null
+++ b/DM_Weight/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
+)]
diff --git a/DM_Weight/Components/pagination/Pagination.xaml b/DM_Weight/Components/pagination/Pagination.xaml
new file mode 100644
index 0000000..8b3eee6
--- /dev/null
+++ b/DM_Weight/Components/pagination/Pagination.xaml
@@ -0,0 +1,43 @@
+<UserControl x:Class="DM_Weight.Components.pagination.Pagination"
+             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.Components.pagination"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes">
+
+    
+    <Grid>
+        <StackPanel Margin="0 6 20 6" HorizontalAlignment="Right" Orientation="Horizontal">
+            <TextBlock x:Name="InfoBlock" Padding="0 0 6 0" VerticalAlignment="Center" />
+            <Button
+                ToolTip="首页"
+                Style="{StaticResource MaterialDesignIconForegroundButton}"
+                Command="{x:Static local:Pagination.FirstCommand}"
+                Name="First"
+                Content="{materialDesign:PackIcon PageFirst}" />
+            <Button
+                ToolTip="上一页"
+                Style="{StaticResource MaterialDesignIconForegroundButton}"
+                Command="{x:Static local:Pagination.PrevCommand}"
+                Name="Prve"
+                Content="{materialDesign:PackIcon ChevronLeft}"/>
+
+            <TextBlock x:Name="CurrentPageText" Padding="6 0 6 0" VerticalAlignment="Center" />
+
+            <Button
+                ToolTip="下一页"
+                Style="{StaticResource MaterialDesignIconForegroundButton}"
+                Command="{x:Static local:Pagination.NextCommand}"
+                Name="Next"
+                Content="{materialDesign:PackIcon ChevronRight}"/>
+
+            <Button
+                ToolTip="末页"
+                Style="{StaticResource MaterialDesignIconForegroundButton}"
+                Command="{x:Static local:Pagination.EndCommand}"
+                Name="End"
+                Content="{materialDesign:PackIcon PageLast}" />
+        </StackPanel>
+    </Grid>
+</UserControl>
diff --git a/DM_Weight/Components/pagination/Pagination.xaml.cs b/DM_Weight/Components/pagination/Pagination.xaml.cs
new file mode 100644
index 0000000..3b404f6
--- /dev/null
+++ b/DM_Weight/Components/pagination/Pagination.xaml.cs
@@ -0,0 +1,265 @@
+using NetTaste;
+using Prism.Commands;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
+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.Components.pagination
+{
+    /// <summary>
+    /// Pagination.xaml 的交互逻辑
+    /// </summary>
+    public partial class Pagination : UserControl
+    {
+        public Pagination()
+        {
+            InitializeComponent();
+            ResetInfoText();
+            ResetCurrentPageText();
+        }
+
+        static Pagination()
+        {
+            InitializeCommands();
+
+        }
+
+        private static readonly Type _typeofSelf = typeof(Pagination);
+
+
+        private static void InitializeCommands()
+        {
+            FirstCommand = new RoutedCommand("First", _typeofSelf);
+            PrevCommand = new RoutedCommand("Prev", _typeofSelf);
+            NextCommand = new RoutedCommand("Next", _typeofSelf);
+            EndCommand = new RoutedCommand("End", _typeofSelf);
+
+
+            CommandManager.RegisterClassCommandBinding(_typeofSelf,
+                new CommandBinding(FirstCommand, OnFirstComman, OnCanFirstComman));
+            CommandManager.RegisterClassCommandBinding(_typeofSelf,
+                new CommandBinding(PrevCommand, OnPrevCommand, OnCanPrevCommand));
+            CommandManager.RegisterClassCommandBinding(_typeofSelf,
+                new CommandBinding(NextCommand, OnNextCommand, OnCanNextCommand));
+            CommandManager.RegisterClassCommandBinding(_typeofSelf,
+                new CommandBinding(EndCommand, OnEndCommand, OnCanEndCommand));
+        }
+
+        
+
+        public static RoutedCommand FirstCommand { get; private set; }
+        private static void OnFirstComman(object sender, RoutedEventArgs e)
+        {
+            var ctrl = sender as Pagination;
+            ctrl.CurrentPage = 1;
+        }
+
+        private static void OnCanFirstComman(object sender, CanExecuteRoutedEventArgs e)
+        {
+            var ctrl = sender as Pagination;
+            e.CanExecute = ctrl.CurrentPage > 1;
+        }
+
+        public static RoutedCommand PrevCommand { get; private set; }
+        private static void OnPrevCommand(object sender, RoutedEventArgs e)
+        {
+            var ctrl = sender as Pagination;
+            ctrl.CurrentPage--;
+        }
+
+        private static void OnCanPrevCommand(object sender, CanExecuteRoutedEventArgs e)
+        {
+            var ctrl = sender as Pagination;
+            e.CanExecute = ctrl.CurrentPage > 1;
+        }
+
+        public static RoutedCommand NextCommand { get; private set; }
+
+        private static void OnNextCommand(object sender, RoutedEventArgs e)
+        {
+            var ctrl = sender as Pagination;
+            ctrl.CurrentPage++;
+        }
+
+        private static void OnCanNextCommand(object sender, CanExecuteRoutedEventArgs e)
+        {
+            var ctrl = sender as Pagination;
+            e.CanExecute = ctrl.CurrentPage < ctrl.PageCount;
+        }
+        public static RoutedCommand EndCommand { get; private set; }
+        private static void OnEndCommand(object sender, RoutedEventArgs e)
+        {
+            var ctrl = sender as Pagination;
+            ctrl.CurrentPage = ctrl.PageCount;
+        }
+
+        private static void OnCanEndCommand(object sender, CanExecuteRoutedEventArgs e)
+        {
+            var ctrl = sender as Pagination;
+            e.CanExecute = ctrl.CurrentPage < ctrl.PageCount;
+        }
+
+
+
+        // 默认当前页码
+        public static int DefaultCurrentPage = 1;
+        // 默认总条数
+        public static int DefaultTotalPages = 0;
+        // 默认每页条数列表
+        public static List<int> DefaultPageSizeList = new List<int> { 10, 20, 50, 100 };
+        // 是否显示页码条数信息
+        public static bool DefaultInfoTextIsEnabel = true;
+        // 默认每页条数
+        public static int DefaultPageSize = 10;
+
+
+        public static readonly DependencyProperty CurrentPageProperty = DependencyProperty
+                .Register("CurrentPage",
+                typeof(int),
+                typeof(Pagination),
+                new FrameworkPropertyMetadata(DefaultCurrentPage, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
+        public static readonly DependencyProperty PageSizeProperty = DependencyProperty
+                .Register("PageSize",
+                typeof(int),
+                typeof(Pagination),
+                new FrameworkPropertyMetadata(DefaultPageSize, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
+        public static readonly DependencyProperty TotalPagesProperty = DependencyProperty
+                .Register("TotalPages",
+                typeof(int),
+                typeof(Pagination),
+                new FrameworkPropertyMetadata(DefaultTotalPages, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, new PropertyChangedCallback(OnItemsSourceChanged)));
+        public static readonly DependencyProperty InfoTextIsEnabelProperty = DependencyProperty
+                .Register("InfoTextIsEnabel",
+                typeof(bool),
+                typeof(Pagination),
+                new FrameworkPropertyMetadata(DefaultInfoTextIsEnabel, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
+        private static void OnItemsSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            Pagination p = (Pagination)d;
+
+            p.ResetInfoText();
+        }
+
+        [Bindable(true)]
+        [Category("Appearance")]
+        public int CurrentPage
+        {
+            get { return (int)GetValue(CurrentPageProperty); }
+            set
+            {
+                SetValue(CurrentPageProperty, value);
+                if (InfoTextIsEnabel)
+                {
+                    ResetInfoText();
+                }
+                ResetCurrentPageText();
+            }
+        }
+
+
+        //private static void OnCurrentPageChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        //{
+        //    Pagination p = d as Pagination;
+
+        //    if (p != null)
+        //    {
+        //        Console.WriteLine(e.NewValue);
+        //    }
+        //}
+
+        [Bindable(true)]
+        [Category("Appearance")]
+        public int PageSize
+        {
+            get { return (int)GetValue(PageSizeProperty); }
+            set
+            {
+                SetValue(PageSizeProperty, value);
+                if (InfoTextIsEnabel)
+                {
+                    ResetInfoText();
+                }
+                ResetCurrentPageText();
+            }
+        }
+
+
+        [Bindable(true)]
+        [Category("Appearance")]
+        public int TotalPages
+        {
+            get { return (int)GetValue(TotalPagesProperty); }
+            set
+            { 
+                SetValue(TotalPagesProperty, value);
+                if (InfoTextIsEnabel)
+                {
+                    ResetInfoText();
+                }
+                ResetCurrentPageText();
+            }
+        }
+
+        public bool InfoTextIsEnabel
+        {
+            get { return (bool)GetValue(InfoTextIsEnabelProperty); }
+            set { SetValue(InfoTextIsEnabelProperty, value); }
+        }
+
+        public int PageCount
+        {
+            get => (int)Math.Ceiling((double)TotalPages / PageSize);
+        }
+
+
+        public void ResetInfoText()
+        {
+            this.Dispatcher.BeginInvoke(() =>
+            {
+                if (InfoTextIsEnabel)
+                {
+                    if (TotalPages <= PageSize)
+                    {
+                        this.InfoBlock.Text = $"1-{TotalPages}/{TotalPages}";
+                        if (TotalPages == 0)
+                        {
+                            this.InfoBlock.Text = $"0-{TotalPages}/{TotalPages}";
+                        }
+                    } else
+                    {
+                        this.InfoBlock.Text = ((CurrentPage - 1) * PageSize + 1) + "-" + (CurrentPage * PageSize > TotalPages ? TotalPages : CurrentPage * PageSize) + "/" + TotalPages;
+                    }
+                    
+                } else
+                {
+                    this.InfoBlock.Visibility = Visibility.Visible;
+                }
+                
+            });
+            
+        }
+
+        public void ResetCurrentPageText()
+        {
+            this.Dispatcher.BeginInvoke(() =>
+            { 
+                this.CurrentPageText.Text = CurrentPage + "";
+            });
+
+        }
+
+    }
+}
diff --git a/DM_Weight/Components/pagination/PaginationViewModel.cs b/DM_Weight/Components/pagination/PaginationViewModel.cs
new file mode 100644
index 0000000..00a7f0b
--- /dev/null
+++ b/DM_Weight/Components/pagination/PaginationViewModel.cs
@@ -0,0 +1,81 @@
+using Prism.Commands;
+using Prism.Mvvm;
+using Prism.Regions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace DM_Weight.Components.pagination
+{
+    public class PaginationViewModel: BindableBase, IRegionMemberLifetime
+    {
+        public static readonly DependencyProperty PageSizeProperty = DependencyProperty
+        .Register("CurrentPage",
+                typeof(int),
+                typeof(Pagination),
+                new FrameworkPropertyMetadata(10));
+
+        // 每页条数
+        private int _pageSize = 10;
+        // 当前页码
+        private int _currentPage = 1;
+        // 总条数
+        private int _totalPages = 0;
+        
+        public int PageSize { get=> _pageSize;  set => SetProperty(ref _pageSize, value); }
+        public int CurrentPage { get => _currentPage; set => SetProperty(ref _currentPage, value); }
+        public int TotalPages { get => _totalPages; set => SetProperty(ref _totalPages, value); }
+        // 总页数 
+        public int PageCount
+        {
+            get => (int)Math.Ceiling((double)TotalPages/ PageSize);
+        }
+
+        public string InfoText
+        {
+            get => ((CurrentPage - 1) * PageSize + 1) + "-" + (CurrentPage * PageSize > TotalPages ? TotalPages : CurrentPage * PageSize) + "/" + TotalPages;
+        }
+
+        public bool KeepAlive => false;
+
+
+        public DelegateCommand ToFirst
+        {
+            get => new(() =>
+            {
+                CurrentPage = 1;
+            });
+        }
+
+
+
+        public DelegateCommand ToPrve
+        {
+            get => new(() =>
+            {
+                CurrentPage -= 1;
+            });
+        }
+
+        public DelegateCommand ToNext
+        {
+            get => new(() =>
+            {
+                CurrentPage += 1;
+            });
+        }
+
+        public DelegateCommand ToEnd
+        {
+            get => new(() =>
+            {
+                CurrentPage = PageCount;
+            });
+        }
+
+
+    }
+}
diff --git a/DM_Weight/Converter/BoardTypeConverter.cs b/DM_Weight/Converter/BoardTypeConverter.cs
new file mode 100644
index 0000000..2214dc8
--- /dev/null
+++ b/DM_Weight/Converter/BoardTypeConverter.cs
@@ -0,0 +1,106 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace DM_Weight.Converter
+{
+    public class BoardTypeConverter : IMultiValueConverter
+    {
+        public object Convert(object[] value, Type targetType, object parameter, CultureInfo culture)
+        {
+            int BoardType = int.Parse(value[0].ToString());
+            int DrawerType = int.Parse(value[1].ToString());
+            switch (BoardType)
+            {
+                case 1:
+                    if (DrawerType == 1)
+                    {
+                        return "物理隔断";
+                    }
+                    else if(DrawerType == 2)
+                    {
+                        return "内置回收";
+                    }
+                    else
+                    {
+                        return "外置回收";
+                    }
+                case 2:
+                    if (DrawerType == 1)
+                    {
+                        return "单支计数";
+                    }
+                    else if (DrawerType == 2)
+                    {
+                        return "计数回收(内置)";
+                    }
+                    else
+                    {
+                        return "计数回收(外置)";
+                    }
+                case 3:
+                    if (DrawerType == 1)
+                    {
+                        return "管控药盒";
+                    }
+                    else if (DrawerType == 2)
+                    {
+                        return "药盒回收(内置)";
+                    }
+                    else
+                    {
+                        return "外置回收";
+                    }
+                case 4:
+                    if (DrawerType == 1)
+                    {
+                        return "冰箱";
+                    }
+                    else if (DrawerType == 2)
+                    {
+                        return "内置回收";
+                    }
+                    else
+                    {
+                        return "外置回收";
+                    }
+                case 5:
+                    if (DrawerType == 1)
+                    {
+                        return "智能显示";
+                    }
+                    else if (DrawerType == 2)
+                    {
+                        return "内置回收";
+                    }
+                    else
+                    {
+                        return "外置回收";
+                    }
+                case 6:
+                    if (DrawerType == 1)
+                    {
+                        return "称重计数";
+                    }
+                    else if (DrawerType == 2)
+                    {
+                        return "称重回收(内置)";
+                    }
+                    else
+                    {
+                        return "计数回收(外置)";
+                    }
+            }
+            return "";
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/DM_Weight/Converter/ChangeShiftsStatusConverter.cs b/DM_Weight/Converter/ChangeShiftsStatusConverter.cs
new file mode 100644
index 0000000..7643da4
--- /dev/null
+++ b/DM_Weight/Converter/ChangeShiftsStatusConverter.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Data;
+
+namespace DM_Weight.Converter
+{
+    public class ChangeShiftsStatusConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            bool status = bool.Parse(value.ToString());
+            return false;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/DM_Weight/Converter/DrawerSelectConverter.cs b/DM_Weight/Converter/DrawerSelectConverter.cs
new file mode 100644
index 0000000..be5086c
--- /dev/null
+++ b/DM_Weight/Converter/DrawerSelectConverter.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Data;
+
+namespace DM_Weight.Converter
+{
+    internal class DrawerSelectConverter : IMultiValueConverter
+    {
+        public object Convert(object[] value, Type targetType, object parameter, CultureInfo culture)
+        {
+            int ButtonDrawerNo = int.Parse(value[0].ToString());
+            int SelectedDrawerNo = int.Parse(value[1].ToString());
+            return ButtonDrawerNo == SelectedDrawerNo;
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/DM_Weight/Converter/ForeColorConverter.cs b/DM_Weight/Converter/ForeColorConverter.cs
new file mode 100644
index 0000000..6d4f00a
--- /dev/null
+++ b/DM_Weight/Converter/ForeColorConverter.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace DM_Weight.Converter
+{
+    public class ForeColorConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if((bool)value)
+            {
+                return "#3ECFED";
+            }
+            else
+            {
+                return "#808080";
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/DM_Weight/Converter/GroupSumConverter.cs b/DM_Weight/Converter/GroupSumConverter.cs
new file mode 100644
index 0000000..3907e37
--- /dev/null
+++ b/DM_Weight/Converter/GroupSumConverter.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+using DM_Weight.Models;
+
+namespace DM_Weight.Converter
+{
+    public class GroupSumConverter : IValueConverter
+    {
+        #region 分组组内求和
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            var total = 0;
+            // DataGrid分组后对应的组及组内元素CollectionViewGroup.Items 类型是ReadOnlyObservableCollection<object>
+            if (value is ReadOnlyObservableCollection<object> items)
+            {
+                foreach (var item in items)
+                {
+                    var de = item as ChannelStock;
+                    total += de.Quantity;
+                }
+            }
+            return "总库存：" + total;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+
+    }
+}
diff --git a/DM_Weight/Converter/InputQuantityConverter.cs b/DM_Weight/Converter/InputQuantityConverter.cs
new file mode 100644
index 0000000..9ff3c77
--- /dev/null
+++ b/DM_Weight/Converter/InputQuantityConverter.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace DM_Weight.Converter
+{
+    public class InputQuantityConverter : IValueConverter
+    {
+        public bool ReadOnlyValue { get; set; } = true;
+        public bool NotReadOnlyValue { get; set; } = false;
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return int.Parse(value.ToString()) == 2 || int.Parse(value.ToString()) == 6 ? ReadOnlyValue : NotReadOnlyValue;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return Binding.DoNothing;
+        }
+    }
+}
diff --git a/DM_Weight/Converter/MachineTypeConverter.cs b/DM_Weight/Converter/MachineTypeConverter.cs
new file mode 100644
index 0000000..3a4e407
--- /dev/null
+++ b/DM_Weight/Converter/MachineTypeConverter.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Data;
+
+namespace DM_Weight.Converter
+{
+    internal class MachineTypeConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            int status = int.Parse(value.ToString());
+            //完成
+            if (parameter.ToString().Equals("drugNameSearch"))
+            {
+                if ((status == 1) || (status == 2))
+                {
+                    return Visibility.Visible;
+                }
+                else
+                {
+                    return Visibility.Collapsed;
+                }
+            }
+            if(parameter.ToString().Equals("saveBtn"))
+            {
+                if(status==1)
+                {
+                    return Visibility.Visible;
+                }
+                else
+                {
+                    return Visibility.Collapsed;
+                }
+            }
+            if(parameter.ToString().Equals("gridviewColumn"))
+            {
+                if(status== 1)
+                {
+                    return 150;
+                }
+                else
+                {
+                    return 0;
+                }
+            }
+            return Visibility.Collapsed;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/DM_Weight/Converter/NullableToEnabelConverter.cs b/DM_Weight/Converter/NullableToEnabelConverter.cs
new file mode 100644
index 0000000..d332458
--- /dev/null
+++ b/DM_Weight/Converter/NullableToEnabelConverter.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+using System.Windows;
+
+namespace DM_Weight.Converter
+{
+    public class NullableToEnabelConverter : IValueConverter
+    {
+        public bool NullValue { get; set; } = false;
+        public bool NotNullValue { get; set; } = true;
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value == null ? NullValue : NotNullValue;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return Binding.DoNothing;
+        }
+    }
+}
diff --git a/DM_Weight/Converter/OrderStatusConverter.cs b/DM_Weight/Converter/OrderStatusConverter.cs
new file mode 100644
index 0000000..4cc8d1d
--- /dev/null
+++ b/DM_Weight/Converter/OrderStatusConverter.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace DM_Weight.Converter
+{
+    public class OrderStatusConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            string strRet = string.Empty;
+            switch (value.ToString())
+            {
+                case "0":
+                    strRet = "待取药";
+                    break;
+                    case "1":
+                    strRet = "已取药";
+                    break;
+                    case "2":
+                    strRet = "已退回";
+                    break;
+                default:
+                    break;
+            }
+            return strRet;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/DM_Weight/Converter/PaginationConverter.cs b/DM_Weight/Converter/PaginationConverter.cs
new file mode 100644
index 0000000..d6ed215
--- /dev/null
+++ b/DM_Weight/Converter/PaginationConverter.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace DM_Weight.Converter
+{
+    public class PaginationConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            string type = values[0].ToString();
+
+            if (!string.IsNullOrEmpty(type) && "First".Equals(type))
+            {
+                int CurrentPage = int.Parse(values[1].ToString());
+                return CurrentPage > 1;
+            }
+            if (!string.IsNullOrEmpty(type) && "Prve".Equals(type))
+            {
+                int CurrentPage = int.Parse(values[1].ToString());
+                return CurrentPage > 1;
+            }
+            if (!string.IsNullOrEmpty(type) && "Next".Equals(type))
+            {
+                int CurrentPage = int.Parse(values[1].ToString());
+                int PageCount = int.Parse(values[2].ToString());
+                return PageCount > CurrentPage;
+            }
+            if (!string.IsNullOrEmpty(type) && "End".Equals(type))
+            {
+                int CurrentPage = int.Parse(values[1].ToString());
+                int PageCount = int.Parse(values[2].ToString());
+                return PageCount > CurrentPage;
+            }
+            if (!string.IsNullOrEmpty(type) && "InfoText".Equals(type))
+            {
+                int CurrentPage = int.Parse(values[1].ToString());
+                int PageCount = int.Parse(values[2].ToString());
+                int PageSize = int.Parse(values[3].ToString());
+                int TotalPages = int.Parse(values[4].ToString());
+
+                return ((CurrentPage - 1) * PageSize + 1) + "-" + (CurrentPage * PageSize > TotalPages ? TotalPages : CurrentPage * PageSize) + "/" + TotalPages; ;
+            }
+            return false;
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/DM_Weight/Converter/QuantityCountConverter.cs b/DM_Weight/Converter/QuantityCountConverter.cs
new file mode 100644
index 0000000..c82e843
--- /dev/null
+++ b/DM_Weight/Converter/QuantityCountConverter.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace DM_Weight.Converter
+{
+    public class QuantityCountConverter : IValueConverter
+    {
+        public bool IsEnabled { get; set; } = true;
+        public bool NotIsEnabled { get; set; } = false;
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if ((int)value> 0)
+            {
+                return false;
+            }
+            else
+            {
+                return true;
+            }
+
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/DM_Weight/Converter/ShiftsStateConverter.cs b/DM_Weight/Converter/ShiftsStateConverter.cs
new file mode 100644
index 0000000..6888b3e
--- /dev/null
+++ b/DM_Weight/Converter/ShiftsStateConverter.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace DM_Weight.Converter
+{
+    public class ShiftsStateConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if(value.ToString().Equals("1"))
+            {
+                return "已交班";
+            }
+            else
+            {
+                return "未交班";
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/DM_Weight/Converter/StatusConverter.cs b/DM_Weight/Converter/StatusConverter.cs
new file mode 100644
index 0000000..8a1a5d8
--- /dev/null
+++ b/DM_Weight/Converter/StatusConverter.cs
@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Data;
+
+namespace DM_Weight.Converter
+{
+    internal class StatusConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            int status = int.Parse(value.ToString());
+            //完成
+            if (parameter.ToString().Equals("CompleteBtn"))
+            {
+                if (status == 3)
+                {
+                    return Visibility.Visible;
+                }
+                else
+                {
+                    return Visibility.Collapsed;
+                }
+            }
+            //关闭
+            if (parameter.ToString().Equals("CloseBtn"))
+            {
+                if (status > 0 && status < 3)
+                {
+                    return false;
+                }
+                else
+                {
+                    return true;
+                }
+            }
+            if (parameter.ToString().Equals("opearBtnLoading"))
+            {
+                if (status > 0 && status < 3)
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            //取药
+            if (parameter.ToString().Equals("opearBtnVisible"))
+            {
+                if (status < 3)
+                {
+                    return Visibility.Visible;
+                }
+                else
+                {
+                    return Visibility.Collapsed;
+                }
+            }
+            //取消
+            if (parameter.ToString().Equals("CancelBtn"))
+            {
+                if (status > 0)
+                {
+                    return Visibility.Visible;
+                }
+                else
+                {
+                    return Visibility.Collapsed;
+                }
+            }
+
+            return Visibility.Collapsed;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/DM_Weight/CustomAttribute/MessageAttribute.cs b/DM_Weight/CustomAttribute/MessageAttribute.cs
new file mode 100644
index 0000000..12d25cb
--- /dev/null
+++ b/DM_Weight/CustomAttribute/MessageAttribute.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight
+{
+    public sealed class MessageAttribute : Attribute
+    {
+        public MessageAttribute()
+        {
+
+        }
+        public MessageAttribute(int value)
+        {
+
+        }
+    }
+}
diff --git a/DM_Weight/DM_Weight.csproj b/DM_Weight/DM_Weight.csproj
new file mode 100644
index 0000000..d0599e0
--- /dev/null
+++ b/DM_Weight/DM_Weight.csproj
@@ -0,0 +1,128 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWPF>true</UseWPF>
+    <PackageIcon></PackageIcon>
+    <Product>毒麻管理程序</Product>
+    <ApplicationIcon>Images\favicon.ico</ApplicationIcon>
+  </PropertyGroup>
+
+	<ItemGroup>
+		<None Remove="Images\body-bg.jpg" />
+		<None Remove="Images\box-16.jpg" />
+		<None Remove="Images\box.png" />
+		<None Remove="Images\favicon.ico" />
+		<None Remove="Images\finger-bg-r.png" />
+		<None Remove="Images\logo.png" />
+		<None Remove="Images\TbExit.png" />
+		<None Remove="Images\TbJiay.png" />
+		<None Remove="Images\TbKuc.png" />
+		<None Remove="Images\TbQyao.png" />
+		<None Remove="Images\TbSet.png" />
+		<None Remove="Images\TbTuiy.png" />
+	</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>
+      <VersionMajor>6</VersionMajor>
+      <Guid>4018f953-1bfe-441e-8a04-dc8ba1ff060e</Guid>
+      <Lcid>0</Lcid>
+      <Isolated>false</Isolated>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </COMReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="Images\favicon.ico" />
+  </ItemGroup>
+
+  <ItemGroup>
+	<Resource Include="Images\body-bg.jpg" />
+    <Resource Include="Images\box-16.jpg" />
+    <Resource Include="Images\box.png" />
+    <Resource Include="Images\favicon.ico" />
+    <Resource Include="Images\finger-bg-r.png" />
+    <Resource Include="Images\logo.png" />
+    <Resource Include="Images\TbExit.png" />
+    <Resource Include="Images\TbJiay.png" />
+    <Resource Include="Images\TbKuc.png" />
+    <Resource Include="Images\TbQyao.png" />
+    <Resource Include="Images\TbSet.png" />
+    <Resource Include="Images\TbTuiy.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="log4net" Version="2.0.15" />
+    <PackageReference Include="MaterialDesignThemes" Version="4.8.0" />
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
+    <PackageReference Include="Prism.Unity" Version="8.1.97" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.67" />
+    <PackageReference Include="SuperSimpleTcp" Version="3.0.10" />
+    <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
+    <PackageReference Include="System.IO.Ports" Version="7.0.0" />
+    <PackageReference Include="System.Management" Version="7.0.1" />
+    <PackageReference Include="System.Reactive" Version="5.0.0" />
+    <PackageReference Include="System.Speech" Version="7.0.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ApplicationDefinition Update="App.xaml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </ApplicationDefinition>
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="App.config">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </None>
+    <None Update="log4net.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="ReportTemp\changeShifts_temp.grf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="ReportTemp\account_book_temp.grf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="ReportTemp\changeShifts_temp.grf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="ReportTemp\machine_log_check.grf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="ReportTemp\machine_log_return.grf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="ReportTemp\machine_log_add.grf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="ReportTemp\machine_log_take.grf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="ReportTemp\stock_template.grf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Page Update="Views\Dialog\InvoiceTakeDialog.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+  </ItemGroup>
+
+</Project>
diff --git a/DM_Weight/Finger/FingerprintUtil.cs b/DM_Weight/Finger/FingerprintUtil.cs
new file mode 100644
index 0000000..148cef7
--- /dev/null
+++ b/DM_Weight/Finger/FingerprintUtil.cs
@@ -0,0 +1,174 @@
+using log4net;
+using log4net.Repository.Hierarchy;
+using Microsoft.Data.SqlClient.Server;
+using Newtonsoft.Json;
+using Prism.Events;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DM_Weight.Models;
+using DM_Weight.msg;
+using DM_Weight.util;
+using zkemkeeper;
+namespace DM_Weight.Finger
+{
+    public class FingerprintUtil
+    {
+
+        private readonly ILog logger = LogManager.GetLogger(typeof(FingerprintUtil));
+        public zkemkeeper.CZKEMClass axCZKEM1; //= new zkemkeeper.CZKEMClass();
+        public bool bIsConnected = false;
+
+        private string fingerIp = ConfigurationManager.AppSettings["fingerIp"].ToString();
+        private int fingerPort = 4370;
+        private int machineNumber = Convert.ToInt32(ConfigurationManager.AppSettings["machineNumber"].ToString());
+        private int machineType = Convert.ToInt32(ConfigurationManager.AppSettings["machineType"].ToString());
+        private readonly IEventAggregator _eventAggregator;
+        public FingerprintUtil(IEventAggregator eventAggregator)
+        {
+            _eventAggregator = eventAggregator;
+            logger.Info($"进入构造器，开始连接指纹机");
+            Task.Run(() =>
+           {
+               ConnectionMain();
+           });
+        }
+
+        public void ConnectionMain()
+        {
+            try
+            {
+                axCZKEM1 = new CZKEMClass();
+                bIsConnected = axCZKEM1.Connect_Net(fingerIp, fingerPort);
+                logger.Info($"连接指纹机,IP:{fingerIp},端口:{fingerPort},机器号:{machineNumber},连接结果:{bIsConnected}");
+                if (bIsConnected)
+                {
+                    if (axCZKEM1.RegEvent(machineNumber, 65535))
+                    {
+                        this.axCZKEM1.OnAttTransactionEx += new zkemkeeper._IZKEMEvents_OnAttTransactionExEventHandler(axCZKEM1_OnAttTransactionEx);
+                        //this.axCZKEM1.OnEnrollFinger += new zkemkeeper._IZKEMEvents_OnEnrollFingerEventHandler(axCZKEM1_OnEnrollFinger);
+                        this.axCZKEM1.OnEnrollFingerEx += new zkemkeeper._IZKEMEvents_OnEnrollFingerExEventHandler(axCZKEM1_OnEnrollFingerEx);
+
+                    }
+                }
+
+                _eventAggregator.GetEvent<FingerprintEvent>().Publish(new FingerprintMsg()
+                {
+                    Message = "CONNECT",
+                    Result = bIsConnected,
+                });
+            }
+            catch(Exception ex)
+            {
+                logger.Info($"连接指纹机异常{ex.Message.ToString()}");
+            }
+        }
+
+        //If your fingerprint(or your card) passes the verification,this event will be triggered
+        private void axCZKEM1_OnAttTransactionEx(string sEnrollNumber, int iIsInValid, int iAttState, int iVerifyMethod, int iYear, int iMonth, int iDay, int iHour, int iMinute, int iSecond, int iWorkCode)
+        {
+            FingerprintMsg message = new FingerprintMsg()
+            {
+                Message = "LOGIN",
+                Id = Convert.ToInt32(sEnrollNumber),
+                VerifyMethod = iVerifyMethod
+            };
+            logger.Info($"触发用户验证通过事件，用户id:{sEnrollNumber}验证方式:{iVerifyMethod}");
+            _eventAggregator.GetEvent<FingerprintEvent>().Publish(message);
+        }
+
+        //When you are enrolling your finger,this event will be triggered.
+        private void axCZKEM1_OnEnrollFinger(int iEnrollNumber, int iFingerIndex, int iActionResult, int iTemplateLength)
+        {
+            FingerprintMsg message = new FingerprintMsg()
+            {
+                Message = "INS_FINGER",
+                Id = iEnrollNumber,
+                FingerIndex = iFingerIndex
+            };
+            
+            axCZKEM1.StartIdentify();
+            axCZKEM1.RefreshData(1);
+            
+            logger.Info($"触发用户登记指纹事件，用户id:{iEnrollNumber}指纹索引:{iFingerIndex}登记结果:{(iActionResult == 0)}");
+            message.Result = (iActionResult == 0);
+            _eventAggregator.GetEvent<FingerprintEvent>().Publish(message);
+        }
+
+        private void axCZKEM1_OnEnrollFingerEx(string iEnrollNumber, int iFingerIndex, int iActionResult, int iTemplateLength)
+        {
+            FingerprintMsg message = new FingerprintMsg()
+            {
+                Message = "INS_FINGER",
+                Id = Convert.ToInt32(iEnrollNumber),
+                FingerIndex = iFingerIndex
+            };
+            axCZKEM1.StartIdentify();
+            axCZKEM1.RefreshData(1);
+            logger.Info($"触发用户登记指纹事件1，用户id:{iEnrollNumber}指纹索引:{iFingerIndex}登记结果:{(iActionResult == 0)}");
+            message.Result = (iActionResult == 0);
+            _eventAggregator.GetEvent<FingerprintEvent>().Publish(message);
+        }
+
+        /**
+         * 删除用户
+         */
+        public bool DelUser(int Id)
+        {
+            bool result = false;
+            axCZKEM1.EnableDevice(machineNumber, false);
+            if (machineType == 1)
+            {
+                result = axCZKEM1.DeleteEnrollData(machineNumber, Id, machineNumber, 12);
+            }
+            else
+            {
+                result = axCZKEM1.SSR_DeleteEnrollData(machineNumber, Id.ToString(), 12);
+            }
+
+            axCZKEM1.RefreshData(machineNumber);
+            axCZKEM1.EnableDevice(machineNumber, true);
+            return result;
+        }
+
+        /**
+         * 添加或修改用户
+         */
+        public bool SaveUser(UserList User)
+        {
+            bool result = false;
+            axCZKEM1.SetStrCardNumber(User.UserBarcode);
+            if (machineType == 1)
+            {
+                result = axCZKEM1.SetUserInfo(machineNumber, User.Id, User.Nickname, "123456", 0, true);
+            }
+            else
+            {
+                result = axCZKEM1.SSR_SetUserInfo(machineNumber, User.Id.ToString(), User.Nickname, "123456", 0, true);
+            }
+            return result;
+        }
+
+        /**
+         * 添加或修改用户指纹
+         */
+        public bool SaveFingerprint(int Id, int FingerIndex)
+        {
+            bool result = false;
+            // 取消其他操作
+            bool res2 = axCZKEM1.CancelOperation();
+            // 删除源指纹
+            bool res = axCZKEM1.DelUserTmp(machineNumber, Id, FingerIndex);
+            // 添加新指纹
+            result = axCZKEM1.StartEnrollEx(Id.ToString(), FingerIndex, 3);
+            return result;
+        }
+
+
+
+    }
+}
diff --git a/DM_Weight/Images/TbExit.png b/DM_Weight/Images/TbExit.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae68ade0e8a277a51fc1454248b2a756d75194e5
GIT binary patch
literal 5613
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
TrMmU|2du89p++Ih{?Y#cG;c#z

literal 0
HcmV?d00001

diff --git a/DM_Weight/Images/TbJiay.png b/DM_Weight/Images/TbJiay.png
new file mode 100644
index 0000000000000000000000000000000000000000..98d40442879a035d9f5c7c878f85d9a2f7fb1157
GIT binary patch
literal 5521
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

literal 0
HcmV?d00001

diff --git a/DM_Weight/Images/TbKuc.png b/DM_Weight/Images/TbKuc.png
new file mode 100644
index 0000000000000000000000000000000000000000..50f7cdbb3e1d8dda650888295ddae56e49d7afe0
GIT binary patch
literal 20283
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
aVRhke5}TPGPF?@^cKX@}P}embLjNDn^j;qT

literal 0
HcmV?d00001

diff --git a/DM_Weight/Images/TbQyao.png b/DM_Weight/Images/TbQyao.png
new file mode 100644
index 0000000000000000000000000000000000000000..71b5306a402636cc9e05e3fff054bb6f52bdf61e
GIT binary patch
literal 5774
zcmbVQcRZDU-&csttdP+$BkK(3a74yAjx8&D9UPpD!*T4Dy^^x`NJa?BJoe6rR5Bw<
zgpe)k(eM8K?&taAe%*gO*Xz2j@A|yopZ&*m#pr0O&{Ex?A|WB6RZ~UkU5wyA59O7M
zH@AHBtBZl1plnRg$JrCS(Rd7rq8-i#15k58J7DxMXggo`0gNmO38^#Iz?fjHr72^J
za}h`XkrDTCal1g1kjTpWxS?&GFa&@N#sTXp$Gh3w&I`cW$?+ONwSZb~2#h0E)en!+
z_tQ48^>ea?+wscZ1<3lyToAZm2xx$hi?geTjE@}eU%WCG^FP}Xynw$%2u^am|1!#0
zO9z0!;V}THI84kI1OWr2;Nl=C94sv<3IGE^FbSZf1PCq$g2-Ill0d-U7w?5Oyq&#_
z9uoDpu8Wl%uOorrCL<x??d>h@4H3uT9WJnNxC9U^0S1d*NQim(x)RVnVy+&1|1cmi
z9=3R_8v%=R1^i(|+u%G2a=aIo{>udyH!ZDy6T5o+9jJ?tN%)}MBtYUo2^W_?e*Gow
zLD0keuNnVQ+QY!t4I`n4@xXcFZ7=d+&-V}bB6j~>(I3GJYh>=>u@^}}J0o$no-P<y
zf*Mke_u@p{4r?bPEe%nEAeCXtl1d<D7zm^YMSzh|DF_@TDFuN@A^zd`Pgt0wvN9B+
z3_^h<!61;bv?36!j6%Sq;7TA6P!cBn4_3|9gMfCm#r&fed!hGlEbzZ#We|7_nt;O_
z;Be0WRDg~nj)3!U#JK?wh(8&JibDZHMp#!noVSPYpCtXuXCwxX^}^Vp@HiL1Us0C9
z{s${S(kPfB1Ox<ulwg0nhl5~nX_yoWq<k?)z+k+8W9|Mwk(0PEM&eJ2{GXEfXX~O4
z|4jeg02hmYw-CnlqHpjQ4I;-lO-4e(*r<k7H1L_OHT8d#J?<%g;6GyPZSUpKy1%iw
zH`8aGtw4EIBI+9BWqz!xl9{mL%jhS+pWW6QS3em`Gz@%!Ei#NrRtSq#&s2D?TEv_v
zsUT#{WUERtGugNA*XrayahyKo8@TE3Khosg7a3~uVV9$?J7_0xUT$=LGuuPuWcubD
z%@91<;0rUC+u&u{8H!uW5A_&pM8hOC&^`gutb#cO)*w@T(d!exdr!y#Jr4!K3l$bm
z!JP?ylXTjIXV$z@U+(?(LI(vsfDv5iMQ5&rtns5SXAA>Oy1eg@qhl}w%N_pG;nx8A
zSKZkZg8=fm9y=4?esAA20|8I&o`Z2Om;LTjtLiEnWo7Z3lIpNt#b$~URy$vPw^>U$
z>wKSNk}b#jvFmH)=GN=^p;ykzs)8B$7zlN!7sc(bDb&;{i>!uL;Qh5g(xSM|E+;U#
zNv0xaiI8gr4jdcCSdl~un@lwmtJ*3f<s-eRV`ex%Rw3~-E6C+{vl?S?yH`t4$J=H<
zv2jRuGxvUdIZUjZoFvs&(e+)_uzFNvU*yL0VQ2h#<9?!N12I=ByN4kh9gR*^D%QE0
zQt<2kJ<6dPV`1UvbSfv7_Kb;Sg|z45yL+?=meTmZHoZg5>6lXhB^?poz-Qa!oRDqC
zV5`$1H0m~%vT5bHH<|kC7-rS9G{iQs)ThVwjNb+wJ`N?mi+u+-?1FK>J=85*Mh{Hr
z9~NP0u<43c!NI=cpHifJ$Tz#YqNG-t>V!kCAgQA(6-TWY@a6G_%5XiJl!ds+AluXZ
zz4Ka|fF<RhC=MAkM_wL#XYHP@WcA9G0%_Jax!2pkFIqpcgfmkVq!dsH1r?MqwutKj
z8_S4&Lq~a3g>IGb4}QJ-*C=-{Z<Y?vi15}rU$?);^L}!P@4%e!xz}oMrwLy&-sch1
z_Hb5#w-mzDQ6L~tM6=3Q%PN$us#SaUS=!a+O1lmvd%be)i5@gf#F>)28)C0mni{i%
z+%buh3zIS#G6-i79)orDu<)h5BsvV$nVk(^>8A~ST>skoSNsz}J}q$4QUq96m`py3
zA29l4i@lBL-bHm4IH9nKgHihRyE~T<>-{V^Rj{W%U*X!dG<h~=Lk468P+H(EagMXk
zVs~KY0>TWDA$0Vn+Su~_*$Qc(v5w_s=)jzvFOURqbd-Ezp`i2mq;tp_{mL6U2|56@
zHySR54nlQH^vks*Eo)<N+2=2#_q>{(qJ(K&OJ`etl*J!Rr+$r6>~PoKO!n3CM-0*s
z-l?`d9V^WmNnNo(ka-)vS-rN#6SL3xIYX7Hrf*Gnj@5=a-}dCK5suhEY{NqaJ|P}8
z+($ZcQ*tmIvN!~Mu5)TnT-%B20(^7R$$n#Jf@Cj>SY}?qlT*+;VnFxEvP`#Ik&%gL
zqZ%W|5m3B!vOfE*R<PfqMycgw;xcczSG&A?ExMmrC5`cyRbp5B^qOhj&xt+Mki|AF
ze%6Ak%97ioDPJQ}{7i&#&<Djfgbz)6^E_YOQ|Rlh)((CkL}o6jH2sMG>l%MlF0fRk
zFW-sD60)(RmD&5Sh&I{CNc?6q;hQTBT(PE&?{x_}_K^kAl`ymNlQBu`F(RjhtvUOS
z9`y*B$}{2a>F1Az{orHDH)T*ePWj&q4>P?!h5i@;?F(6{Ae}_-dCy!Cc*FPGeAu$v
zlw<&MC3JzhK4GrSt#sdU&F&aGx-+8pJnm<-!F#=pG8d5zQ3I-R!`9AUl|0we>wfuj
z&8s6SBd8gBz@Y_72KyLwkFLJ6xG$M3QXQ*ZzokrEVX{}{%?^dv%iGDeozIMJAPMP|
zyBK>nx|{Kld=XvRl!0Nrt8exf?$D2L2GR|s_u%US_Ir(7zYQe;A{O1wruQZ)PW2Zk
z<&|&*kEpJQ*IoQC!EV#EBG*;0ZGglUn=R8u&%K{IUKG}MGeb_}t@3XP9?m^Ic`&I*
z3}-)gT+7!675GJv<xH%ge9)KJ5Q#K)3jOY#Vlqw-lIoThQ8HM68BQ*6@i!lR8^@m=
zVn_HkWM-I>5VLTEJN<33F!9s{8p|zF>1WxEHGXol(%bO6$A$Xx4=r}?g@|z0dxUnG
z>m8BI`gNv#SuNoBV&FhUCus?NBJv^~+0CDQLf3eu$;L3cD=s-MjFM_e32Uu&lsfWb
z>Ks)ibbC+ica$W4XFv1o*BMuKty&*t3ivX6BZ~};^KCfLgpb92+bd3#xG`7&Q9rR>
zRir6!0B&%hh?-d5+2&pF$?<N(Q6^V+UeBh>zMwywoc8Fq6M*%T9~t2)Pprec&-zhH
z6_4oG-E{1gB)$vACo(R)oyooV#--OX<f$-*AI!>*hTbk<J$#!nGRNCsbtk~~Ud*Oe
z5Vd7_`<qYv)FL~KS1PS6rb$acMv)$TI{R1P6skjHa<`=+gn6Zd_f~Z5q_mn~fkVxT
z&ipFV$xM;udJTPL<6>^l?eP;>`?r)*s-ieG1$$Eiupr~NZP}&XH(ksgiSz8{4XgTF
zukPoem2XOKA8g&A$`l?ifBk%c$KoDlJtSj`OvIx07;3=OEYjI$%gs2=$~6@NSaS>~
zqZMVqXX)3dPZ~OR-{GvRsY8>OeQ{YV{+N9Ih7vU7DMnvExB7C20R7F0s^5|UWQg!&
zzpWMd4&?E*{zjw|6)l|RtzL2Kc1o^^5+I*1QL$>>s5qLeAO@;`!<>;l>#hoGDw#~Z
zEuu1cCVW&vSIBfXp;}qM3MJ21y~ZYoc*x&~aGwoRD+ILRZXC(pc4uOml%hXp;dE-h
z)DR!c{^|O}Ymkj#eKI1ckq7dn8Z33iDV75;s8rhPQ9)VAOP%Fb>1ZqT8n)Y|A5~*x
zKbqFUK#iFwEs8h9<F!-F%d@z&)H4)CwB2e_!7L(eIHW+OQZ8i;Ea2z6Jj9dwg@cA!
zYQ&lP<YWWO8D`N5I0df=>AH4HY-Nf&U_Vr%2A!LIO7B>t^;6hF{NS2q23Wc`oflx;
zgDjk^C-vigc=Y6Txeu`iu0-Dvw_R$Yd&83CU6HgZHgvd=yS?z+%sX!$KDyp*Qk640
z88y-%{||B%WL)GW^lh~p2k#&pb>wePb92HZDo?qLBh2xoO{}>&$2=AJ3P8IlF$I52
z!bjYgOIP~QfCxiy0zel@x@1CuC=(aVpAj2_=vQ3o&a`H`F6cUNdJ~mi^mV~@KAb5>
z?J(?RaOdTmKxW;HnTgN6>K{BbwAq84zTQNuy4VR&GT&|6Hu_TeHu$o4MLUPMsLMpD
z5Jtiwy*!*w7n7dX{VpIONGT)6jqp-=U2yBtp~c{dV(hiFq++iGlbCAG{Vrmg7~A|M
zPS@7QaCZvG;S85=^P550pha{eVe9rteBc{CdaZyQIX^jGE-nrr^N-WrVO!N_=U4j3
zv;BJ@WbGymqXO_~>lceph|_$YS}%+AWZCgxwRn@R<neIh&wi>Idb~K+#$C4VP&c!s
zu;pymZ|kxFt|wAQ=k$`63$sTngJ#nGbAAELXxUUAS?F=PJ(GULbm$#sK?_6mj2g9K
z1C=7#rLnj4;n;LZWCL`ZC2oVMhg}>{FR)VHAE)D94m33W5cbCVj-_b;-5LAB5mUKq
zpqT)%{}xJ~UgVSkRqPs*w?#C#f!&_~g;#U()8a|Ii$xuZrxnFapKrMX1EQ;mf#e6%
z>iW@=DVrfhd0#!nomc1k4E-9uF7+-iJRLY*C?1mlZf5(33w}W)huO(u=hP7pVH>o%
z@t{2-%279_CaM0qzhaqSZuZDx#e`M$<@bw<nY^0C-+4$Yu|YD&WZ`e>4a)pe&nt6%
ze75f%j{myz)FV~OVeVafN_^jfvLep_6A@|CRQ-IwX5Bt55!+I&243T2C}R=pRY@v-
z)Dru%<dvX8nSFDMB8fr|YMC|E#K&hbs4=kHV%gwZ#)pJ%+Yjf1eMh57^C2pa=SR7J
z-XHG!AWH-aFr+1<e=#_Be~noMZj-1`-S{+8$g2U4UHzqdQdy+(YFBk8Hqjo>pHA(7
zA8&)k#*8g0FzY2HcdrKswpf}3T)HvE`^h*jB5p9PO)VtD`i9rYDOr&240)Q7cXbUi
z`_ZZTF0mgHMj4j#-JG9KI($h^pPi=!TmOcGZeOHwP06M0;zKTJz15I)0H_wauIg0Q
z+D>e$jnwd8r+h*2<nvL|>SG0Pyyf9Ma_8FY#EBD41U3BVMV@0HG@b4-dL^RtTggIF
zVMES=-6_G1@oaxw{x0=zmMA(cD>04H&o}hno??@^U+s9k*C%rlvq{t6V|w{n<a#$p
zYmJkDR;yHj=6eC=yxnWLR@eiNiHJBZ7w&hhb?*eEtm5*R;z=iK^Ukk#LT=rh;Nve)
zsq7I@;7Kh|*@hwORK>OGylgk}Y^KIDgk$jm&FrF)ch;h^s_slSHh#q06FKbCZVbMn
ziK6mq`rzc=qz)tJqG!GaR_kQ_o+~3EQ0f%md*-`w+tatQKS&bF(=GFuqK@zF#GN|F
zl6bJU%Fj<3A$1CzI>*a&A9Ei)5dOB~Tg_6JX7GH9CQxa*rJYA}D$%;(yAZ{wub<)~
zxA~JzePTc`VVj4hGi*rjSp;;Zfj%%tgJ)2y%uQ_PnP*E2MNaRv>y|j#n6%CQ<Y@n$
zj@P+-pIgkF^62uUPfY`>A}rm_4FF$h9GDBTb^VfuIAkPEbnQ_p>NPd$Y0|RZO1-7Y
zzSieP3(GrqMql*k(sUmmoYD^0mask8OCAETP(Ivj`U1Zzy8d$0X|yhQ<$I1Pj_T~w
zR8@7;F3t37t`cDOxsJQgGDCw-0g6m@OCuLh)tFl1U|~LWyRusdF7`q7=_2#v-6=Jh
zYVRO=PDS*K*%Ah(ac5ex$gsMJFE5x9x|sU8Lr?||mxLzFO-IQfa*+A7uus48<&M?|
za6)D$llw1=AUTs}4RboTrEn8rMc?{wdB1J1ssaabG(px>Ewg2y_C}hrHw4W-MvtYV
zR>a7}c_uBU4b3Or<k358@za(*g>4he+=I>oA>0atf=@M*jx>$g>#)eC(X7IL?~%LQ
zDpLvDn5xIvj9icC_)#kS=?2oHcrWLx#PE7z49Wa~ue<3J+0HDfjCI;A&Q%hfEonvm
z9vwnN|IT$edqz3>6}r*&5*=IQ5e8l?+i%&m$c54hYT^E_JVKgc3_R_c6;B*cnNsar
za^4lnJ#2jT8O~LI|90O{VW3FhgaeOoGVyRO-m1L$vtS6~(a?>S_eHLcJC*3i9IX(e
zCA*)Lyd}cp(eOy-x=zYDk0#Drr!k*Bsz$hsPf{(abNgp4@@4Q%W;n)z$C)9hV*`$q
zkg@HuHuRn4tt*;FS2eKNoA$B?-|elnT4CvB284O_gjCrPi6Ko!#d|~Hink1+lZSa8
z#4^V$799n?KK{;K8?c5QdZoQ+x^UzgDcI=qXtWCI5bF0adZ-s2EIP5NTi$(1YoUXW
zZ$*1tEN9Em`y-aho%lF>DPH$2g{h*(azatot>4doM4NTAIIBThJ-iNnAgJl5a`%}1
z7NzHAzsB!OIh1f@veETBYn<9`xV;=Rp;{}iVmnjyw1DH5Up;aytbY}0P4!}q-@?oP
zYSKs9(ffXfg5gs~_XWcV0ZqA4vJ3biNkOyD-Hj;+Q;(d@W^xCqIf$pYK<evJZK=M)
zd^%GMoyO_F^q4*5>U*B{WR5p!0Ufal)cl^p1so7}!%51=-c-<Bz4x3(E6?{`ZXR`#
zHbko*iig+H*zXVD)BGv3*IJqqFd;&eSe%v|aLRehzPXo1|6W!|u}48&)xP*3d#=H!
z_Sdh~;z1Tf*6qTG2XqG7;NZy@sB(TSHoc~Hn4_|PI<i(=Ny@iF5vZC(6WXLI#%U>C
zx7GK4W5i~;y*hXL>t3_|iV1J)ig~W|e4g9ZKG|I#x~cY`hY#*LD^rwsjkW}zS)ayk
z8_)L!7DkM9J+a#V{p#JmuCc_Z(vErBEsYG=RbH#>8k7%W)`um;pxU+f#B&@ssZ+c1
zrYiT;D;KrC$n7*5MjijM+Q;b<vrN+)X(c^Z4*a3vQ?~BcTBZGgrcv<PDG{HwmPE)Z
zYfh(maOM2AXgK%MiWoFw(767C;WXXMfK4NF-XobYvg^fBLiDFKcjD_l@S?0ZCZf;h
zgA8_3`A~5TWp$v(%b*93?O)7>sneo<`cxNLU#lnr+pAuJx@jU*KNVqj8HwIc!%@nt
zF8wB50k}oTWdmLlZMIV|%a2Q!PIW@?l-)LT^LKOieq|?IZcaZ`o#}$b0_v_#-vW>#
z550SS-Rt%yXFs_~PZ0#CsGG=8(-d?qJ0YVimpa`zBfC6Y;)hEOF8LZv#zw-m>Iz7D
TFW~&=53!oEHnLL5I`n@4@mqDO

literal 0
HcmV?d00001

diff --git a/DM_Weight/Images/TbSet.png b/DM_Weight/Images/TbSet.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d5fbf700deda0db26dd548e05ce90461a344676
GIT binary patch
literal 5554
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
Kxl-{_;Qs&!1`mP&

literal 0
HcmV?d00001

diff --git a/DM_Weight/Images/TbTuiy.png b/DM_Weight/Images/TbTuiy.png
new file mode 100644
index 0000000000000000000000000000000000000000..ccc1bb6d075f98fbae82b71a429ba27bc83d1eda
GIT binary patch
literal 5708
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

literal 0
HcmV?d00001

diff --git a/DM_Weight/Images/body-bg.jpg b/DM_Weight/Images/body-bg.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..20a067ed8dbb2950e6ec2d210f14a4ae8c453a59
GIT binary patch
literal 19588
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

literal 0
HcmV?d00001

diff --git a/DM_Weight/Images/box-16.jpg b/DM_Weight/Images/box-16.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0631941011a3f162a31a7c08b5c5e56b1b765ec7
GIT binary patch
literal 18695
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

literal 0
HcmV?d00001

diff --git a/DM_Weight/Images/box.png b/DM_Weight/Images/box.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f001433b4bef46c8cf7da5b43542c6ec89dbc48
GIT binary patch
literal 5630
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
bwudZgGqn^SyG{GurK8i;MBJ~uYl-?VmC6bD

literal 0
HcmV?d00001

diff --git a/DM_Weight/Images/favicon.ico b/DM_Weight/Images/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..8a22d00e0617de4f53f0f794137426446f9286ef
GIT binary patch
literal 270398
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
Ryl{LyHv@8fzF>U+{{am4pp*ar

literal 0
HcmV?d00001

diff --git a/DM_Weight/Images/finger-bg-r.png b/DM_Weight/Images/finger-bg-r.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4b73669328d3d7d1e91e589e99cbb9a96255526
GIT binary patch
literal 54076
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

literal 0
HcmV?d00001

diff --git a/DM_Weight/Images/logo.png b/DM_Weight/Images/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..432cccd3bcd78a65d5e125e72d076ca989aaf049
GIT binary patch
literal 3660
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
VW$Nm;%8ma!8-fG=w#Biy{{cJ1P!j+E

literal 0
HcmV?d00001

diff --git a/DM_Weight/Models/AddChannelStockManuNo.cs b/DM_Weight/Models/AddChannelStockManuNo.cs
new file mode 100644
index 0000000..49e1fc6
--- /dev/null
+++ b/DM_Weight/Models/AddChannelStockManuNo.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.Models
+{
+    public class AddChannelStockManuNo
+    {
+        //是否选中
+        public bool ItemIsChecked { get; set; }
+        //抽屉号
+        public string RowNo { get; set; }
+        //库位号
+        public string ColNo { get; set; }
+        //药品名称
+        public string DrugName { get; set; }
+        //规格
+        public string DrugSpec { get; set; }
+        //批次
+        public string ManuNo { get; set; }
+        //效期
+        public string EffDate { get; set; }
+    }
+}
diff --git a/DM_Weight/Models/ChannelList.cs b/DM_Weight/Models/ChannelList.cs
new file mode 100644
index 0000000..0312f18
--- /dev/null
+++ b/DM_Weight/Models/ChannelList.cs
@@ -0,0 +1,196 @@
+using Prism.Commands;
+using Prism.Mvvm;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.Models
+{
+    [SugarTable("channel_list")]
+    public class ChannelList : BindableBase
+    {
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "chnguid", IsPrimaryKey = true)]
+        //[SugarColumn(ColumnName = "id", IsPrimaryKey = true)]
+        public string Id { get; set; }
+
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "machine_id")]
+        public string MachineId { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "row_no")]
+        public int DrawerNo { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "col_no")]
+        public int ColNo { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "pos_no")]
+        public int PosNo { get; set; }
+
+
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "drug_id")]
+        public string DrugId { get; set; }
+
+        ///// <summary>
+        /////  
+        ///// 默认值: NULL
+        /////</summary>
+        //[SugarColumn(ColumnName = "manu_no")]
+        //public string ManuNo { get; set; }
+        ///// <summary>
+        /////  
+        ///// 默认值: NULL
+        /////</summary>
+        //[SugarColumn(ColumnName = "eff_date")]
+        //public string EffDate { get; set; }
+        ///// <summary>
+        /////  
+        ///// 默认值: NULL
+        /////</summary>
+        //[SugarColumn(ColumnName = "quantity")]
+        //public int Quantity { get; set; }
+
+        /// <summary>
+        ///  
+        /// 默认值: 1
+        ///</summary>
+        [SugarColumn(ColumnName = "drawer_type")]
+        public int DrawerType { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: 1
+        ///</summary>
+        [SugarColumn(ColumnName = "board_type")]
+        public int BoardType { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: 1
+        ///</summary>
+        [SugarColumn(ColumnName = "state")]
+        public int? State { get; set; }
+
+        [SugarColumn(IsIgnore = true)]
+        public bool IsSelected { get; set; }
+
+        [SugarColumn(IsIgnore = true)]
+        public InOutInvoice Invoice { get; set; }
+
+        [SugarColumn(IsIgnore = true)]
+        public string Location
+        {
+            get => DrawerNo + "-" + ColNo;
+        }
+        //private int _addQuantity = 0;
+        //[SugarColumn(IsIgnore = true)]
+        //public int AddQuantity
+        //{
+        //    get => _addQuantity;
+        //    set
+        //    {
+        //        SetProperty(ref _addQuantity, value);
+        //    }
+        //}
+
+        //private int _takeQuantity = 0;
+
+        //[SugarColumn(IsIgnore = true)]
+        //public int TakeQuantity
+        //{
+        //    get => _takeQuantity;
+        //    set
+        //    {
+        //        if (value > Quantity)
+        //        {
+        //            throw new ArgumentException("取药数量不能大于库存");
+        //        }
+        //        SetProperty(ref _takeQuantity, value);
+        //    }
+        //}
+        //private int _returnQuantity = 0;
+
+        //[SugarColumn(IsIgnore = true)]
+        //public int ReturnQuantity
+        //{
+        //    get => _returnQuantity;
+        //    set
+        //    {
+        //        SetProperty(ref _returnQuantity, value);
+        //    }
+        //}
+
+        //private int _checkQuantity = 0;
+
+
+        //[SugarColumn(IsIgnore = true)]
+        //public int CheckQuantity
+        //{
+        //    get => _checkQuantity;
+        //    set
+        //    {
+        //        if (value < 0)
+        //        {
+        //            throw new ArgumentException("盘点数量不能是负数");
+        //        }
+        //        SetProperty(ref _checkQuantity, value);
+        //    }
+        //}
+
+
+        //[SugarColumn(IsIgnore = true)]
+        //public int? CanReturnQuantity { get; set; }
+
+        private DrugInfo? _DrugInfo;
+        [Navigate(NavigateType.ManyToOne, nameof(DrugId))]
+        public DrugInfo Drug { get => _DrugInfo; set => SetProperty(ref _DrugInfo, value); }
+
+        //[SugarColumn(IsIgnore = true)]
+        //public int process { get; set; } = 0;
+
+
+        private DrugManuNo? _drugManuNo;
+        [SugarColumn(IsIgnore = true)]
+        public DrugManuNo? drugManuNo { get => _drugManuNo; set => SetProperty(ref _drugManuNo, value); }
+
+        private List<ChannelStock>? _channelStocks;
+        [Navigate(NavigateType.OneToMany, nameof(ChannelStock.Chnguid))]
+        public List<ChannelStock> channelStocks { get => _channelStocks; set => SetProperty(ref _channelStocks, value); }
+
+        private DelegateCommand<ChannelList> _addManunoCommand;
+        [SugarColumn(IsIgnore = true)]
+        public DelegateCommand<ChannelList> AddManunoCommand
+        {
+            get
+            {
+                if (_addManunoCommand == null)
+                    _addManunoCommand = new DelegateCommand<ChannelList>(o => DoDelete(o));
+                return _addManunoCommand;
+            }
+        }
+
+        private void DoDelete(ChannelList parameter)
+        {
+
+        }
+    }
+}
diff --git a/DM_Weight/Models/ChannelStock.cs b/DM_Weight/Models/ChannelStock.cs
new file mode 100644
index 0000000..fd2213f
--- /dev/null
+++ b/DM_Weight/Models/ChannelStock.cs
@@ -0,0 +1,197 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Oracle.ManagedDataAccess.Types;
+using Prism.Mvvm;
+using SqlSugar;
+namespace DM_Weight.Models
+{
+    /// <summary>
+    /// 
+    ///</summary>
+    [Serializable]
+    [SugarTable("channel_stock")]
+    public class ChannelStock : BindableBase
+    {
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "chsguid", IsPrimaryKey = true)]
+        public string Id { get; set; }
+
+        [SugarColumn(ColumnName ="chnguid")]
+        public string Chnguid { get; set; }
+
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "machine_id")]
+        public string MachineId { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "row_no")]
+        public int DrawerNo { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "col_no")]
+        public int ColNo { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "pos_no")]
+        public int PosNo { get; set; }
+
+
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "drug_id")]
+        public string DrugId { get; set; }
+
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "manu_no")]
+        public string ManuNo { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "eff_date")]
+        public string EffDate { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "quantity")]
+        public int Quantity { get; set; }
+
+        /// <summary>
+        ///  
+        /// 默认值: 1
+        ///</summary>
+        [SugarColumn(ColumnName = "drawer_type")]
+        public int DrawerType { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: 1
+        ///</summary>
+        [SugarColumn(ColumnName = "board_type")]
+        public int BoardType { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: 1
+        ///</summary>
+        [SugarColumn(ColumnName = "state")]
+        public int? State { get; set; }
+
+        [SugarColumn(IsIgnore = true)]
+        public bool IsSelected { get; set; }
+
+        [SugarColumn(IsIgnore = true)]
+        public InOutInvoice Invoice { get; set; }
+
+        [SugarColumn(IsIgnore = true)]
+        public string Location
+        {
+            get => DrawerNo + "-" + ColNo;
+        }
+        private int _addQuantity = 0;
+        [SugarColumn(IsIgnore = true)]
+        public int AddQuantity
+        {
+            get => _addQuantity;
+            set
+            {
+                SetProperty(ref _addQuantity, value);
+            }
+        }
+
+        private int _takeQuantity = 0;
+
+        [SugarColumn(IsIgnore = true)]
+        public int TakeQuantity
+        {
+            get => _takeQuantity;
+            set
+            {
+                if (value > Quantity)
+                {
+                    throw new ArgumentException("取药数量不能大于库存");
+                }
+                SetProperty(ref _takeQuantity, value);
+            }
+        }
+        //private string _tipMessage=string.Empty;
+        //[SugarColumn(IsIgnore = true)]
+        //public string TipMessage
+        //{
+        //    get => _tipMessage;
+        //    set
+        //    {
+        //        SetProperty(ref _tipMessage, value);
+        //    }
+        //}
+        private int _returnQuantity = 0;
+
+        [SugarColumn(IsIgnore = true)]
+        public int ReturnQuantity
+        {
+            get => _returnQuantity;
+            set
+            {
+                SetProperty(ref _returnQuantity, value);
+            }
+        }
+
+        private int _checkQuantity = 0;
+
+
+        [SugarColumn(IsIgnore = true)]
+        public int CheckQuantity
+        {
+            get => _checkQuantity;
+            set
+            {
+                if (value < 0)
+                {
+                    throw new ArgumentException("盘点数量不能是负数");
+                }
+                SetProperty(ref _checkQuantity, value);
+            }
+        }
+
+
+        [SugarColumn(IsIgnore = true)]
+        public int? CanReturnQuantity { get; set; }
+
+        private DrugInfo? _DrugInfo;
+        [Navigate(NavigateType.ManyToOne, nameof(DrugId))]
+        public DrugInfo DrugInfo { get => _DrugInfo; set => SetProperty(ref _DrugInfo, value); }
+
+        [SugarColumn(IsIgnore = true)]
+        public int process { get; set; } = 0;
+
+
+        private DrugManuNo? _drugManuNo;
+        [SugarColumn(IsIgnore = true)]
+        public DrugManuNo? drugManuNo { get => _drugManuNo; set => SetProperty(ref _drugManuNo, value); }
+
+        //private string _manuNoEffDate;
+        //[SugarColumn(IsIgnore = true)]
+        //public string ManuNoEffDate { get => _manuNoEffDate; set => SetProperty(ref _manuNoEffDate, value); }
+
+
+        private ChannelList? _channelList;
+        [Navigate(NavigateType.ManyToOne, nameof(Chnguid))]
+        public ChannelList ChannelLst { get => _channelList; set => SetProperty(ref _channelList, value); }
+    }
+}
\ No newline at end of file
diff --git a/DM_Weight/Models/DrugInfo.cs b/DM_Weight/Models/DrugInfo.cs
new file mode 100644
index 0000000..ac90234
--- /dev/null
+++ b/DM_Weight/Models/DrugInfo.cs
@@ -0,0 +1,89 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace DM_Weight.Models
+{
+    /// <summary>
+    /// 
+    ///</summary>
+    [SugarTable("drug_info")]
+    public class DrugInfo
+    {
+        /// <summary>
+        ///  
+        ///</summary>
+        //[SugarColumn(ColumnName = "pharmacy")]
+        //public string Pharmacy { get; set; }
+        /// <summary>
+        /// ҩƷID 
+        ///</summary>
+        [SugarColumn(ColumnName = "drug_id", IsPrimaryKey = true)]
+        public string DrugId { get; set; }
+        /// <summary>
+        /// ƴ 
+        ///</summary>
+        [SugarColumn(ColumnName = "py_code")]
+        public string PyCode { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        //[SugarColumn(ColumnName = "BD_code")]
+        //public string BdCode { get; set; }
+        /// <summary>
+        /// ҩƷ 
+        ///</summary>
+        [SugarColumn(ColumnName = "drug_barcode")]
+        public string DrugBarcode { get; set; }
+        
+        /// <summary>
+        /// ҩƷ���� 
+        ///</summary>
+        [SugarColumn(ColumnName = "drug_name")]
+        public string DrugName { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "drug_brand_name")]
+        public string DrugBrandname { get; set; }
+        /// <summary>
+        /// ҩƷ��� 
+        ///</summary>
+        [SugarColumn(ColumnName = "drug_spec")]
+        public string DrugSpec { get; set; }
+        /// <summary>
+        /// ���� 
+        ///</summary>
+        [SugarColumn(ColumnName = "dosage")]
+        public string Dosage { get; set; }
+        /// <summary>
+        /// ��װ��λ 
+        ///</summary>
+        [SugarColumn(ColumnName = "pack_unit")]
+        public string PackUnit { get; set; }
+        /// <summary>
+        /// �������� 
+        ///</summary>
+        [SugarColumn(ColumnName = "manufactory")]
+        public string Manufactory { get; set; }
+        /// <summary>
+        /// ���ҩ�� 
+        ///</summary>
+        [SugarColumn(ColumnName = "max_stock")]
+        public int? MaxStock { get; set; }
+        //[SugarColumn(IsIgnore=true)]
+        [Navigate(NavigateType.OneToMany, nameof(ChannelStock.DrugId), nameof(DrugId))]//BookA表中的studenId
+        public List<ChannelStock> channelStocks { get; set; }
+
+
+        [Navigate(NavigateType.OneToMany, nameof(DrugManuNo.DrugId))]//BookA表中的studenId
+        public List<DrugManuNo>? DrugManuNos { get; set; }
+        [SugarColumn(IsIgnore = true)]
+        public int? StockQuantity { get; set; }
+
+        [SugarColumn(IsIgnore = true)]
+        public string drug_name_spec { get; set; }
+        //[SugarColumn(ColumnName = "drug_name_spec")]
+        //public string Name { get; set; }
+    }
+}
diff --git a/DM_Weight/Models/DrugManuNo.cs b/DM_Weight/Models/DrugManuNo.cs
new file mode 100644
index 0000000..66f469e
--- /dev/null
+++ b/DM_Weight/Models/DrugManuNo.cs
@@ -0,0 +1,39 @@
+using Prism.Mvvm;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.Models
+{
+    [SugarTable("drug_manu_no")]
+    public class DrugManuNo:BindableBase
+    {
+        private string _id;
+        [SugarColumn(ColumnName = "dmnguid", IsPrimaryKey = true)]
+        public string Id { get=>_id; set=>SetProperty(ref _id,value); }
+
+        private string _drugId;
+        [SugarColumn(ColumnName = "drug_id")]
+        public string DrugId { get=>_drugId; set=>SetProperty(ref _drugId,value); }
+
+        private string _manuNo;
+        [SugarColumn(ColumnName = "manu_no")]
+        public string ManuNo { get=>_manuNo; set=>SetProperty(ref _manuNo,value); }
+
+        private string _manuDate;
+        [SugarColumn(ColumnName = "manu_date")]
+        public string ManuDate { get=> _manuDate; set=>SetProperty(ref _manuDate,value); }
+
+
+        private string _effDate;
+        [SugarColumn(ColumnName = "eff_date")]
+        public string EffDate { get=>_effDate; set=>SetProperty(ref _effDate,value); }
+
+        //private string _manuNoEffDate;
+        //[SugarColumn(IsIgnore = true)]
+        //public string ManuNoEffDate { get => _manuNoEffDate; set => SetProperty(ref _manuNoEffDate, value); }
+    }
+}
diff --git a/DM_Weight/Models/HkcChangeShifts.cs b/DM_Weight/Models/HkcChangeShifts.cs
new file mode 100644
index 0000000..112bcd7
--- /dev/null
+++ b/DM_Weight/Models/HkcChangeShifts.cs
@@ -0,0 +1,45 @@
+using Prism.Mvvm;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.Models
+{
+    //交接班表
+    [SugarTable("hkc_changeshifts")]
+    public class HkcChangeShifts:BindableBase
+    {
+        [SugarColumn(ColumnName = "id",IsPrimaryKey = true)]
+        public int Id { get; set; }
+
+        [SugarColumn(ColumnName = "optDate")]
+        public DateTime? OptDate { get; set; }
+
+        [SugarColumn(ColumnName = "FromOperator")]
+        public string FromOperator { get; set; }
+
+        [SugarColumn(ColumnName = "FromRviewer")]
+        public string FromRviewer { get; set; }
+
+        [SugarColumn(ColumnName = "ToOperator")]
+        public string ToOperator { get;set; }
+
+        [SugarColumn(ColumnName = "ToReviewer")]
+        public string ToReviewer { get; set; }
+
+        [SugarColumn(ColumnName = "ToDate")]
+        public DateTime? ToDate { get; set; }
+
+        [SugarColumn(ColumnName = "State")]
+        public string State { get; set; }
+
+        [SugarColumn(ColumnName = "optState")]
+        public string OptState { get; set; }
+
+        [SugarColumn(ColumnName = "machine_id")]
+        public string Machineid { get; set; }
+    }
+}
diff --git a/DM_Weight/Models/InOutInvoice.cs b/DM_Weight/Models/InOutInvoice.cs
new file mode 100644
index 0000000..0680abd
--- /dev/null
+++ b/DM_Weight/Models/InOutInvoice.cs
@@ -0,0 +1,149 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reactive;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.Models
+{
+    [SugarTable("in_out_invoice")]
+    public class InOutInvoice
+    {
+        /// <summary>
+        /// 主键（序号）       
+        /// </summary>
+        [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity =true)]
+        public int Id { get; set; }
+
+        [SugarColumn(ColumnName = "in_pharmacy_id")]
+        public string InPharmacyId { get; set; }
+
+        [SugarColumn(ColumnName = "out_pharmacy_id")]
+        public string OutPharmacyId { get; set; }
+
+        /// <summary>
+        /// 库存管理单位（入库单位代码） 
+        /// </summary>
+        [SugarColumn(ColumnName = "storage")]
+        public string storage { get; set; }
+
+         /// <summary>
+         /// 单据号
+         /// </summary>
+        [SugarColumn(ColumnName = "invoice_no")]
+        public string InvoiceNo { get; set; }
+
+        [SugarColumn(ColumnName = "invoice_date")]
+        public string InvoiceDate { get; set; }
+
+        /// <summary>
+        /// 药品id
+        /// </summary>
+        [SugarColumn(ColumnName = "drug_id")]
+        public string DrugId { get; set; }
+
+
+
+        [Navigate(NavigateType.ManyToOne, nameof(DrugId))]
+        public DrugInfo DrugInfo { get; set; }
+
+        /// <summary>
+        /// 药品规格
+        /// </summary>
+        [SugarColumn(ColumnName = "drug_spec")]
+        public string DrugSpec { get; set; }
+
+        /// <summary>
+        /// 计算单位
+        /// </summary>
+        [SugarColumn(ColumnName = "units")]
+        public string Units { get; set; }
+
+        /// <summary>
+        /// 厂商标识
+        /// </summary>
+        [SugarColumn(ColumnName = "firm_id")]
+        public string FirmId { get; set; }
+
+        /// <summary>
+        /// 包装规格（反映药品含量及包装信息，如0.25g*30）   
+        /// </summary>
+        [SugarColumn(ColumnName = "package_spec")]
+        public string PackageSpec { get; set; }
+        
+        /// <summary>
+        /// 数量（以包装单位所计的数量）      
+        /// </summary>
+        [SugarColumn(ColumnName = "quantity")]
+        public int quantity { get; set; }
+        
+        /// <summary>
+        /// 计量单位，可使用任一级管理上方便的包装
+        /// </summary>
+        [SugarColumn(ColumnName = "package_units")]
+        public string PackageUnits { get; set; }
+        
+        /// <summary>
+        /// 药品批次
+        /// </summary>
+        [SugarColumn(ColumnName = "drug_manu_no")]
+        public string DrugManuNo { get; set; }
+       
+        /// <summary>
+        /// 创建时间（入库日期）
+        /// </summary>
+        [SugarColumn(ColumnName = "create_time")]
+        public DateTime CreateTime { get; set; }
+        
+        /// <summary>
+        /// 1.请领入库 0.其它
+        /// </summary>
+        [SugarColumn(ColumnName = "type")]
+        public int Type { get; set; }
+        
+        /// <summary>
+        /// 类型描述
+        /// </summary>
+        [SugarColumn(ColumnName = "type_describe")]
+        public string TypeDescribe { get; set; }
+        
+        /// <summary>
+        /// 供货方
+        /// </summary>
+        [SugarColumn(ColumnName = "supplier")]
+        public string Supplier { get; set; }
+        
+        /// <summary>
+        /// 操作人
+        /// </summary>
+        [SugarColumn(ColumnName = "operator")]
+        public string Operator { get; set; }
+        
+        /// <summary>
+        /// 存放库房
+        /// </summary>
+        [SugarColumn(ColumnName = "sub_storage")]
+        public string SubStorage { get; set; }
+        
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [SugarColumn(ColumnName = "memos")]
+        public string Memos { get; set; }
+
+        [SugarColumn(ColumnName = "status")]
+        public int Status { get; set; }
+
+        [SugarColumn(ColumnName = "drug_eff_date")]
+        public string DrugEffDate { get; set; }
+
+        [SugarColumn(ColumnName = "his_id")]
+        public string HisId { get; set; }
+
+        [SugarColumn(ColumnName = "cancel_flag")]
+        public int CancelFlag { get; set; }
+
+    }
+}
diff --git a/DM_Weight/Models/Invoice.cs b/DM_Weight/Models/Invoice.cs
new file mode 100644
index 0000000..eb02760
--- /dev/null
+++ b/DM_Weight/Models/Invoice.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.Models
+{
+    [Serializable]
+    public class Invoice
+    {
+        public string InvoiceNo { get; set; }
+        public string InvoiceDate { get; set; }
+        public int Count { get; set; }
+        public int Quantity { get; set; }
+        public int Status { get; set; }
+        public string PharmacyName1 { get; set; }
+        public string PharmacyName2 { get; set; }
+    }
+}
diff --git a/DM_Weight/Models/MachineRecord.cs b/DM_Weight/Models/MachineRecord.cs
new file mode 100644
index 0000000..01f58b2
--- /dev/null
+++ b/DM_Weight/Models/MachineRecord.cs
@@ -0,0 +1,147 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Principal;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.Models
+{
+    [SugarTable("dm_machine_record")]
+    public class MachineRecord
+    {
+        /// <summary>
+        /// 主键 
+        ///</summary>
+        [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)]
+        public int Id { get; set; }
+        /// <summary>
+        /// 设备id 
+        ///</summary>
+        [SugarColumn(ColumnName = "machine_id")]
+        public string MachineId { get; set; }
+        /// <summary>
+        /// 药品id 
+        ///</summary>
+        [SugarColumn(ColumnName = "drug_id")]
+        public string DrugId { get; set; }
+
+        [Navigate(NavigateType.ManyToOne, nameof(DrugId))]
+        public DrugInfo DrugInfo { get; set; }
+        /// <summary>
+        /// 数量 
+        ///</summary>
+        [SugarColumn(ColumnName = "quantity")]
+        public int Quantity { get; set; }
+
+
+        [SugarColumn(ColumnName = "stock_quantity")]
+        public int? StockQuantity { get; set; }
+
+        [SugarColumn(ColumnName = "check_quantity")]
+        public int? CheckQuantity { get; set; }
+        
+        /// <summary>
+        /// 批号 
+        ///</summary>
+        [SugarColumn(ColumnName = "manu_no")]
+        public string ManuNo { get; set; }
+        /// <summary>
+        /// 操作人id 
+        ///</summary>
+        [SugarColumn(ColumnName = "operator")]
+        public int? Operator { get; set; }
+
+        [Navigate(NavigateType.ManyToOne, nameof(Operator))]
+        public UserList User { get; set; }
+        /// <summary>
+        /// 审核人id 
+        ///</summary>
+        [SugarColumn(ColumnName = "reviewer")]
+        public int? Reviewer { get; set; }
+        /// <summary>
+        /// 操作时间 
+        /// 默认值: CURRENT_TIMESTAMP
+        ///</summary>
+        [SugarColumn(ColumnName = "operation_time")]
+        public DateTime OperationTime { get; set; }
+        /// <summary>
+        /// 效期 
+        ///</summary>
+        [SugarColumn(ColumnName = "eff_date")]
+        public DateTime? EffDate { get; set; }
+        /// <summary>
+        /// 出库入库类型(1入库2出库31还药32还空瓶) 
+        ///</summary>
+        [SugarColumn(ColumnName = "type")]
+        public int Type { get; set; }
+        /// <summary>
+        /// 出入库调拨单id 
+        ///</summary>
+        [SugarColumn(ColumnName = "invoice_id")]
+        public string InvoiceId { get; set; }
+        /// <summary>
+        /// 列号 
+        ///</summary>
+        [SugarColumn(ColumnName = "col_no")]
+        public int ColNo { get; set; }
+        /// <summary>
+        /// 抽屉号 
+        ///</summary>
+        [SugarColumn(ColumnName = "drawer_no")]
+        public int DrawerNo { get; set; }
+        /// <summary>
+        /// 取药科室 
+        ///</summary>
+        [SugarColumn(ColumnName = "department_id")]
+        public string DepartmentId { get; set; }
+        /// <summary>
+        /// 是否已经退药(0:没有1:还了部分2:完成) 
+        /// 默认值: 0
+        ///</summary>
+        [SugarColumn(ColumnName = "status", IsOnlyIgnoreInsert = true)]
+        public int Status { get; set; }
+        /// <summary>
+        /// 退药量 
+        /// 默认值: 0
+        ///</summary>
+        [SugarColumn(ColumnName = "return_quantity1", IsOnlyIgnoreInsert = true)]
+        public int ReturnQuantity1 { get; set; }
+        /// <summary>
+        /// 退空瓶量 
+        /// 默认值: 0
+        ///</summary>
+        [SugarColumn(ColumnName = "return_quantity2", IsOnlyIgnoreInsert = true)]
+        public int ReturnQuantity2 { get; set; }
+        /// <summary>
+        /// 取药记录id 
+        ///</summary>
+        [SugarColumn(ColumnName = "get_id")]
+        public int? GetId { get; set; }
+        /// <summary>
+        /// 是否已经销毁 
+        /// 默认值: 0
+        ///</summary>
+        [SugarColumn(ColumnName = "is_destroy", IsOnlyIgnoreInsert = true)]
+        public int? IsDestroy { get; set; }
+
+
+
+        [SugarColumn(IsIgnore = true)]
+        public int CanReturnQuantity
+        {
+            get => Quantity - ReturnQuantity1 - ReturnQuantity2;
+            
+        }
+
+        [SugarColumn(IsIgnore = true)]
+        public bool IsSelected { get; set; }
+
+        /// <summary>
+        /// 药品对应批号库存
+        /// </summary>
+        [SugarColumn(ColumnName = "manunoQuantity")]
+        public int? ManunoQuantity { get; set; }
+    }
+}
diff --git a/DM_Weight/Models/OrderDetail.cs b/DM_Weight/Models/OrderDetail.cs
new file mode 100644
index 0000000..109654c
--- /dev/null
+++ b/DM_Weight/Models/OrderDetail.cs
@@ -0,0 +1,131 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace DM_Weight.Models
+{
+    /// <summary>
+    /// 
+    ///</summary>
+    [SugarTable("order_detail")]
+    public class OrderDetail
+    {
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)]
+        public int Id { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        //[SugarColumn(ColumnName = "order_id")]
+        //public int? OrderId { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "patient_id")]
+        public string PatientId { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "order_no")]
+        public string OrderNo { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "charge_date")]
+        public DateTime ChargeDate { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        //[SugarColumn(ColumnName = "serial_no")]
+        //public int? SerialNo { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "drug_id")]
+        public string DrugId { get; set; }
+
+        [Navigate(NavigateType.ManyToOne, nameof(DrugId))]
+        public DrugInfo DrugInfo { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "quantity")]
+        public int Quantity { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "order_unit")]
+        public string OrderUnit { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: 1
+        ///</summary>
+        [SugarColumn(ColumnName = "unit_convercoef")]
+        public int? UnitConvercoef { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "set_manu_no")]
+        public string SetManuNo { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "set_eff_date")]
+        public string SetEffDate { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        //[SugarColumn(ColumnName = "price")]
+        //public string Price { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        //[SugarColumn(ColumnName = "total_price")]
+        //public string TotalPrice { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "use_discrip")]
+        public string UseDiscrip { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "use_frequ")]
+        public string UseFrequ { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "use_once")]
+        public string UseOnce { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "use_by")]
+        public string UseBy { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: '0'
+        ///</summary>
+        [SugarColumn(ColumnName = "use_self")]
+        public string UseSelf { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "use_dosage")]
+        public string UseDosage { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/DM_Weight/Models/OrderFinish.cs b/DM_Weight/Models/OrderFinish.cs
new file mode 100644
index 0000000..c166ac7
--- /dev/null
+++ b/DM_Weight/Models/OrderFinish.cs
@@ -0,0 +1,32 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.Models
+{
+    [SugarTable("hkc_order_finish")] 
+    public class OrderFinish
+    {
+        [SugarColumn(ColumnName = "id", IsPrimaryKey = true)]
+        public int Id { get; set; }
+
+        [SugarColumn(ColumnName = "pharmacy")]
+        public string Pharmacy { get; set; }
+
+        [SugarColumn(ColumnName = "patient_id")]
+        public string PatientId { get; set; }
+
+        [SugarColumn(ColumnName = "order_no")]
+        public string OrderNo { get; set; }
+
+        [SugarColumn(ColumnName = "state")]
+        public int State { get; set; }
+
+        [SugarColumn(ColumnName = "operator")]
+        public string Operator { get; set; }
+        
+    }
+}
diff --git a/DM_Weight/Models/OrderInfo.cs b/DM_Weight/Models/OrderInfo.cs
new file mode 100644
index 0000000..02a4c67
--- /dev/null
+++ b/DM_Weight/Models/OrderInfo.cs
@@ -0,0 +1,192 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace DM_Weight.Models
+{
+    /// <summary>
+    /// 
+    ///</summary>
+    [SugarTable("order_info")]
+    public class OrderInfo
+    {
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "order_id", IsPrimaryKey = true, IsIdentity = true)]
+        public int OrderId { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "pharmacy")]
+        public string Pharmacy { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "order_no")]
+        public string OrderNo { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "patient_id")]
+        public string PatientId { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "p_name")]
+        public string PName { get; set; }
+        
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "sex")]
+        public string Sex { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "age")]
+        public string Age { get; set; }
+        
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "id_number")]
+        public string IdNumber { get; set; }
+
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "patient_card")]
+        public string PatientCard { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "invoice_no")]
+        public string InvoiceNo { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "patient_no")]
+        public string PatientNo { get; set; }
+        
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "doctor_name")]
+        public string DoctorName { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "order_date")]
+        public DateTime OrderDate { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "charge_date")]
+        public DateTime ChargeDate { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "recv_date")]
+        public DateTime RecvDate { get; set; }
+        
+        
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "dept_name")]
+        public string DeptName { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "disease")]
+        public string Disease { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "order_type")]
+        public string OrderType { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "charge_type")]
+        public string ChargeType { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "state")]
+        public int State { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: 0
+        ///</summary>
+        [SugarColumn(ColumnName = "his_disp_flag")]
+        public int? HisDispFlag { get; set; }
+        
+        /// <summary>
+        ///  
+        /// 默认值: 0
+        ///</summary>
+        [SugarColumn(ColumnName = "cancel_flag")]
+        public int? CancelFlag { get; set; }
+       
+        
+        /// <summary>
+        ///  
+        /// 默认值: 0
+        ///</summary>
+        [SugarColumn(ColumnName = "dm_status")]
+        public int? DmStatus { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        //[SugarColumn(ColumnName = "agent_name")]
+        //public string AgentName { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        //[SugarColumn(ColumnName = "agent_id_no")]
+        //public string AgentIdNo { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        [SugarColumn(ColumnName = "costs")]
+        public decimal? Costs { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        //[SugarColumn(ColumnName = "payments")]
+        //public decimal? Payments { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        //[SugarColumn(ColumnName = "dispensary")]
+        //public string Dispensary { get; set; }
+        
+        /// <summary>
+        ///  
+        /// 默认值: NULL
+        ///</summary>
+        //[SugarColumn(ColumnName = "identity")]
+        //public string Identity { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/DM_Weight/Models/PremissionDm.cs b/DM_Weight/Models/PremissionDm.cs
new file mode 100644
index 0000000..56eb546
--- /dev/null
+++ b/DM_Weight/Models/PremissionDm.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using SqlSugar;
+namespace DM_Weight.Models
+{
+    /// <summary>
+    /// 
+    ///</summary>
+    [Serializable]
+    public class PremissionDm
+    {
+        /// <summary>
+        /// 主键 
+        ///</summary>
+         public int Id { get; set; }
+        /// <summary>
+        /// 菜单名 
+        ///</summary>
+         public string PremissionName { get; set; }
+        /// <summary>
+        /// 菜单路径 
+        ///</summary>
+         public string PremissionPath { get; set; }
+        /// <summary>
+        /// 图片source 
+        ///</summary>
+        public string PremissionImage { get; set; }
+        
+        
+        public ObservableCollection<PremissionDm>? Children { get; set; }
+     
+    }
+}
diff --git a/DM_Weight/Models/RoleDm.cs b/DM_Weight/Models/RoleDm.cs
new file mode 100644
index 0000000..ce3e319
--- /dev/null
+++ b/DM_Weight/Models/RoleDm.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace DM_Weight.Models
+{
+    /// <summary>
+    /// 
+    ///</summary>
+    [SugarTable("role")]
+    public class RoleDm
+    {
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="id" ,IsPrimaryKey = true ,IsIdentity = true  )]
+         public int? Id { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="role_name"    )]
+         public string RoleName { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        //[SugarColumn(ColumnName="role_des"    )]
+        //public string RoleDes { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        ///[SugarColumn(ColumnName="permissions"    )]
+        [SugarColumn(ColumnName = "permissions", ColumnDataType = "varchar(4000)" /*可以设置类型*/, IsJson = true)]//必填
+        public List<PremissionDm> Permissions { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="machine_id"    )]
+         public string MachineId { get; set; }
+    }
+}
diff --git a/DM_Weight/Models/ShiftsReport.cs b/DM_Weight/Models/ShiftsReport.cs
new file mode 100644
index 0000000..96ba68b
--- /dev/null
+++ b/DM_Weight/Models/ShiftsReport.cs
@@ -0,0 +1,55 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.Models
+{
+    [SugarTable("hkc_shiftsreport")]
+    public class ShiftsReport
+    {
+        [SugarColumn(ColumnName = "id", IsPrimaryKey = true)]
+        public int Id { get; set; }
+
+        [SugarColumn(ColumnName = "drug_name")]
+        public string DrugName { get; set; }
+
+        [SugarColumn(ColumnName = "drug_spec")]
+        public string DrugSpec { get; set; }
+
+        [SugarColumn(ColumnName = "beforeNum")]
+        public int? BeforeNum { get; set; }
+
+        [SugarColumn(ColumnName = "getNum")]
+        public int? GetNum { get; set; }
+
+        [SugarColumn(ColumnName = "useNum")]
+        public int? UseNum { get; set; }
+
+        [SugarColumn(ColumnName = "manu_no")]
+        public string ManuNo { get; set; }
+
+        [SugarColumn(ColumnName = "surplus")]
+        public int? Surplus { get; set; }
+
+        [SugarColumn(ColumnName = "opt_Date")]
+        public DateTime OptDate { get; set; }
+
+        [SugarColumn(ColumnName = "FromOperator")]
+        public string FromOperator { get; set; }
+
+        [SugarColumn(ColumnName = "FromReviewer")]
+        public string FromReviewer { get; set; }
+
+        [SugarColumn(ColumnName = "ToOperator")]
+        public string ToOperator { get; set; }
+
+        [SugarColumn(ColumnName = "ToReviewer")]
+        public string ToReviewer { get; set; }
+
+        [SugarColumn(ColumnName = "machineId")]
+        public string MachineId { get; set; }
+    }
+}
diff --git a/DM_Weight/Models/UserList.cs b/DM_Weight/Models/UserList.cs
new file mode 100644
index 0000000..3c3d2a0
--- /dev/null
+++ b/DM_Weight/Models/UserList.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace DM_Weight.Models
+{
+    /// <summary>
+    /// 
+    ///</summary>
+    [SugarTable("user_list")]
+    public class UserList
+    {
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="id" ,IsPrimaryKey = true ,IsIdentity = true  )]
+         public int Id { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="user_id"    )]
+         public string UserName { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="user_name"    )]
+         public string Nickname { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="pass_word"    )]
+         public string PassWord { get; set; }
+       
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="user_barcode"    )]
+         public string UserBarcode { get; set; }
+        
+        
+        /// <summary>
+        ///  
+        ///</summary>
+         //[SugarColumn(ColumnName="status"    )]
+         //public int? Status { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="machine_role_id"    )]
+         public int? RoleId { get; set; }
+
+
+        [Navigate(NavigateType.ManyToOne, nameof(RoleId))]
+        public RoleDm? Role { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        //[SugarColumn(ColumnName="user_card"    )]
+        // public string UserCard { get; set; }
+        
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="machine_id"    )]
+         public string MachineId { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="sign"    )]
+         public byte[] Sign { get; set; }
+
+        public override string ToString()
+        {
+            return "userList = [UserName:" + Nickname + ", UserId:" + UserName + "]";
+        }
+    }
+}
diff --git a/DM_Weight/Port/PortUtil.cs b/DM_Weight/Port/PortUtil.cs
new file mode 100644
index 0000000..53eb798
--- /dev/null
+++ b/DM_Weight/Port/PortUtil.cs
@@ -0,0 +1,1309 @@
+using log4net;
+using log4net.Repository.Hierarchy;
+using NetTaste;
+using Prism.Events;
+using Prism.Ioc;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Design;
+using System.Configuration;
+using System.IO.Ports;
+using System.Linq;
+using System.Reflection.Metadata;
+using System.Speech.Synthesis;
+using System.Text;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using System.Timers;
+using System.Windows;
+using System.Windows.Markup;
+using System.Windows.Media.Animation;
+using Unity;
+using DM_Weight.msg;
+using DM_Weight.Views;
+using System.Reflection;
+using System.Threading;
+
+namespace DM_Weight.Port
+{
+    public class PortUtil
+    {
+        private readonly ILog logger = LogManager.GetLogger(typeof(PortUtil));
+        // 抽屉串口
+        public SerialPort drawerSerial;
+        // can总线串口
+        public SerialPort canBusSerial;
+
+        // 条码枪串口
+        public SerialPort scanCodeSerial;
+
+
+        // 抽屉串口协议232 | 485
+        private int _drawerProtocol = Convert.ToInt32(ConfigurationManager.AppSettings["DrawerProtocol"]);
+        // can总线耗材板地址
+        private int _doorAddr = Convert.ToInt32(ConfigurationManager.AppSettings["DoorAddr"]);
+        // 储物箱地址
+        private int _storageBoxAddr = Convert.ToInt32(ConfigurationManager.AppSettings["StorageBoxAddr"]);
+
+        // can总线串口是否存在
+        public bool _canBusExsit = Convert.ToBoolean(ConfigurationManager.AppSettings["CanBusExsit"]);
+
+        // 当前操作的抽屉号
+        public int DrawerNo { get; set; }
+        // 当前操作的库位号列表
+        public int[] ColNos { get; set; } = new int[] { };
+        // 当前操作的库位号列表
+        public int[] Stocks { get; set; } = new int[] { };
+
+
+
+        // 当前操作的窗口
+        public string WindowName { get; set; }
+        // 取药操作的窗口名【处方取药、抽屉取药、自选取药、调拨出库】
+        private string[] TakeNames = new string[] { "DrawerTakeDrugWindow", "OrderTakeDrugWindow", "SelfTakeDrugWindow", "InvoiceTakeDrugWindow" };
+        // 加药操作的窗口名【自选加药、抽屉加药、还药】
+        private string[] AddNames = new string[] { "SelfAddWindow", "ReturnDrugWindow", "ReturnDrug1Window", "DrawerAddDrugWindow" };
+        // 盘点操作的窗口名【盘点】
+        private string[] CheckNames = new string[] { "CheckStockWindow" };
+        // 归还空瓶操作的窗口名【盘点】
+        private string[] ReturnEmptyNames = new string[] { "ReturnEmptyWindow" };
+
+        public int BoardType { get; set; } = 1;
+        public int DrawerType { get; set; } = 1;
+
+        private int[] BeforeQuantity { get; set; } = new int[] { };
+        private int[] AfterQuantity { get; set; } = new int[] { };
+
+        // 整体流程状态
+        private int statue { get; set; } = 0;
+
+
+        // 是否正在操作中
+        public bool Operate { get; set; }
+
+        public DateTime dateTime { get; set; } = DateTime.Now;
+
+
+        public async void ResetData()
+        {
+            logger.Info($"重新设置串口数据状态【{statue}】，抽屉【{DrawerNo}】");
+            if (!"HomeWindow".Equals(WindowName) && statue == 1)
+            {
+                if (BoardType == 2)
+                {
+                    // 灭灯
+                    AllLightOff();
+                }
+                if (BoardType == 3)
+                {
+                    // 失能
+                    await BoxLockLightOff();
+                }
+                if (BoardType == 4)
+                {
+                    // 失能
+                    CloseStorage();
+                }
+                if (BoardType == 6)
+                {
+                    // 失能
+                    await BoxLockLightOff2();
+                }
+                if(BoardType==5)
+                {
+                    await WriteQuantityArray();
+                }
+            }
+            Operate = false;
+            dateTime = DateTime.Now;
+            statue = 0;
+            BeforeQuantity = new int[9];
+            AfterQuantity = new int[9];
+            BoardType = 1;
+            DrawerType = 1;
+            WindowName = "";
+            DrawerNo = 0;
+            ColNos = new int[] { };
+            Stocks = new int[] { };
+        }
+
+        public async void Start()
+        {
+            logger.Info($"进行抽屉操作抽屉号【{DrawerNo}】类型【{BoardType}】库位【{string.Join(",", ColNos)}】窗口【{WindowName}】");
+            Operate = true;
+
+            try
+            {
+                // 储物箱直接开
+                if (BoardType == 4)
+                {
+                    byte[] result = await OpenStorage();
+
+                    int[] r = result.Select(it => Convert.ToInt32(it)).ToArray();
+                    if (r[4] != 0)
+                    {
+                        logger.Info($"储物箱使能成功");
+                        // 查询锁状态
+                        GetBackDoorState();
+                    }
+                    else
+                    {
+                        string _WindowName = WindowName;
+                        // 重新初始化数据
+                        ResetData();
+                        // 指令发送错误，未打开
+                        // 返回消息  抽屉打开失败
+                        _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                        {
+                            EventType = util.EventType.OPENERROR,
+                            WindowName = _WindowName,
+                            Message = "储物箱使能失败"
+                        }); 
+                        logger.Info($"储物箱使能失败r:"+string.Join("",r));
+                    }
+                }
+                else
+                {
+                    // 外置抽屉
+                    if (DrawerType == 3)
+                    {
+                        if (BoardType == 2)
+                        {
+                            byte[] buffer = await OpenRecover();
+                            int[] r = buffer.Select(it => Convert.ToInt32(it)).ToArray();
+                            if ((ColNos[0] > 3 && r[4] == 1) || (ColNos[0] < 4 && r[3] == 1))
+                            {
+
+                                // 告诉前台打开成功
+                                _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                                {
+                                    EventType = util.EventType.DRAWEROPEN,
+                                    WindowName = WindowName,
+                                });
+                                logger.Info($"回收箱打开成功");
+
+                                // 查询是否关闭状态
+                                GeRecoverStatus();
+                            }
+                            else
+                            {
+                                string _WindowName = WindowName;
+                                // 重新初始化数据
+                                ResetData();
+                                // 返回消息开启失败
+                                // 返回消息  抽屉打开失败
+                                _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                                {
+                                    EventType = util.EventType.OPENERROR,
+                                    WindowName = _WindowName,
+                                    Message = "回收箱打开失败"
+                                });
+                                logger.Info($"回收箱打开失败");
+                            }
+                        }
+                    }
+                    // 内置抽屉
+                    else
+                    {
+                        if (BoardType == 2)
+                        {
+                            byte[] quantity = await CheckQuantityByDrawer();
+                            BeforeQuantity = quantity.Select(it => Convert.ToInt32(it)).ToArray().Skip(3).Take(9).ToArray();
+                            logger.Info($"BeforeQuantity{string.Join(",", BeforeQuantity)}");
+                        }
+                        if (BoardType == 6)
+                        {
+                            int[] quantity = await CheckQuantityByAddr2();
+                            BeforeQuantity = quantity.Select(it => Convert.ToInt32(it)).ToArray();
+                            logger.Info($"BeforeQuantity{string.Join(",", BeforeQuantity)}");
+                        }
+
+
+                        byte[] buffer = await OpenDrawer();
+                        int[] r = buffer.Select(it => Convert.ToInt32(it)).ToArray();
+
+                        logger.Info($"OpenDrawer{string.Join(",", r)}");
+                        if (DrawerState(r))
+                        {
+                            statue = 1;
+                            // 是不是单支抽屉
+                            if (BoardType == 2)
+                            {
+                                // 取药
+                                if (Array.IndexOf(TakeNames, WindowName) > -1)
+                                {
+                                    // 有药位置亮灯
+                                    await HasLightOnByCol();
+                                }
+                                // 加药
+                                if (Array.IndexOf(AddNames, WindowName) > -1)
+                                {
+                                    // 无药位置亮灯
+                                    await NoLightOnByCol();
+                                }
+                                // 盘点
+                                if (Array.IndexOf(CheckNames, WindowName) > -1)
+                                {
+                                    // 不亮灯
+                                }
+                                // 空瓶
+                                if (Array.IndexOf(ReturnEmptyNames, WindowName) > -1)
+                                {
+                                    // 无药位置亮灯
+                                    await NoLightOnByCol();
+                                }
+                            }
+                            // 药盒
+                            if (BoardType == 3)
+                            {
+                                // 药盒指示灯使能
+                                await BoxLockLightOn();
+                            }
+                            if (BoardType == 6)
+                            {
+                                // 药盒指示灯使能
+                                await BoxLockLightOn2();
+                            }
+                            // 返回消息  抽屉已经打开
+                            _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                            {
+                                EventType = util.EventType.DRAWEROPEN,
+                                WindowName = WindowName,
+                            });
+                            logger.Info($"抽屉【{DrawerNo}】打开成功");
+                            // 查询抽屉状态
+                            await Task.Delay(200);
+                            GetDrawerStatus();
+
+                        }
+                        else
+                        {
+                            string _WindowName = WindowName;
+                            // 重新初始化数据
+                            ResetData();
+                            // 返回消息  抽屉打开失败
+                            _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                            {
+                                EventType = util.EventType.OPENERROR,
+                                WindowName = _WindowName,
+                                Message = $"抽屉【{DrawerNo}】打开失败"
+                            });
+                            logger.Info($"抽屉【{DrawerNo}】打开失败");
+                        }
+                    }
+
+                }
+            }
+            catch (Exception ex)
+            {
+                string _WindowName = WindowName;
+                statue = 1;
+                // 重新初始化数据
+                ResetData();
+                // 返回消息  抽屉打开失败
+                _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                {
+                    EventType = util.EventType.OPENERROR,
+                    WindowName = _WindowName,
+                    Message = $"操作异常{ex.Message}"
+                });
+                logger.Info(ex.Message);
+            }
+
+        }
+
+        public async void GetDrawerStatus()
+        {
+            try
+            {
+
+                if (Operate)
+                {
+                    // 查询抽屉状态
+                    byte[] buffer = await CheckDrawerStatus();
+
+                    int[] r = buffer.Select(it => Convert.ToInt32(it)).ToArray();
+
+                    logger.Info($"GetDrawerStatus{string.Join(",", r)}");
+                    // 抽屉没有关闭
+                    if (DrawerState(r))
+                    {
+                        if (BoardType == 2)
+                        {
+                            // 继续查询抽屉药品数量
+                            // 查询抽屉药品数量
+                            byte[] quantity = await CheckQuantityByDrawer();
+                            AfterQuantity = quantity.Select(it => Convert.ToInt32(it)).ToArray().Skip(3).Take(9).ToArray();
+                            logger.Info($"AfterQuantity{string.Join(",", AfterQuantity)}");
+                            int[] Quantitys = new int[BeforeQuantity.Length];
+                            for (int i = 0; i < BeforeQuantity.Length; i++)
+                            {
+                                // 取药
+                                if (Array.IndexOf(TakeNames, WindowName) > -1)
+                                {
+                                    Quantitys[i] = BeforeQuantity[i] - AfterQuantity[i];
+                                }
+                                // 加药
+                                if (Array.IndexOf(AddNames, WindowName) > -1)
+                                {
+                                    Quantitys[i] = AfterQuantity[i] - BeforeQuantity[i];
+                                }
+                                // 盘点
+                                if (Array.IndexOf(CheckNames, WindowName) > -1)
+                                {
+                                    Quantitys[i] = AfterQuantity[i] - BeforeQuantity[i];
+                                }
+                                // 空瓶
+                                if (Array.IndexOf(CheckNames, WindowName) > -1)
+                                {
+                                    Quantitys[i] = AfterQuantity[i] - BeforeQuantity[i];
+                                }
+
+                            }
+                            // 告诉前台数据变化
+                            _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                            {
+                                EventType = util.EventType.UPDATEQUANTITY,
+                                WindowName = WindowName,
+                                Quantitys = Quantitys
+                            });
+                            logger.Info($"单支板数量变化【{string.Join(",", Quantitys)}】");
+
+                        }
+                        if (BoardType == 6)
+                        {
+                            // 继续查询抽屉药品数量
+                            // 查询抽屉药品数量
+                            int[] quantity = await CheckQuantityByAddr2();
+                            AfterQuantity = quantity.Select(it => Convert.ToInt32(it)).ToArray();
+                            logger.Info($"AfterQuantity{string.Join(",", AfterQuantity)}");
+                            int[] Quantitys = new int[BeforeQuantity.Length];
+                            for (int i = 0; i < BeforeQuantity.Length; i++)
+                            {
+                                // 取药
+                                if (Array.IndexOf(TakeNames, WindowName) > -1)
+                                {
+                                    Quantitys[i] = BeforeQuantity[i] - AfterQuantity[i];
+                                }
+                                // 加药
+                                if (Array.IndexOf(AddNames, WindowName) > -1)
+                                {
+                                    Quantitys[i] = AfterQuantity[i] - BeforeQuantity[i];
+                                }
+                                // 盘点
+                                if (Array.IndexOf(CheckNames, WindowName) > -1)
+                                {
+                                    Quantitys[i] = AfterQuantity[i] - BeforeQuantity[i];
+                                }
+                                // 空瓶
+                                if (Array.IndexOf(CheckNames, WindowName) > -1)
+                                {
+                                    Quantitys[i] = AfterQuantity[i] - BeforeQuantity[i];
+                                }
+
+                            }
+                            // 告诉前台数据变化
+                            _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                            {
+                                EventType = util.EventType.UPDATEQUANTITY,
+                                WindowName = WindowName,
+                                Quantitys = Quantitys
+                            });
+                            logger.Info($"单支板数量变化【{string.Join(",", Quantitys)}】");
+
+                        }
+                        // 继续监听抽屉状态
+                        await Task.Delay(200);
+                        GetDrawerStatus();
+                    }
+                    else
+                    {
+                        statue = 2;
+                        if (BoardType == 2)
+                        {
+                            // 关灯
+                            AllLightOff();
+
+                        }
+                        // 药盒
+                        if (BoardType == 3)
+                        {
+                            // 药盒指示灯失能
+                            await BoxLockLightOff();
+                        }
+                        if (BoardType == 6)
+                        {
+                            // 药盒指示灯使能
+                            await BoxLockLightOff2();
+                        }
+                        string _WindowName = WindowName;
+                        logger.Info($"抽屉【{DrawerNo}】已关闭");
+
+                        // 重新初始化数据
+                        ResetData();
+                        // 返回消息  抽屉已经关闭
+                        _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                        {
+                            EventType = util.EventType.DRAWERCLOSE,
+                            WindowName = _WindowName,
+                        });
+                    }
+                }
+
+            }
+            catch (Exception ex)
+            {
+
+                string _WindowName = WindowName;
+                // 重新初始化数据
+                ResetData();
+                _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                {
+                    EventType = util.EventType.OPENERROR,
+                    WindowName = _WindowName,
+                    Message = $"GetDrawerStatus异常：{ex.Message}"
+                });
+                logger.Info($"GetDrawerStatus异常：{ex.Message}");
+            }
+        }
+
+
+        public async void GeRecoverStatus()
+        {
+            if (Operate)
+            {
+                byte[] buffer = await CheckRecoverStatus();
+                int[] r = buffer.Select(it => Convert.ToInt32(it)).ToArray();
+
+                logger.Info($"GeRecoverStatus{string.Join(",", r)}");
+
+                // 回收箱关闭成功
+                if ((ColNos[0] > 3 && r[4] == 0) || (ColNos[0] < 4 && r[3] == 0))
+                {
+                    logger.Info($"回收箱关闭");
+                    // 查询数量
+                    byte[] bytes = await CheckRecoverQuantity();
+
+                    int[] r1 = bytes.Select(it => Convert.ToInt32(it)).ToArray();
+                    // 返回消息库位关闭，放入空瓶数量
+                    int[] quantitys = r1.Skip(3).Take(3).ToArray();
+                    int index = ColNos[0] % 3 > 0 ? ColNos[0] % 3 - 1 : 2;
+
+                    // 指定库位放入的药品数量
+                    int InCount = quantitys[index];
+                    string _WindowName = WindowName;
+                    // 重新初始化数据
+                    ResetData();
+                    _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                    {
+                        EventType = util.EventType.DRAWERCLOSE,
+                        Quantitys = new int[] { InCount },
+                        WindowName = _WindowName,
+                    });
+
+                    logger.Info($"回收板数量变化【{string.Join(",", quantitys)}】");
+                }
+                else
+                {
+                    // 查询是否关闭状态
+                    await Task.Delay(200);
+                    GeRecoverStatus();
+                }
+            }
+        }
+
+        public async void GetBackDoorState()
+        {
+            try
+            {
+                if (Operate)
+                {
+                    byte[] result = await BackDoorState();
+
+                    int[] r = result.Select(it => Convert.ToInt32(it)).ToArray();
+                    int[] lockStates = CheckStorageStatus(r.Skip(3).Take(2).ToArray());
+                    int[] lightStates = CheckStorageStatus(r.Skip(5).Take(2).ToArray());
+
+                    // 锁处于关闭状态
+                    if (lockStates[_storageBoxAddr - 1] == 0)
+                    {
+                        // 锁还未打开过
+                        if (statue == 0)
+                        {
+                            // 指示灯不闪烁了，说明规定时间内没有开锁，需要给前台提示
+                            if (lightStates[_storageBoxAddr - 1] == 0)
+                            {
+                                // 打开失败
+                                logger.Info($"储物箱指示灯不闪烁，使能过期");
+                            }
+                            else
+                            {
+                                // 灯在闪烁继续监听状态
+                                GetBackDoorState();
+                            }
+                        }
+                        else if (statue == 1)
+                        {
+
+                            // 锁是打开状态现在关闭了，说明操作完成了,告诉前台锁已关闭
+                            statue = 2;
+
+                            string _WindowName = WindowName;
+                            // 重新初始化数据
+                            ResetData();
+                            _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                            {
+                                EventType = util.EventType.DRAWERCLOSE,
+                                WindowName = _WindowName,
+                            });
+                            logger.Info($"储物箱关闭");
+                        }
+                    }
+                    // 锁处于打开状态
+                    if (lockStates[_storageBoxAddr - 1] == 1)
+                    {
+                        // 锁还未打开过，说明打开成功了
+                        if (statue == 0)
+                        {
+                            statue = 1;
+                            // 告诉前台打开成功
+                            _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                            {
+                                EventType = util.EventType.DRAWEROPEN,
+                                WindowName = WindowName,
+                            });
+                            logger.Info($"储物箱打开成功");
+                        }
+                        // 灯在闪烁继续监听状态
+                        GetBackDoorState();
+                    }
+                }
+
+
+            }
+            catch (Exception ex)
+            {
+                logger.Info($"GetBackDoorState异常{ex.Message}");
+            }
+        }
+
+
+        private readonly IEventAggregator _eventAggregator;
+
+        public PortUtil(IEventAggregator eventAggregator)
+        {
+            _eventAggregator = eventAggregator;
+            try
+            {
+                string DrawerPortPath = ConfigurationManager.AppSettings["DrawerPortPath"];
+                logger.Info($"打开抽屉串口【{DrawerPortPath}】");
+                drawerSerial = new SerialPort(DrawerPortPath, 9600, Parity.None, 8);
+                drawerSerial.Open();
+                logger.Info($"抽屉串口打开结果【{drawerSerial.IsOpen}】");
+            }
+            catch (Exception e)
+            {
+                logger.Error("抽屉串口打开错误" + e.Message);
+            }
+
+            try
+            {
+                string ScanCodePortPath = ConfigurationManager.AppSettings["ScanCodePortPath"];
+                logger.Info($"打开条码枪串口【{ScanCodePortPath}】");
+                scanCodeSerial = new SerialPort(ScanCodePortPath, 9600, Parity.None, 8);
+                scanCodeSerial.DataReceived += (object sender, System.IO.Ports.SerialDataReceivedEventArgs e) =>
+                {
+                    string code = scanCodeSerial.ReadExisting();
+                    _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                    {
+                        EventType = util.EventType.CODESCAN,
+                        Code = code,
+                    });
+                };
+                scanCodeSerial.Open();
+                logger.Info($"条码枪串口打开结果【{scanCodeSerial.IsOpen}】");
+            }
+            catch (Exception e)
+            {
+                logger.Error("条码枪串口打开错误" + e.Message);
+            }
+            if (_canBusExsit)
+            {
+                try
+                {
+                    string CanBusPortPath = ConfigurationManager.AppSettings["CanBusPortPath"];
+                    logger.Info($"打开can总线串口【{CanBusPortPath}】");
+                    canBusSerial = new SerialPort(CanBusPortPath, 57600, Parity.None, 8);
+                    canBusSerial.Open();
+                    logger.Info($"can总线串口打开结果【{canBusSerial.IsOpen}】");
+                }
+                catch (Exception e)
+                {
+                    logger.Error("can总线串口打开错误" + e.Message);
+                }
+
+            }
+
+        }
+
+
+        private byte[] GetBufferByPort(SerialPort serialPort, int length, int timeout)
+        {
+            byte[] buffer = new byte[length];
+            //try
+            //{
+                int _length = 0;
+                DateTime start = DateTime.Now;
+                DateTime end = DateTime.Now;
+                while (_length != length && end.Subtract(start).TotalMilliseconds < timeout)
+                {
+                    _length = serialPort.BytesToRead;
+                    end = DateTime.Now;
+                }
+                if (_length != length)
+                {
+                    throw new TimeoutException($"串口【{serialPort.PortName}】交互超时");
+                }
+                serialPort.Read(buffer, 0, length);
+            //}
+            //catch (Exception ex)
+            //{
+            //    logger.Error($"GetBufferByPort：{ex.Message}");
+            //}
+            return buffer;
+        }
+        private Task<byte[]> GetBufferByPort(SerialPort serialPort, int length)
+        {
+
+            return Task.Run(() => GetBufferByPort(serialPort, length, 3000));
+        }
+
+
+        public static SpeechSynthesizer speechSynthesizer = new SpeechSynthesizer();
+        public void SpeakAsync(string textinfo)
+        {
+            speechSynthesizer.SpeakAsync(textinfo);
+        }
+
+
+
+        #region 抽屉串口操作
+        // 打开抽屉
+        public async Task<byte[]> OpenDrawer()
+        {
+            drawerSerial.DiscardInBuffer();
+            byte[] buffer = new byte[] { 0xaa, 0x41, (byte)DrawerNo, 0xee };
+            if (_drawerProtocol == 485)
+            {
+                if (DrawerNo > 8)
+                {
+                    buffer = new byte[] { 0xaa, 0x21, (byte)(DrawerNo - 8), 0xee };
+                }
+                else
+                {
+                    buffer = new byte[] { 0xaa, 0x11, (byte)DrawerNo, 0xee };
+                }
+
+            }
+            logger.Info($"打开抽屉，串口数据：{Convert.ToHexString(buffer)}");
+            drawerSerial.Write(buffer, 0, 4);
+
+            return await GetBufferByPort(drawerSerial, 11);
+        }
+
+        private bool DrawerState(int[] r)
+        {
+            int index = DrawerNo > 8 ? DrawerNo - 7 : DrawerNo + 1;
+            return r[index] == 0;
+        }
+
+        // 查询抽屉状态
+        public async Task<byte[]> CheckDrawerStatus()
+        {
+            drawerSerial.DiscardInBuffer();
+            byte[] buffer = new byte[] { 0xaa, 0x42, 0xee };
+            if (_drawerProtocol == 485)
+            {
+                if (DrawerNo > 8)
+                {
+                    buffer = new byte[] { 0xaa, 0x22, 0xee };
+                }
+                else
+                {
+                    buffer = new byte[] { 0xaa, 0x12, 0xee };
+                }
+
+            }
+
+            logger.Info($"查询抽屉状态，串口数据：{Convert.ToHexString(buffer)}");
+            drawerSerial.Write(buffer, 0, 3);
+
+            return await GetBufferByPort(drawerSerial, 11);
+        }
+        #endregion
+
+        #region can总线串口操作
+        #region 耗材板操作
+        // 后门状态
+        public async Task<byte[]> BackDoorState()
+        {
+
+            canBusSerial.DiscardInBuffer();
+            byte[] buffer = new byte[] { 0xaa, (byte)(_doorAddr), 0x02, 0x00, 0x00, 0x00, 0x00, 0xee };
+            canBusSerial.Write(buffer, 0, 8);
+
+            return await GetBufferByPort(canBusSerial, 8);
+
+        }
+        // 打开电控门储物箱（有灯使能）
+        public async Task<byte[]> OpenStorage()
+        {
+            canBusSerial.DiscardInBuffer();
+            byte[] buffer = new byte[] { 0xaa, (byte)(_doorAddr), 0x01, (byte)_storageBoxAddr, 0x00, 0x00, 0x00, 0xee };
+            canBusSerial.Write(buffer, 0, 8);
+
+
+            return await GetBufferByPort(canBusSerial, 8);
+        }
+        // 关闭电控门储物箱（有灯失能）
+        public void CloseStorage()
+        {
+            byte[] buffer = new byte[] { 0xaa, (byte)(_doorAddr), 0x04, 0x00, 0x00, 0x00, 0x00, 0xee };
+            canBusSerial.Write(buffer, 0, 8);
+        }
+        // 打开普通储物箱（无灯）
+        public void OpenStorageBox()
+        {
+            byte[] buffer = new byte[] { 0xaa, (byte)(_storageBoxAddr), 0x03, 0x00, 0x00, 0x00, 0x00, 0xee };
+            canBusSerial.Write(buffer, 0, 8);
+        }
+        // 关闭普通储物箱（无灯）
+        public void CloseStorageBox()
+        {
+            byte[] buffer = new byte[] { 0xaa, (byte)(_storageBoxAddr), 0x04, 0x00, 0x00, 0x00, 0x00, 0xee };
+            canBusSerial.Write(buffer, 0, 8);
+        }
+
+        private int[] CheckStorageStatus(int[] data)
+        {
+            int a = data[0];
+            int b = data[1];
+            int[] intA = Decimal2Chunks(a);
+            int[] intB = Decimal2Chunks(b);
+            int[] r = new int[intA.Length + intB.Length];
+            Array.Copy(intA, 0, r, 0, intA.Length);
+            Array.Copy(intB, 0, r, intA.Length, intB.Length);
+            return r;
+        }
+        private int[] Decimal2Chunks(int d)
+        {
+            string s = Convert.ToString(d, 2);
+            List<int> t = s.Split().Select(it => Convert.ToInt32(it)).Reverse().ToList();
+            while (t.Count < 8)
+            {
+                t.Add(0);
+            }
+            return t.ToArray();
+        }
+
+        #endregion
+
+        #region 单支操作
+        // 以抽屉为单位获取抽屉内所有库位的药品数量
+        public async Task<byte[]> CheckQuantityByDrawer()
+        {
+            canBusSerial.DiscardInBuffer();
+
+            byte[] buffer = new byte[] { 0xaa, (byte)(0xf0 + DrawerNo), 0x01, 0x00, 0x00, 0x00, 0x00, 0xee };
+
+            logger.Info($"单支板发送库位数量查询【{string.Join(",", buffer)}】");
+            canBusSerial.Write(buffer, 0, 8);
+
+            return await GetBufferByPort(canBusSerial, 13);
+        }
+        // 获取单个单支板药品数量
+        public async Task<byte[]> CheckQuantityByCol(int DrawerNo, int colNo)
+        {
+            canBusSerial.DiscardInBuffer();
+
+            var channel = Convert.ToInt32((DrawerNo * 10 + colNo).ToString(), 16);
+            byte[] buffer = new byte[] { 0xaa, (byte)channel, 0x08, 0x00, 0x00, 0x00, 0x00, 0xee };
+            canBusSerial.Write(buffer, 0, 8);
+
+            return await GetBufferByPort(canBusSerial, 8);
+
+        }
+        // 以抽屉为单位有药位置亮灯
+        public void HasLightOnByDrawer()
+        {
+            byte[] buffer = new byte[] { 0xaa, (byte)(0xf0 + DrawerNo), 0x02, 0x00, 0x00, 0x00, 0x00, 0xee };
+            canBusSerial.Write(buffer, 0, 8);
+        }
+        // 以抽屉为单位无药位置亮灯
+        public void NoLightOnByDrawer()
+        {
+            byte[] buffer = new byte[] { 0xaa, (byte)(0xf0 + DrawerNo), 0x03, 0x00, 0x00, 0x00, 0x00, 0xee };
+            canBusSerial.Write(buffer, 0, 8);
+        }
+        // 以抽屉为单位灭灯
+        public void LightOffByDrawer()
+        {
+            byte[] buffer = new byte[] { 0xaa, (byte)(0xf0 + DrawerNo), 0x06, 0x00, 0x00, 0x00, 0x00, 0xee };
+            canBusSerial.Write(buffer, 0, 8);
+        }
+        // 以单支板为单位有药位置亮灯
+        public async Task HasLightOnByCol()
+        {
+
+            for (int i = 0; i < ColNos.Length; i++)
+            {
+
+                var channel = Convert.ToInt32((DrawerNo * 10 + ColNos[i]).ToString(), 16);
+                byte[] buffer = new byte[] { 0xaa, (byte)channel, 0x0a, 0x00, 0x00, 0x00, 0x00, 0xee };
+                canBusSerial.Write(buffer, 0, 8);
+                await Task.Delay(TimeSpan.FromMilliseconds(20));
+            }
+
+        }
+        // 以单支板为单位无药位置亮灯
+        public async Task NoLightOnByCol()
+        {
+            for (int i = 0; i < ColNos.Length; i++)
+            {
+                var channel = Convert.ToInt32((DrawerNo * 10 + ColNos[i]).ToString(), 16);
+                byte[] buffer = new byte[] { 0xaa, (byte)channel, 0x0b, 0x00, 0x00, 0x00, 0x00, 0xee };
+                canBusSerial.Write(buffer, 0, 8);
+                await Task.Delay(TimeSpan.FromMilliseconds(20));
+            }
+        }
+        // 广播灭灯
+        public void AllLightOff()
+        {
+            byte[] buffer = new byte[] { 0xaa, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0xee };
+            canBusSerial.Write(buffer, 0, 8);
+        }
+        #endregion
+
+        #region 药盒操作
+        // 指定药盒指示灯开启使能开锁
+        public async Task BoxLockLightOn()
+        {
+            for (int i = 0; i < ColNos.Length; i++)
+            {
+
+                var channel = Convert.ToInt32((DrawerNo * 10 + ColNos[i]).ToString(), 16);
+                byte[] buffer = new byte[] { 0xaa, (byte)channel, 0x03, 0x00, 0x00, 0x00, 0x00, 0xee };
+                canBusSerial.Write(buffer, 0, 8);
+                await Task.Delay(TimeSpan.FromMilliseconds(20));
+            }
+        }
+        // 指定药盒指示灯开启失能开锁
+        public async Task BoxLockLightOff()
+        {
+            for (int i = 0; i < ColNos.Length; i++)
+            {
+                var channel = Convert.ToInt32((DrawerNo * 10 + ColNos[i]).ToString(), 16);
+                byte[] buffer = new byte[] { 0xaa, (byte)channel, 0x04, 0x00, 0x00, 0x00, 0x00, 0xee };
+                canBusSerial.Write(buffer, 0, 8);
+                await Task.Delay(TimeSpan.FromMilliseconds(20));
+            }
+        }
+        // 指定药盒状态查询
+        public async Task<byte[]> BoxLockState(int ColNo)
+        {
+            canBusSerial.DiscardInBuffer();
+            var channel = Convert.ToInt32((DrawerNo * 10 + ColNo).ToString(), 16);
+            byte[] buffer = new byte[] { 0xaa, (byte)channel, 0x02, 0x00, 0x00, 0x00, 0x00, 0xee };
+            canBusSerial.Write(buffer, 0, 8);
+
+            return await GetBufferByPort(canBusSerial, 8);
+
+        }
+        // 以抽屉为单位药盒指示灯开启使能开锁
+        public async Task BoxLockLightOnByDrawer()
+        {
+            canBusSerial.DiscardInBuffer();
+            byte[] buffer = new byte[] { 0xaa, (byte)(0xf0 + DrawerNo), 0x04, 0x00, 0x00, 0x00, 0x00, 0xee };
+            canBusSerial.Write(buffer, 0, 8);
+        }
+        // 以抽屉为单位药盒指示灯开启失能开锁
+        public async Task BoxLockLightOffByDrawer()
+        {
+            canBusSerial.DiscardInBuffer();
+            byte[] buffer = new byte[] { 0xaa, (byte)(0xf0 + DrawerNo), 0x05, 0x00, 0x00, 0x00, 0x00, 0xee };
+            canBusSerial.Write(buffer, 0, 8);
+        }
+        #endregion
+
+        private string trim(string text)
+        {
+            //此处使用了转义字符如：\',\",\\，分别表示单引号，双引号，反斜杠
+            char[] TrimChar = { ' ', '-', '\'', '\"', '\\', '(', ')', '（', '）', '①', '②' };
+            return text.Trim(TrimChar);
+        }
+
+        #region 2.4寸汉显屏
+        // 基础数据写入方法
+        public void WriteChannelInfo(int type, string content, int drawerNo, int colNo)
+        {
+            try
+            {
+                canBusSerial.DiscardInBuffer();
+                Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+                byte[] contentBuf = Encoding.GetEncoding("gb2312").GetBytes(trim(content));
+                int channel = ((drawerNo > 8 ? (drawerNo - 8) * 2 : (drawerNo * 2 - 1)) - 1) * this.labelCount + 10 + colNo;
+                if (contentBuf.Length % 2 != 0)
+                {
+                    Array.Resize(ref contentBuf, contentBuf.Length + 1);
+                }
+                byte[] buffer = new byte[] { 0xaa, (byte)channel, 1, (byte)type, 0, 0, 0, 0xee };
+                canBusSerial.Write(buffer, 0, 8);
+                //await Task.Delay(20);
+                Thread.Sleep(20);
+                buffer[4] = 1;
+                for (int i = 0; i < contentBuf.Length; i += 2)
+                {
+                    buffer[5] = contentBuf[i];
+                    buffer[6] = contentBuf[i + 1];
+                    canBusSerial.Write(buffer, 0, 8);
+                    //await Task.Delay(20);
+                    Thread.Sleep(20);
+                }
+                buffer[4] = 2;
+                buffer[5] = 0;
+                buffer[6] = 0;
+                canBusSerial.Write(buffer, 0, 8);
+                //await Task.Delay(20);
+                Thread.Sleep(20);
+            }
+            catch (Exception ex)
+            {
+                _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                {
+                    EventType = util.EventType.OPENERROR,
+                    WindowName = WindowName,
+                    Message = $"2.4寸汉显屏异常{ex.Message}"
+                });
+                logger.Info($"2.4寸汉显屏异常：ex:{ex.Message}");
+            }
+        }
+
+        // 清除显示内容
+        public void ClearContent(int drawerNo, int colNo)
+        {
+            canBusSerial.DiscardInBuffer();
+            int channel = ((drawerNo > 8 ? (drawerNo - 8) * 2 : (drawerNo * 2 - 1)) - 1) * this.labelCount + 10 + colNo;
+            byte[] buffer = new byte[] { 0xaa, (byte)channel, 4, 0, 0, 0, 0, 0xee };
+            canBusSerial.Write(buffer, 0, 8);
+        }
+        // 刷新显示内容
+        public void ShowContent(int drawerNo, int colNo)
+        {
+            try
+            {
+
+                canBusSerial.DiscardInBuffer();
+                int channel = ((drawerNo > 8 ? (drawerNo - 8) * 2 : (drawerNo * 2 - 1)) - 1) * this.labelCount + 10 + colNo;
+                byte[] buffer = new byte[] { 0xaa, (byte)channel, 2, 0, 0, 0, 0, 0xee };
+                canBusSerial.Write(buffer, 0, 8);
+            }
+            catch (Exception ex)
+            {
+                _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                {
+                    EventType = util.EventType.OPENERROR,
+                    WindowName = WindowName,
+                    Message = $"刷新显示内容异常{ex.Message}"
+                });
+                logger.Info($"刷新显示内容异常：ex:{ex.Message}");
+            }
+        }
+        // 取药或者加药亮灯
+        public void TakeQuantity(int drawerNo, int colNo, int quantity, int stock)
+        {
+            try
+            {
+
+                canBusSerial.DiscardInBuffer();
+                //int channel = (drawerNo * 10 + colNo);
+                int channel = ((drawerNo > 8 ? (drawerNo - 8) * 2 : (drawerNo * 2 - 1)) - 1) * this.labelCount + 10 + colNo;
+                byte[] buffer = new byte[] { 0xaa, (byte)channel, 6, 0, 0, 0, 0, 0xee };
+                buffer[3] = (byte)(quantity >> 8);
+                buffer[4] = (byte)(quantity & 0xff);
+                buffer[5] = (byte)(stock >> 8);
+                buffer[6] = (byte)(stock & 0xff);
+                canBusSerial.Write(buffer, 0, 8);
+
+
+                
+            }
+            catch (Exception ex)
+            {
+                _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                {
+                    EventType = util.EventType.OPENERROR,
+                    WindowName = WindowName,
+                    Message = $"操作发生异常{ex.Message}"
+                });
+                logger.Info($"操作发生异常：ex:{ex.Message}");
+            }
+        }
+        // 写入数量
+        public void WriteQuantity(int drawerNo, int colNo, int quantity)
+        {
+            try
+            {
+                canBusSerial.DiscardInBuffer();
+                int channel = ((drawerNo > 8 ? (drawerNo - 8) * 2 : (drawerNo * 2 - 1)) - 1) * this.labelCount + 10 + colNo;
+                byte[] buffer = new byte[] { 0xaa, (byte)channel, 0x21, 0, 0, 0, 0, 0xee };
+                buffer[5] = (byte)(quantity >> 8);
+                buffer[6] = (byte)(quantity & 0xff);
+                canBusSerial.Write(buffer, 0, 8);
+            }
+            catch (Exception ex)
+            {
+                _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                {
+                    EventType = util.EventType.OPENERROR,
+                    WindowName = WindowName,
+                    Message = $"操作发生异常{ex.Message}"
+                });
+                logger.Info($"操作发生异常：ex:{ex.Message}");
+            }
+        }
+        public async Task WriteQuantityArray()
+        {
+            for (int i = 0; i < ColNos.Length; i++)
+            {
+                WriteQuantity(DrawerNo, ColNos[i], Stocks[i]);
+                 await Task.Delay(TimeSpan.FromMilliseconds(20));
+            }
+        }
+
+
+        #endregion
+
+        #region 回收箱操作
+        // 打开回收箱
+        public async Task<byte[]> OpenRecover()
+        {
+            try
+            {
+                canBusSerial.DiscardInBuffer();
+                byte[] buffer = new byte[] { 0xAA, 0x9A, 0x04, 0x00, 0x00, 0x00, 0x00, 0xEE };
+                canBusSerial.Write(buffer, 0, 8);
+
+                return await GetBufferByPort(canBusSerial, 8);
+            }
+            catch (Exception ex)
+            {
+                _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                {
+                    EventType = util.EventType.OPENERROR,
+                    WindowName = WindowName,
+                    Message = $"操作发生异常{ex.Message}"
+                });
+                logger.Info($"操作发生异常：ex:{ex.Message}");
+                return null;
+            }
+           
+        }
+        // 回收箱状态查询
+        public async Task<byte[]> CheckRecoverStatus()
+        {
+            try
+            {
+
+                canBusSerial.DiscardInBuffer();
+                byte[] buffer = new byte[] { 0xAA, 0x9A, 0x03, 0x00, 0x00, 0x00, 0x00, 0xEE };
+                canBusSerial.Write(buffer, 0, 8);
+
+                return await GetBufferByPort(canBusSerial, 8);
+            }
+            catch (Exception ex)
+            {
+                _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                {
+                    EventType = util.EventType.OPENERROR,
+                    WindowName = WindowName,
+                    Message = $"操作发生异常{ex.Message}"
+                });
+                logger.Info($"操作发生异常：ex:{ex.Message}");
+                return null;
+
+            }
+        }
+        // 回收箱回收数量查询
+        public async Task<byte[]> CheckRecoverQuantity()
+        {
+            try
+            {
+                canBusSerial.DiscardInBuffer();
+                byte[] buffer = new byte[] { 0xAA, 0x9A, (byte)(ColNos[0] > 3 ? 2 : 1), 0x00, 0x00, 0x00, 0x00, 0xEE };
+                canBusSerial.Write(buffer, 0, 8);
+
+                return await GetBufferByPort(canBusSerial, 8);
+
+            }
+            catch (Exception ex)
+            {
+                _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                {
+                    EventType = util.EventType.OPENERROR,
+                    WindowName = WindowName,
+                    Message = $"操作发生异常{ex.Message}"
+                });
+                logger.Info($"操作发生异常：ex:{ex.Message}");
+                return null;
+            }
+        }
+        #endregion
+
+        #region 称重操作
+        // 以板子为单位获取抽屉内所有库位的药品数量
+        public async Task<byte[]> CheckQuantityByAddr()
+        {
+
+            canBusSerial.DiscardInBuffer();
+            var channel = Convert.ToInt32((DrawerNo * 10 + 1).ToString(), 16);
+            byte[] buffer = new byte[] { 0xaa, (byte)(channel), 0x28, 0x00, 0x00, 0x00, 0x00, 0xee };
+            logger.Info($"称重发送库位数量查询1【{string.Join(",", buffer)}】");
+            canBusSerial.Write(buffer, 0, 8);
+            byte[] result1 = await GetBufferByPort(canBusSerial, 8);
+
+
+            var channel2 = Convert.ToInt32((DrawerNo * 10 + 2).ToString(), 16);
+            byte[] buffer2 = new byte[] { 0xaa, (byte)(channel2), 0x28, 0x00, 0x00, 0x00, 0x00, 0xee };
+            logger.Info($"称重发送库位数量查询2【{string.Join(",", buffer2)}】");
+            canBusSerial.Write(buffer2, 0, 8);
+            byte[] result2 = await GetBufferByPort(canBusSerial, 8);
+
+            byte[] res = new byte[6];
+            Array.Copy(result1, 3, res, 0, 3);
+            Array.Copy(result2, 3, res, 3, 3);
+
+            return res;
+
+        }
+
+        // 以板子为单位获取抽屉内所有库位的药品数量
+        public async Task<int[]> CheckQuantityByAddr2()
+        {
+
+
+            int[] res = new int[6];
+            for (int i = 0; i < ColNos.Length; i++)
+            {
+                canBusSerial.DiscardInBuffer();
+                var index = ColNos[i] > 3 ? 2 : 1;
+                var lock1 = ColNos[i] % 3 == 0 ? 3 : ColNos[i] % 3;
+                var channel = Convert.ToInt32((DrawerNo * 10 + index).ToString(), 16);
+                byte[] buffer = new byte[] { 0xaa, (byte)(channel), 0x27, (byte)lock1, 0x00, 0x00, 0x00, 0xee };
+
+                logger.Info($"称重发送库位数量查询1【{string.Join(",", buffer)}】");
+                canBusSerial.Write(buffer, 0, 8);
+                byte[] result = await GetBufferByPort(canBusSerial, 8);
+                logger.Info($"称重发送库位数量查询1返回结果【{string.Join(",", result)}】");
+                byte[] hl = result.Skip(3).Take(2).ToArray();
+                int quantity = BitConverter.ToInt16(hl.Reverse().ToArray(), 0);
+                res[ColNos[i] - 1] = quantity;
+            }
+
+            return res;
+
+        }
+
+        // 指定药盒指示灯开启使能开锁
+        public async Task BoxLockLightOn2()
+        {
+            for (int i = 0; i < ColNos.Length; i++)
+            {
+                var index = ColNos[i] > 3 ? 2 : 1;
+                var lock1 = ColNos[i] % 3 == 0 ? 3 : ColNos[i] % 3;
+                var channel = Convert.ToInt32((DrawerNo * 10 + index).ToString(), 16);
+                byte[] buffer = new byte[] { 0xaa, (byte)(channel), 0x03, (byte)lock1, 0x00, 0x00, 0x00, 0xee };
+                logger.Info($"称重发送药盒使能【{string.Join(",", buffer)}】");
+                canBusSerial.Write(buffer, 0, 8);
+                await Task.Delay(TimeSpan.FromMilliseconds(500));
+            }
+        }
+        // 指定药盒指示灯开启失能开锁
+        public async Task BoxLockLightOff2()
+        {
+            canBusSerial.DiscardInBuffer();
+            for (int i = 0; i < ColNos.Length; i++)
+            {
+                var index = ColNos[i] > 3 ? 2 : 1;
+                var lock1 = ColNos[i] % 3 == 0 ? 3 : ColNos[i] % 3;
+                var channel = Convert.ToInt32((DrawerNo * 10 + index).ToString(), 16);
+                byte[] buffer = new byte[] { 0xaa, (byte)(channel), 0x04, (byte)lock1, 0x00, 0x00, 0x00, 0xee };
+                logger.Info($"称重发送药盒失能【{string.Join(",", buffer)}】");
+                canBusSerial.Write(buffer, 0, 8);
+                await Task.Delay(TimeSpan.FromMilliseconds(50));
+            }
+        }
+
+        public async void ClearCount(int DrawerNo, int ColNo)
+        {
+            try
+            {
+                canBusSerial.DiscardInBuffer();
+                var index = ColNo > 3 ? 2 : 1;
+                var lock1 = ColNo % 3 == 0 ? 3 : ColNo % 3;
+                var channel = Convert.ToInt32((DrawerNo * 10 + index).ToString(), 16);
+                byte[] buffer = new byte[] { 0xaa, (byte)(channel), 0x25, (byte)lock1, 0x00, 0x00, 0x00, 0xee };
+
+                logger.Info($"称重发送清空计数【{string.Join(",", buffer)}】");
+                canBusSerial.Write(buffer, 0, 8);
+            }
+            catch (Exception ex)
+            {
+                _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                {
+                    EventType = util.EventType.OPENERROR,
+                    WindowName = WindowName,
+                    Message = $"操作发生异常{ex.Message}"
+                });
+                logger.Info($"操作发生异常：ex:{ex.Message},方法名：ClearCount；参数：{DrawerNo}，{ColNo}");
+            }
+           
+        }
+
+        public async void SetNumCount(int DrawerNo, int ColNo, int Quantity)
+        {
+            try
+            {
+                canBusSerial.DiscardInBuffer();
+                var index = ColNo > 3 ? 2 : 1;
+                var lock1 = ColNo % 3 == 0 ? 3 : ColNo % 3;
+                var channel = Convert.ToInt32((DrawerNo * 10 + index).ToString(), 16);
+                byte[] buffer = new byte[] { 0xaa, (byte)(channel), 0x26, (byte)lock1, 0x00, 0x00, 0x00, 0xee };
+
+
+                buffer[4] = (byte)(Quantity >> 8);
+                buffer[5] = (byte)(Quantity & 0xff);
+
+
+                logger.Info($"称重发送数量【{string.Join(",", buffer)}】");
+                canBusSerial.Write(buffer, 0, 8);
+            }
+            catch (Exception ex)
+            {
+                _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                {
+                    EventType = util.EventType.OPENERROR,
+                    WindowName = WindowName,
+                    Message = $"操作发生异常{ex.Message}"
+                });
+                logger.Info($"操作发生异常：ex:{ex.Message},方法名：SetNumCount；参数：{DrawerNo}，{ColNo},{Quantity}");
+            }
+            
+        }
+
+        #endregion
+        #endregion
+
+        public int labelCount = Convert.ToInt32(ConfigurationManager.AppSettings["labelCount"]);
+    }
+}
diff --git a/DM_Weight/Port/ScreenUtil.cs b/DM_Weight/Port/ScreenUtil.cs
new file mode 100644
index 0000000..1a45f6d
--- /dev/null
+++ b/DM_Weight/Port/ScreenUtil.cs
@@ -0,0 +1,171 @@
+using DM_Weight.Models;
+using log4net;
+using SuperSimpleTcp;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using System.Windows.Markup;
+
+namespace DM_Weight.Port
+{
+    public class ScreenUtil
+    {
+        private readonly ILog logger = LogManager.GetLogger(typeof(ScreenUtil));
+        SimpleTcpServer server = new SimpleTcpServer("0.0.0.0:8888");
+
+        string ipport { get; set; } = "";
+        public ScreenUtil()
+        {
+            server.Events.ClientConnected += (object sender, ConnectionEventArgs e) =>
+            {
+                ipport = e.IpPort;
+                logger.Info($"[{e.IpPort}] client connected");
+            };
+            server.Events.ClientDisconnected += (object sender, ConnectionEventArgs e) =>
+            {
+                logger.Info($"[{e.IpPort}] client disconnected: {e.Reason}");
+            };
+            server.Events.DataReceived += (object sender, DataReceivedEventArgs e) =>
+            {
+                logger.Info($"[{e.IpPort}]: {e.Data.Array}");
+            };
+            // let's go!
+            server.Start();
+        }
+
+
+        private byte[] head = new byte[] { 0xee, 0xb1, 0x12 };
+
+        private byte[] end = new byte[] { 0xFF, 0xFC, 0xFF, 0xFF };
+        public void SetStockInfo(ChannelStock channel, int screenId)
+        {
+            // 添加画面id
+            byte[] a = Copy2NewArr(head, HighLow(screenId));
+
+
+            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+            //if (channel.DrugInfo.DrugName != null)
+            //{
+            byte[] content = Encoding.GetEncoding("gb2312").GetBytes(channel.DrugInfo?.DrugName??"");
+                a = WriteInfo(a, content, channel.ColNo * 10 + 1);
+            //}
+            //if (channel.DrugInfo.Manufactory != null)
+            //{
+                byte[] content1 = Encoding.GetEncoding("gb2312").GetBytes(channel.DrugInfo?.Manufactory?? "");
+                a = WriteInfo(a, content1, channel.ColNo * 10 + 2);
+            //}
+            //if (channel.DrugInfo.DrugSpec != null)
+            //{
+                byte[] content2 = Encoding.GetEncoding("gb2312").GetBytes(channel.DrugInfo?.DrugSpec ?? "");
+                a = WriteInfo(a, content2, channel.ColNo * 10 + 3);
+            //}
+            //if (channel.ManuNo != null)
+            //{
+
+                byte[] content3 = Encoding.GetEncoding("gb2312").GetBytes(channel.ManuNo);
+                a = WriteInfo(a, content3, channel.ColNo * 10 + 4);
+            //}
+            //if (channel.EffDate != null)
+            //{
+                byte[] content4 = Encoding.GetEncoding("gb2312").GetBytes(channel.EffDate);
+                a = WriteInfo(a, content4, channel.ColNo * 10 + 5);
+            //}
+            //if (channel.Quantity != null)
+            //{
+                byte[] content5 = Encoding.GetEncoding("gb2312").GetBytes(channel.Quantity.ToString());
+                a = WriteInfo(a, content5, channel.ColNo * 10 + 6);
+            //}
+            // 添加结束块
+            byte[] b = Copy2NewArr(a, end);
+            server.Send(ipport, b);
+        }
+
+
+        public void TellChange(int d)
+        {
+            byte[] buffer = new byte[] { 0xee, 0xb5, 0x01, 0x00, 0xFF, 0xFC, 0xFF, 0xFF };
+
+        }
+
+        public void SetStockInfo(List<ChannelStock> channels, int screenId)
+        {
+            // 添加画面id
+            byte[] a = Copy2NewArr(head, HighLow(screenId));
+
+
+            for (int i = 0; i < channels.Count; i++)
+            {
+                ChannelStock channel = channels[i];
+                if (channel.DrugInfo.DrugName != null)
+                {
+                    byte[] content = Encoding.ASCII.GetBytes(channel.DrugInfo.DrugName);
+                    a = WriteInfo(a, content, channels[0].DrawerNo * 10 + 1);
+                }
+                if (channel.DrugInfo.Manufactory != null)
+                {
+                    byte[] content = Encoding.ASCII.GetBytes(channel.DrugInfo.Manufactory);
+                    a = WriteInfo(a, content, channels[0].DrawerNo * 10 + 2);
+                }
+                if (channel.DrugInfo.DrugSpec != null)
+                {
+                    byte[] content = Encoding.ASCII.GetBytes(channel.DrugInfo.DrugSpec);
+                    a = WriteInfo(a, content, channels[0].DrawerNo * 10 + 3);
+                }
+                if (channel.ManuNo != null)
+                {
+
+                    byte[] content = Encoding.ASCII.GetBytes(channel.ManuNo);
+                    a = WriteInfo(a, content, channels[0].DrawerNo * 10 + 4);
+                }
+                if (channel.EffDate != null)
+                {
+                    byte[] content = Encoding.ASCII.GetBytes(channel.EffDate);
+                    a = WriteInfo(a, content, channels[0].DrawerNo * 10 + 5);
+                }
+                if (channel.Quantity != null)
+                {
+                    byte[] content = Encoding.ASCII.GetBytes(channel.Quantity.ToString());
+                    a = WriteInfo(a, content, channels[0].DrawerNo * 10 + 6);
+                }
+
+
+            }
+            // 添加结束块
+            byte[] b = Copy2NewArr(a, end);
+            server.Send(ipport, b);
+        }
+
+
+        public byte[] WriteInfo(byte[] a, byte[] content, int id)
+        {
+            // 添加控件id
+            byte[] b = Copy2NewArr(a, HighLow(id));
+            // 添加需要向控件内写入的字节长度
+            byte[] c = Copy2NewArr(b, HighLow(content.Length));
+            // 写入内容
+            return Copy2NewArr(c, content);
+        }
+
+        public byte[] HighLow(int data)
+        {
+            byte high = Convert.ToByte((data >> 8) & 0x00ff); //位运算：右移8位
+            byte low = Convert.ToByte(data & 0x00ff);         //去掉高位
+            return new byte[] {high, low};
+        }
+
+        public byte[] Copy2NewArr(byte[] source1, byte[] source2)
+        {
+            byte[] target = new byte[source1.Length + source2.Length];
+            Buffer.BlockCopy(source1, 0, target, 0, source1.Length);
+            Buffer.BlockCopy(source2, 0, target, source1.Length, source2.Length);
+            return target;
+        }
+
+
+
+    }
+}
diff --git a/DM_Weight/Report/GridReportUtil.cs b/DM_Weight/Report/GridReportUtil.cs
new file mode 100644
index 0000000..3d2b683
--- /dev/null
+++ b/DM_Weight/Report/GridReportUtil.cs
@@ -0,0 +1,200 @@
+using gregn6Lib;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DM_Weight.Models;
+using System.Configuration;
+using DM_Weight.util;
+
+namespace DM_Weight.Report
+{
+    public class GridReportUtil
+    {
+
+        // 定义Grid++Report报表主对象
+        public static GridppReport Report = new GridppReport();
+        public static string gridConnectionString =  ConfigurationManager.AppSettings["gridConnectionString"];
+        /**
+         * 打印预览
+         * tempname: 模板文件名称
+         * data: 模板数据
+         */
+        public static void PrintReport(string tempname, object data)
+        {
+            // 定义Grid++Report报表主对象
+            GridppReport Report = new GridppReport();
+            // 加载模板文件
+            Report.LoadFromFile(new FileInfo(AppDomain.CurrentDomain.BaseDirectory) + "ReportTemp//" + tempname);
+            string s = JsonConvert.SerializeObject(data);
+            // 加载数据
+            Report.LoadDataFromXML(JsonConvert.SerializeObject(data));
+            Report.PrintPreview(true);
+        }
+
+        public static void PrintReportStock()
+        {
+            // 定义Grid++Report报表主对象
+            GridppReport Report = new GridppReport();
+            Report.Initialize += new _IGridppReportEvents_InitializeEventHandler(() =>
+            {
+                Report.ParameterByName("machine_id").Value = (ConfigurationManager.AppSettings["machineId"] ?? "DM1");
+            });
+            string machine_id=(ConfigurationManager.AppSettings["machineId"] ?? "DM1"); 
+            string SQL = $@"SELECT cl.`row_no` AS drawerNo,cl.`col_no` AS colNo,cl.`quantity` AS quantity,cl.`manu_no` AS manuNo,cl.`eff_date` AS effDate,
+                          di.`drug_name` AS drugName,di.`drug_spec` AS drugSpec,di.`pack_unit` AS packUnit,di.`manufactory` AS manuFactory,di.`max_stock` AS baseQuantity,
+                          cl.`drug_id` AS drugId FROM channel_stock cl INNER JOIN drug_info di ON di.`drug_id` = cl.`drug_id` WHERE cl.`machine_id` =  '{machine_id}' AND cl.`drawer_type` = 1 ORDER BY cl.`drug_id`";
+            // 加载模板文件
+            Report.LoadFromFile(new FileInfo(AppDomain.CurrentDomain.BaseDirectory) + "ReportTemp//" + "stock_template.grf");
+            Report.DetailGrid.Recordset.ConnectionString = gridConnectionString;
+            Report.DetailGrid.Recordset.QuerySQL = SQL;
+            Report.PrintPreview(true);
+        }
+        public static void PrintReportAccountBook(DateTime? startDate, DateTime? endDate)
+        {
+            DateTime? p_startDate = startDate ?? Convert.ToDateTime("2010-1-1");
+            DateTime? p_endDate = endDate ?? DateTime.Now.AddDays(1);
+            string p_machine_id= (ConfigurationManager.AppSettings["machineId"] ?? "DM1");
+            // 定义Grid++Report报表主对象
+             GridppReport Report = new GridppReport();
+            // 加载模板文件
+            Report.LoadFromFile(new FileInfo(AppDomain.CurrentDomain.BaseDirectory) + "ReportTemp//" + "account_book_temp.grf");
+            string SQL = string.Empty;
+            Report.DetailGrid.Recordset.ConnectionString = gridConnectionString;
+            Report.Initialize += new _IGridppReportEvents_InitializeEventHandler(() =>
+            {
+                Report.ParameterByName("machine_id").Value = (ConfigurationManager.AppSettings["machineId"] ?? "DM1");
+                Report.ParameterByName("startDate").Value = startDate ?? Convert.ToDateTime("2010-1-1");
+                Report.ParameterByName("endDate").Value = endDate ?? DateTime.Now.AddDays(1);
+            });
+            //Report.DetailGrid.Recordset.QuerySQL = SQL;
+            SQL = $@"SELECT  mr.`stock_quantity` AS `stockQuantity`, IF(mr.`type` IN (1, 31), mr.`quantity`, IF(mr.`type` = 4 AND mr.`quantity` > 0, mr.`quantity`, 0)) 
+                        AS `inQuantity`, IF(mr.`type` = 2, mr.`quantity`, IF(mr.`type` = 4 AND mr.`quantity` < 0, (0 - mr.`quantity`), 0)) AS `outQuantity`,
+                         mr.`operation_time` AS `operationTime`,IF(mr.`type`=1,mr.`invoice_id`,NULL) AS `invoiceId`, di.`drug_name` AS `drugName`, di.`drug_id` AS `drugId`,
+                         di.`drug_spec` AS `drugSpec`, di.`pack_unit` AS `packUnit`, di.`dosage` AS `dosage`, di.`manufactory` AS `manufactory`, 
+                        mr.`manu_no` AS `manuNo`, mr.`eff_date` AS `effDate`, u1.`user_name` AS `operatorName`, u2.`user_name` AS `reviewerName` FROM 
+                        dm_machine_record mr  LEFT JOIN drug_info di ON mr.`drug_id` = di.`drug_id`  LEFT JOIN user_list u1 ON mr.`operator` = u1.`id`  
+                        LEFT JOIN user_list u2 ON mr.`reviewer` = u2.`id` WHERE mr.`machine_id` = '{p_machine_id}' AND mr.`operation_time` > '{p_startDate}'
+                        AND mr.`operation_time` < '{p_endDate}'  ORDER BY mr.`drug_id`, mr.`operation_time`, mr.`id`";
+            Report.DetailGrid.Recordset.QuerySQL = SQL;
+            Report.PrintPreview(true);
+        }
+
+        public static void PrintReportMechineRecord(int type, DateTime? startDate, DateTime? endDate)
+        {
+            // 定义Grid++Report报表主对象
+            GridppReport Report = new GridppReport();
+            DateTime? p_startDate = startDate ?? Convert.ToDateTime("2010-1-1");
+            DateTime? p_endDate = endDate ?? DateTime.Now.AddDays(1);
+            string p_machine_id = (ConfigurationManager.AppSettings["machineId"] ?? "DM1");
+            string SQL = string.Empty;
+            Report.Initialize += new _IGridppReportEvents_InitializeEventHandler(() =>
+            {
+                Report.ParameterByName("machine_id").Value = (ConfigurationManager.AppSettings["machineId"] ?? "DM1");
+                Report.ParameterByName("startDate").Value = startDate ?? DateTime.Now.AddYears(-10);
+                Report.ParameterByName("endDate").Value = endDate ?? DateTime.Now.AddDays(1);
+            });
+            // 加载模板文件
+            if (type == 1)
+            {
+                Report.LoadFromFile(new FileInfo(AppDomain.CurrentDomain.BaseDirectory) + "ReportTemp//" + "machine_log_add.grf");
+                SQL = $@"SELECT dmr.`drawer_no` AS drawerNo,dmr.`col_no` AS colNo,dmr.`type` AS `type`,dmr.`quantity` AS quantity,
+                      dmr.`manu_no` AS manuNo,dmr.`eff_date` AS effDate,dmr.`operation_time` AS operationTime,
+                      di.`drug_name` AS drugName,di.`drug_spec` AS drugSpec,di.`pack_unit` AS packUnit,
+                      di.`manufactory` AS manuFactory,di.`max_stock` AS baseQuantity,dmr.`drug_id` AS drugId,
+                      ul.`user_name` AS nickname FROM dm_machine_record dmr LEFT JOIN drug_info di ON di.`drug_id` = dmr.`drug_id`
+                    LEFT JOIN user_list ul ON ul.`id` = dmr.`Operator` WHERE dmr.`type` = 1 AND dmr.`machine_id` = '{p_machine_id}'
+                     AND dmr.`operation_time` > '{p_startDate}' AND dmr.`operation_time` < '{p_endDate}'";
+            }
+            else if (type == 2)
+            {
+                Report.LoadFromFile(new FileInfo(AppDomain.CurrentDomain.BaseDirectory) + "ReportTemp//" + "machine_log_take.grf");
+                SQL = $@" SELECT dmr.`drawer_no` AS drawerNo,dmr.`col_no` AS colNo,dmr.`type` AS `type`,dmr.`quantity` AS quantity,
+                      dmr.`manu_no` AS manuNo,dmr.`eff_date` AS effDate,dmr.`operation_time` AS operationTime,
+                      di.`drug_name` AS drugName,di.`drug_spec` AS drugSpec,di.`pack_unit` AS packUnit,
+                      di.`manufactory` AS manuFactory,di.`max_stock` AS baseQuantity,dmr.`drug_id` AS drugId,
+                      ul.`user_name` AS nickname FROM dm_machine_record dmr LEFT JOIN drug_info di ON di.`drug_id` = dmr.`drug_id`
+                    LEFT JOIN user_list ul ON ul.`id` = dmr.`Operator` WHERE dmr.`type` = 2 
+                     AND dmr.`machine_id` ='{p_machine_id}'  AND dmr.`operation_time` > '{p_startDate}'
+                     AND dmr.`operation_time` < '{p_endDate}'";
+            }
+            else if (type == 3)
+            {
+                Report.LoadFromFile(new FileInfo(AppDomain.CurrentDomain.BaseDirectory) + "ReportTemp//" + "machine_log_return.grf");
+                SQL = $@" SELECT dmr.`drawer_no` AS drawerNo,dmr.`col_no` AS colNo,dmr.`type` AS `type`,
+                      CONCAT(dmr.`quantity`,IF(dmr.`type`=32,""(空瓶)"","""")) AS quantity,dmr.`manu_no` AS manuNo,
+                      dmr.`eff_date` AS effDate,dmr.`operation_time` AS operationTime,di.`drug_name` AS drugName,
+                      di.`drug_spec` AS drugSpec,di.`pack_unit` AS packUnit,
+                      di.`manufactory` AS manuFactory,di.`max_stock` AS baseQuantity,
+                      dmr.`drug_id` AS drugId,ul.`user_name` AS nickname FROM dm_machine_record dmr
+                    LEFT JOIN drug_info di ON di.`drug_id` = dmr.`drug_id` LEFT JOIN user_list ul ON ul.`id` = dmr.`Operator`
+                    WHERE dmr.`type` in (31, 32) AND dmr.`machine_id` = '{p_machine_id}' AND dmr.`operation_time` > '{p_startDate}'
+                     AND dmr.`operation_time` < '{p_endDate}'";
+            }
+            else
+            {
+                Report.LoadFromFile(new FileInfo(AppDomain.CurrentDomain.BaseDirectory) + "ReportTemp//" + "machine_log_check.grf");
+                SQL = $@" SELECT dmr.`drawer_no` AS drawerNo,dmr.`col_no` AS colNo,dmr.`type` AS `type`,dmr.`quantity` AS quantity,
+                          dmr.`manu_no` AS manuNo,dmr.`eff_date` AS effDate,dmr.`operation_time` AS operationTime,
+                          di.`drug_name` AS drugName,di.`drug_spec` AS drugSpec,di.`pack_unit` AS packUnit,
+                          di.`manufactory` AS manuFactory,di.`max_stock` AS baseQuantity,dmr.`drug_id` AS drugId,
+                          ul.`user_name` AS nickname FROM dm_machine_record dmr LEFT JOIN drug_info di ON di.`drug_id` = dmr.`drug_id`
+                        LEFT JOIN user_list ul ON ul.`id` = dmr.`Operator` WHERE dmr.`type` = 4 
+                         AND dmr.`machine_id` = '{p_machine_id}' AND dmr.`operation_time` > '{p_startDate}'
+                        AND dmr.`operation_time` < '{p_endDate}'";
+            }
+            
+            Report.DetailGrid.Recordset.ConnectionString = gridConnectionString;
+            Report.DetailGrid.Recordset.QuerySQL= SQL;
+
+            Report.PrintPreview(true);
+        }
+
+
+
+        /**
+         * 打印预览
+         * tempname: 模板文件名称
+         * data: 模板数据
+         */
+        public static void PrintMachineRecordReport(List<MachineRecord> data)
+        {
+            // 定义Grid++Report报表主对象
+            GridppReport Report = new GridppReport();
+            // 加载模板文件
+            Report.LoadFromFile(new FileInfo(AppDomain.CurrentDomain.BaseDirectory) + "ReportTemp//machine_log.grf");
+            
+            // 加载数据
+            Report.ParameterByName("type").AsInteger = 1;
+            Report.PrintPreview(true);
+        }
+        //交接班记录报表
+        public static void PrintChangeShiftsReport(DateTime? startDate,DateTime? endDate)
+        {
+            DateTime? p_startDate = startDate ?? Convert.ToDateTime("2010-1-1");
+            DateTime? p_endDate = endDate ?? DateTime.Now.AddDays(1);
+            string p_machine_id = (ConfigurationManager.AppSettings["machineId"] ?? "DM1");
+            // 定义Grid++Report报表主对象
+            GridppReport Report = new GridppReport();
+            // 加载模板文件
+            Report.LoadFromFile(new FileInfo(AppDomain.CurrentDomain.BaseDirectory) + "ReportTemp//" + "changeShifts_temp.grf");
+            string SQL = string.Empty;
+            Report.DetailGrid.Recordset.ConnectionString = gridConnectionString;
+            Report.Initialize += new _IGridppReportEvents_InitializeEventHandler(() =>
+            {
+                Report.ParameterByName("machine_id").Value = (ConfigurationManager.AppSettings["machineId"] ?? "DM1");
+                Report.ParameterByName("startDate").Value = startDate ?? Convert.ToDateTime("2010-1-1");
+                Report.ParameterByName("endDate").Value = endDate ?? DateTime.Now.AddDays(1);
+            });
+            SQL = $@"SELECT opt_date,drug_name,drug_spec,beforenum,getnum,usenum,manu_no,surplus,CONCAT(fromoperator,' ',fromreviewer) as fromoperator,
+                    CONCAT(tooperator,' ',toreviewer) as tooperator
+                    from `hkc_shiftsreport` WHERE `machineid` = '{p_machine_id}' AND `opt_date` > '{p_startDate}'
+                        AND opt_date < '{p_endDate}'  ORDER BY opt_date";
+            Report.DetailGrid.Recordset.QuerySQL = SQL;
+            Report.PrintPreview(true);
+        }
+    }
+}
diff --git a/DM_Weight/ReportTemp/account_book_temp.grf b/DM_Weight/ReportTemp/account_book_temp.grf
new file mode 100644
index 0000000..84f2732
--- /dev/null
+++ b/DM_Weight/ReportTemp/account_book_temp.grf
@@ -0,0 +1,606 @@
+{
+	"Version":"6.3.0.1",
+	"Font":{
+		"Name":"宋体",
+		"Size":105000,
+		"Weight":400,
+		"Charset":134
+	},
+	"Printer":{
+		"Oriention":"Landscape",
+		"LeftMargin":1,
+		"TopMargin":1.42875,
+		"RightMargin":1,
+		"BottomMargin":1.8
+	},
+	"DetailGrid":{
+		"CenterView":true,
+		"AppendBlankRow":true,
+		"Recordset":{
+			"Field":[
+				{
+					"Name":"日期",
+					"Type":"DateTime",
+					"Format":"M/d",
+					"DBFieldName":"operationTime"
+				},
+				{
+					"Name":"操作类型",
+					"DBFieldName":"type"
+				},
+				{
+					"Name":"批号",
+					"DBFieldName":"manuNo"
+				},
+				{
+					"Name":"上次批次结存",
+					"Type":"Integer",
+					"DBFieldName":"beforeManuQuan"
+				},
+				{
+					"Name":"入库数量",
+					"Type":"Integer",
+					"DBFieldName":"inQuantity"
+				},
+				{
+					"Name":"出库数量",
+					"Type":"Integer",
+					"DBFieldName":"outQuantity"
+				},
+				{
+					"Name":"批号结存",
+					"Type":"Integer",
+					"DBFieldName":"manuQuantity"
+				},
+				{
+					"Name":"总结存",
+					"Type":"Integer",
+					"DBFieldName":"stockQuantity"
+				},
+				{
+					"Name":"收/发药人",
+					"DBFieldName":"operatorName"
+				},
+				{
+					"Name":"复核人",
+					"DBFieldName":"reviewerName"
+				},
+				{
+					"Name":"药品名称",
+					"DBFieldName":"drugName"
+				},
+				{
+					"Name":"规格",
+					"DBFieldName":"drugSpec"
+				},
+				{
+					"Name":"单位",
+					"DBFieldName":"packUnit"
+				},
+				{
+					"Name":"剂型",
+					"DBFieldName":"dosage"
+				},
+				{
+					"Name":"厂家",
+					"DBFieldName":"manuFactory"
+				},
+				{
+					"Name":"有效期",
+					"Type":"DateTime",
+					"Format":"yy/M/d",
+					"DBFieldName":"effDate"
+				},
+				{
+					"Name":"sign1",
+					"Type":"Binary"
+				},
+				{
+					"Name":"sign2",
+					"Type":"Binary"
+				},
+				{
+					"Name":"drugId"
+				},
+				{
+					"Name":"凭证号",
+					"DBFieldName":"invoiceId"
+				}
+			]
+		},
+		"Column":[
+			{
+				"Name":"日期",
+				"Width":1.77271
+			},
+			{
+				"Name":"凭证号",
+				"Width":2.19604
+			},
+			{
+				"Name":"批号",
+				"Width":3.99521
+			},
+			{
+				"Name":"有效期",
+				"Width":2.43417
+			},
+			{
+				"Name":"入库数量",
+				"Width":1.79917
+			},
+			{
+				"Name":"出库数量",
+				"Width":1.79917
+			},
+			{
+				"Name":"Column4",
+				"Width":1.98438
+			},
+			{
+				"Name":"收/发药人",
+				"Width":2.80458
+			},
+			{
+				"Name":"复核人",
+				"Width":2.80458
+			},
+			{
+				"Name":"Column2",
+				"Width":2.35479
+			},
+			{
+				"Name":"Column3",
+				"Width":2.38125
+			}
+		],
+		"ColumnContent":{
+			"Height":0.85,
+			"ColumnContentCell":[
+				{
+					"Column":"日期",
+					"TextAlign":"MiddleCenter",
+					"DataField":"日期"
+				},
+				{
+					"Column":"凭证号",
+					"DataField":"凭证号"
+				},
+				{
+					"Column":"批号",
+					"TextAlign":"MiddleCenter",
+					"DataField":"批号"
+				},
+				{
+					"Column":"有效期",
+					"TextAlign":"MiddleCenter",
+					"DataField":"有效期"
+				},
+				{
+					"Column":"入库数量",
+					"TextAlign":"MiddleCenter",
+					"DataField":"入库数量"
+				},
+				{
+					"Column":"出库数量",
+					"TextAlign":"MiddleCenter",
+					"DataField":"出库数量"
+				},
+				{
+					"Column":"Column4",
+					"TextAlign":"MiddleCenter",
+					"DataField":"总结存"
+				},
+				{
+					"Column":"收/发药人",
+					"FreeCell":true,
+					"Control":[
+						{
+							"Type":"FieldBox",
+							"Name":"FieldBox12",
+							"Dock":"Fill",
+							"TextAlign":"MiddleCenter",
+							"DataField":"收/发药人"
+						}
+					]
+				},
+				{
+					"Column":"复核人",
+					"FreeCell":true,
+					"Control":[
+						{
+							"Type":"FieldBox",
+							"Name":"FieldBox13",
+							"Dock":"Fill",
+							"TextAlign":"MiddleCenter",
+							"DataField":"复核人"
+						}
+					]
+				},
+				{
+					"Column":"Column2",
+					"FreeCell":true,
+					"Control":[
+						{
+							"Type":"StaticBox",
+							"Name":"StaticBox6",
+							"Dock":"Fill",
+							"TextAlign":"MiddleCenter",
+							"Text":"药库"
+						}
+					]
+				},
+				{
+					"Column":"Column3",
+					"FreeCell":true,
+					"Control":[
+						{
+							"Type":"StaticBox",
+							"Name":"StaticBox7",
+							"Dock":"Fill",
+							"TextAlign":"MiddleCenter",
+							"Text":"门诊药房"
+						}
+					]
+				}
+			]
+		},
+		"ColumnTitle":{
+			"Height":1.19063,
+			"RepeatStyle":"OnGroupHeaderPage",
+			"ColumnTitleCell":[
+				{
+					"GroupTitle":false,
+					"Column":"日期",
+					"Font":{
+						"Name":"宋体",
+						"Size":105000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"日期"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"凭证号",
+					"Font":{
+						"Name":"宋体",
+						"Size":105000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"凭证号"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"批号",
+					"Font":{
+						"Name":"宋体",
+						"Size":105000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"批号"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"有效期",
+					"Font":{
+						"Name":"宋体",
+						"Size":105000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"有效\r\n期"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"入库数量",
+					"Font":{
+						"Name":"宋体",
+						"Size":105000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"借入\r\n数量"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"出库数量",
+					"Font":{
+						"Name":"宋体",
+						"Size":105000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"发出\r\n数量"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"Column4",
+					"Font":{
+						"Name":"宋体",
+						"Size":105000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"总结存"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"收/发药人",
+					"Font":{
+						"Name":"宋体",
+						"Size":105000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"发药人"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"复核人",
+					"Font":{
+						"Name":"宋体",
+						"Size":105000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"复核人"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"Column2",
+					"Font":{
+						"Name":"宋体",
+						"Size":105000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"供应单位"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"Column3",
+					"Font":{
+						"Name":"宋体",
+						"Size":105000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"领用部门"
+				}
+			]
+		},
+		"Group":[
+			{
+				"Name":"Group1",
+				"ByFields":"drugId",
+				"GroupHeader":{
+					"PrintGridBorder":false,
+					"RepeatOnPage":true,
+					"Control":[
+						{
+							"Type":"StaticBox",
+							"Name":"StaticBox15",
+							"Left":28.3898,
+							"Top":0.238125,
+							"Width":2.01083,
+							"Height":0.79375,
+							"Text":"生产厂家："
+						},
+						{
+							"Type":"MemoBox",
+							"Name":"MemoBox11",
+							"Left":30.3742,
+							"Top":0.211667,
+							"Width":5.3975,
+							"Height":0.79375,
+							"Text":"[#manuFactory#]"
+						},
+						{
+							"Type":"StaticBox",
+							"Name":"StaticBox16",
+							"Top":0.0529167,
+							"Width":1.19063,
+							"Height":0.978958,
+							"Font":{
+								"Name":"宋体",
+								"Size":105000,
+								"Bold":true,
+								"Charset":134
+							},
+							"Text":"品名："
+						},
+						{
+							"Type":"FieldBox",
+							"Name":"FieldBox7",
+							"Left":1.16417,
+							"Top":0.0529167,
+							"Width":5.63563,
+							"Height":0.978958,
+							"Font":{
+								"Name":"宋体",
+								"Size":105000,
+								"Bold":true,
+								"Charset":134
+							},
+							"DataField":"药品名称"
+						},
+						{
+							"Type":"StaticBox",
+							"Name":"StaticBox17",
+							"Left":6.93208,
+							"Top":0.0529167,
+							"Width":1.11125,
+							"Height":0.978958,
+							"Font":{
+								"Name":"宋体",
+								"Size":105000,
+								"Bold":true,
+								"Charset":134
+							},
+							"Text":"规格："
+						},
+						{
+							"Type":"FieldBox",
+							"Name":"FieldBox8",
+							"Left":8.01688,
+							"Top":0.0529167,
+							"Width":3.175,
+							"Height":0.978958,
+							"Font":{
+								"Name":"宋体",
+								"Size":105000,
+								"Bold":true,
+								"Charset":134
+							},
+							"DataField":"规格"
+						},
+						{
+							"Type":"StaticBox",
+							"Name":"StaticBox18",
+							"Left":11.5888,
+							"Top":0.0529167,
+							"Width":1.21708,
+							"Height":0.978958,
+							"Font":{
+								"Name":"宋体",
+								"Size":105000,
+								"Bold":true,
+								"Charset":134
+							},
+							"Text":"单位："
+						},
+						{
+							"Type":"FieldBox",
+							"Name":"FieldBox9",
+							"Left":12.7794,
+							"Top":0.0529167,
+							"Width":1.87854,
+							"Height":0.978958,
+							"Font":{
+								"Name":"宋体",
+								"Size":105000,
+								"Bold":true,
+								"Charset":134
+							},
+							"DataField":"单位"
+						},
+						{
+							"Type":"StaticBox",
+							"Name":"StaticBox19",
+							"Left":15.3988,
+							"Top":0.0529167,
+							"Width":1.16417,
+							"Height":0.978958,
+							"Font":{
+								"Name":"宋体",
+								"Size":105000,
+								"Bold":true,
+								"Charset":134
+							},
+							"Text":"剂型："
+						},
+						{
+							"Type":"FieldBox",
+							"Name":"FieldBox10",
+							"Left":16.5365,
+							"Top":0.0529167,
+							"Width":2.83104,
+							"Height":0.978958,
+							"Font":{
+								"Name":"宋体",
+								"Size":105000,
+								"Bold":true,
+								"Charset":134
+							},
+							"DataField":"剂型"
+						},
+						{
+							"Type":"StaticBox",
+							"Name":"StaticBox20",
+							"Left":19.7379,
+							"Top":0.0529167,
+							"Width":2.01083,
+							"Height":0.978958,
+							"Font":{
+								"Name":"宋体",
+								"Size":105000,
+								"Bold":true,
+								"Charset":134
+							},
+							"Text":"生产厂家："
+						},
+						{
+							"Type":"FieldBox",
+							"Name":"FieldBox11",
+							"Left":21.7223,
+							"Top":0.05,
+							"Width":5.92667,
+							"Height":0.978958,
+							"Font":{
+								"Name":"宋体",
+								"Size":105000,
+								"Bold":true,
+								"Charset":134
+							},
+							"DataField":"厂家"
+						}
+					],
+					"NewPageColumn":"Before"
+				},
+				"GroupFooter":{
+					"Visible":false
+				}
+			}
+		]
+	},
+	"Parameter":[
+		{
+			"Name":"machine_id"
+		},
+		{
+			"Name":"startDate",
+			"DataType":"DateTime"
+		},
+		{
+			"Name":"endDate",
+			"DataType":"DateTime"
+		}
+	],
+	"ReportHeader":[
+		{
+			"Name":"ReportHeader1",
+			"Height":1.79917,
+			"Control":[
+				{
+					"Type":"MemoBox",
+					"Name":"MemoBox1",
+					"Dock":"Fill",
+					"Center":"Both",
+					"Font":{
+						"Name":"宋体",
+						"Size":262500,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"麻醉、精神药品逐笔专用账册"
+				}
+			],
+			"RepeatOnPage":true
+		}
+	]
+}
\ No newline at end of file
diff --git a/DM_Weight/ReportTemp/changeShifts_temp.grf b/DM_Weight/ReportTemp/changeShifts_temp.grf
new file mode 100644
index 0000000..3d4f4e1
--- /dev/null
+++ b/DM_Weight/ReportTemp/changeShifts_temp.grf
@@ -0,0 +1,346 @@
+{
+	"Version":"6.3.0.1",
+	"Font":{
+		"Name":"宋体",
+		"Size":105000,
+		"Weight":400,
+		"Charset":134
+	},
+	"Printer":{
+		"Oriention":"Landscape",
+		"LeftMargin":1,
+		"TopMargin":1.4287,
+		"RightMargin":1,
+		"BottomMargin":1.8
+	},
+	"DetailGrid":{
+		"CenterView":true,
+		"Recordset":{
+			"Field":[
+				{
+					"Name":"日期",
+					"Type":"DateTime",
+					"Format":"yyyy/MM/dd",
+					"DBFieldName":"opt_date"
+				},
+				{
+					"Name":"品名",
+					"DBFieldName":"drug_name"
+				},
+				{
+					"Name":"规格",
+					"DBFieldName":"drug_spec"
+				},
+				{
+					"Name":"上班结存数",
+					"Type":"Integer",
+					"DBFieldName":"beforenum"
+				},
+				{
+					"Name":"领用数",
+					"Type":"Integer",
+					"DBFieldName":"getnum"
+				},
+				{
+					"Name":"消耗数",
+					"Type":"Integer",
+					"DBFieldName":"usenum"
+				},
+				{
+					"Name":"批号",
+					"Type":"Integer",
+					"DBFieldName":"manu_no"
+				},
+				{
+					"Name":"余",
+					"Type":"Integer",
+					"DBFieldName":"surplus"
+				},
+				{
+					"Name":"交班人",
+					"DBFieldName":"fromoperator"
+				},
+				{
+					"Name":"接班人",
+					"DBFieldName":"tooperator"
+				}
+			]
+		},
+		"Column":[
+			{
+				"Name":"日期",
+				"Width":2.56646
+			},
+			{
+				"Name":"品名",
+				"Width":4.60375
+			},
+			{
+				"Name":"规格",
+				"Width":2.59292
+			},
+			{
+				"Name":"上班结存数",
+				"Width":1.4
+			},
+			{
+				"Name":"领用数",
+				"Width":1.4
+			},
+			{
+				"Name":"消耗数",
+				"Width":1.4
+			},
+			{
+				"Name":"批号",
+				"Width":1.98438
+			},
+			{
+				"Name":"余",
+				"Width":0.608542
+			},
+			{
+				"Name":"交班人",
+				"Width":2.80458
+			},
+			{
+				"Name":"接班人",
+				"Width":2.35479
+			}
+		],
+		"ColumnContent":{
+			"Height":0.85,
+			"ColumnContentCell":[
+				{
+					"Column":"日期",
+					"TextAlign":"MiddleCenter",
+					"DataField":"日期"
+				},
+				{
+					"Column":"品名",
+					"DataField":"品名"
+				},
+				{
+					"Column":"规格",
+					"TextAlign":"MiddleCenter",
+					"DataField":"规格"
+				},
+				{
+					"Column":"上班结存数",
+					"TextAlign":"MiddleCenter",
+					"DataField":"上班结存数"
+				},
+				{
+					"Column":"领用数",
+					"TextAlign":"MiddleCenter",
+					"DataField":"领用数"
+				},
+				{
+					"Column":"消耗数",
+					"TextAlign":"MiddleCenter",
+					"DataField":"消耗数"
+				},
+				{
+					"Column":"批号",
+					"TextAlign":"MiddleCenter",
+					"DataField":"批号"
+				},
+				{
+					"Column":"余",
+					"TextAlign":"MiddleCenter",
+					"DataField":"余"
+				},
+				{
+					"Column":"交班人",
+					"TextAlign":"MiddleCenter",
+					"DataField":"交班人"
+				},
+				{
+					"Column":"接班人",
+					"TextAlign":"MiddleCenter",
+					"DataField":"接班人"
+				}
+			]
+		},
+		"ColumnTitle":{
+			"Height":1.00542,
+			"RepeatStyle":"OnPage",
+			"ColumnTitleCell":[
+				{
+					"GroupTitle":false,
+					"Column":"日期",
+					"Font":{
+						"Name":"宋体",
+						"Size":105000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"日期"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"品名",
+					"Font":{
+						"Name":"宋体",
+						"Size":105000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"品名"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"规格",
+					"Font":{
+						"Name":"宋体",
+						"Size":105000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"规格"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"上班结存数",
+					"Font":{
+						"Name":"宋体",
+						"Size":105000,
+						"Bold":true,
+						"Charset":134
+					},
+					"WordWrap":true,
+					"TextAlign":"MiddleCenter",
+					"Text":"上班\r\n结存数"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"领用数",
+					"Font":{
+						"Name":"宋体",
+						"Size":105000,
+						"Bold":true,
+						"Charset":134
+					},
+					"WordWrap":true,
+					"TextAlign":"MiddleCenter",
+					"Text":"领用数"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"消耗数",
+					"Font":{
+						"Name":"宋体",
+						"Size":105000,
+						"Bold":true,
+						"Charset":134
+					},
+					"WordWrap":true,
+					"TextAlign":"MiddleCenter",
+					"Text":"消耗数"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"批号",
+					"Font":{
+						"Name":"宋体",
+						"Size":105000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"批号"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"余",
+					"Font":{
+						"Name":"宋体",
+						"Size":105000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"余"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"交班人",
+					"Font":{
+						"Name":"宋体",
+						"Size":105000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"交班人"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"接班人",
+					"Font":{
+						"Name":"宋体",
+						"Size":105000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"接班人"
+				}
+			]
+		},
+		"Group":[
+			{
+				"Name":"Group1",
+				"ByFields":"日期",
+				"GroupHeader":{
+					"Height":0,
+					"PrintGridBorder":false,
+					"NewPageColumn":"Before"
+				},
+				"GroupFooter":{
+					"Visible":false,
+					"PrintGridBorder":false
+				}
+			}
+		]
+	},
+	"Parameter":[
+		{
+			"Name":"machine_id"
+		},
+		{
+			"Name":"startDate",
+			"DataType":"DateTime"
+		},
+		{
+			"Name":"endDate",
+			"DataType":"DateTime"
+		}
+	],
+	"ReportHeader":[
+		{
+			"Name":"ReportHeader1",
+			"Height":1.79917,
+			"Control":[
+				{
+					"Type":"MemoBox",
+					"Name":"MemoBox1",
+					"Dock":"Fill",
+					"Center":"Both",
+					"Font":{
+						"Name":"宋体",
+						"Size":262500,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"交接班记录"
+				}
+			],
+			"RepeatOnPage":true
+		}
+	]
+}
\ No newline at end of file
diff --git a/DM_Weight/ReportTemp/machine_log_add.grf b/DM_Weight/ReportTemp/machine_log_add.grf
new file mode 100644
index 0000000..bf9031e
--- /dev/null
+++ b/DM_Weight/ReportTemp/machine_log_add.grf
@@ -0,0 +1,283 @@
+{
+	"Version":"6.3.0.1",
+	"Font":{
+		"Name":"宋体",
+		"Size":105000,
+		"Weight":400,
+		"Charset":134
+	},
+	"Printer":{
+		"LeftMargin":0.3175,
+		"TopMargin":0.899583,
+		"RightMargin":0.396875
+	},
+	"DetailGrid":{
+		"CenterView":true,
+		"AppendBlankRow":true,
+		"Recordset":{
+			"QuerySQL":"SELECT \r\n  dmr.`drawer_no` AS drawerNo,\r\n  dmr.`col_no` AS colNo,\r\n  dmr.`type` AS `type`,\r\n  dmr.`quantity` AS quantity,\r\n  dmr.`manu_no` AS manuNo,\r\n  dmr.`eff_date` AS effDate,\r\n  dmr.`operation_time` AS operationTime,\r\n  di.`drug_name` AS drugName,\r\n  di.`drug_spec` AS drugSpec,\r\n  di.`pack_unit` AS packUnit,\r\n  di.`manufactory` AS manuFactory,\r\n  di.`max_stock` AS baseQuantity,\r\n  dmr.`drug_id` AS drugId,\r\n  ul.`user_name` AS nickname\r\nFROM\r\n  dm_machine_record dmr\r\nLEFT JOIN drug_info di ON di.`drug_id` = dmr.`drug_id`\r\nLEFT JOIN user_list ul ON ul.`id` = dmr.`Operator`\r\nWHERE dmr.`type` = 1 \r\n AND dmr.`machine_id` = :machine_id\r\n AND dmr.`operation_time` > :startDate\r\n AND dmr.`operation_time` < :endDate",
+			"Field":[
+				{
+					"Name":"操作人",
+					"DBFieldName":"Nickname"
+				},
+				{
+					"Name":"时间",
+					"Type":"DateTime",
+					"Format":"yyyy/MM/dd HH:mm:ss",
+					"DBFieldName":"operationTime"
+				},
+				{
+					"Name":"药品名称",
+					"DBFieldName":"DrugName"
+				},
+				{
+					"Name":"数量",
+					"DBFieldName":"quantity"
+				},
+				{
+					"Name":"批次",
+					"DBFieldName":"manuNo"
+				},
+				{
+					"Name":"效期",
+					"Type":"DateTime",
+					"Format":"yyyy/MM/dd",
+					"DBFieldName":"effDate"
+				},
+				{
+					"Name":"库位",
+					"DBFieldName":"drawerNo"
+				},
+				{
+					"Name":"colNo"
+				},
+				{
+					"Name":"type2",
+					"Type":"Integer",
+					"DBFieldName":"type"
+				}
+			]
+		},
+		"Column":[
+			{
+				"Name":"操作人",
+				"Width":2.38125
+			},
+			{
+				"Name":"时间",
+				"Width":3.78354
+			},
+			{
+				"Name":"药品名称",
+				"Width":4.63021
+			},
+			{
+				"Name":"数量",
+				"Width":1.98438
+			},
+			{
+				"Name":"批次",
+				"Width":2.61938
+			},
+			{
+				"Name":"效期",
+				"Width":2.38125
+			},
+			{
+				"Name":"库位",
+				"Width":2.59292
+			}
+		],
+		"ColumnContent":{
+			"Height":1.00542,
+			"ColumnContentCell":[
+				{
+					"Column":"操作人",
+					"TextAlign":"MiddleCenter",
+					"DataField":"操作人"
+				},
+				{
+					"Column":"时间",
+					"TextAlign":"MiddleCenter",
+					"DataField":"时间"
+				},
+				{
+					"Column":"药品名称",
+					"TextAlign":"MiddleCenter",
+					"DataField":"药品名称"
+				},
+				{
+					"Column":"数量",
+					"TextAlign":"MiddleCenter",
+					"DataField":"数量"
+				},
+				{
+					"Column":"批次",
+					"TextAlign":"MiddleCenter",
+					"DataField":"批次"
+				},
+				{
+					"Column":"效期",
+					"TextAlign":"MiddleCenter",
+					"DataField":"效期"
+				},
+				{
+					"Column":"库位",
+					"FreeCell":true,
+					"Control":[
+						{
+							"Type":"FieldBox",
+							"Name":"FieldBox1",
+							"Left":9.60438,
+							"Top":-2.16958,
+							"Width":2.80458,
+							"Height":0.661458
+						},
+						{
+							"Type":"MemoBox",
+							"Name":"MemoBox1",
+							"Dock":"Fill",
+							"Center":"Both",
+							"TextAlign":"MiddleCenter",
+							"Text":"[#库位#] - [#colNo#]"
+						}
+					]
+				}
+			]
+		},
+		"ColumnTitle":{
+			"Height":1.40229,
+			"RepeatStyle":"OnPage",
+			"ColumnTitleCell":[
+				{
+					"GroupTitle":false,
+					"Column":"操作人",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"操作人"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"时间",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"时间"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"药品名称",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"药品名称"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"数量",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"数量"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"批次",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"批次"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"效期",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"效期"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"库位",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"库位"
+				}
+			]
+		}
+	},
+	"Parameter":[
+		{
+			"Name":"startDate",
+			"DataType":"DateTime",
+			"Format":"yyyy-MM-dd hh:mm:ss",
+			"Value":"2023/1/1"
+		},
+		{
+			"Name":"endDate",
+			"DataType":"DateTime",
+			"Format":"yyyy-MM-dd hh:mm:ss",
+			"Value":"2023/4/28 23:59:59"
+		},
+		{
+			"Name":"machine_id",
+			"Value":"DM1"
+		}
+	],
+	"ReportHeader":[
+		{
+			"Name":"ReportHeader1",
+			"Height":1.79917,
+			"Control":[
+				{
+					"Type":"MemoBox",
+					"Name":"MemoBox2",
+					"Left":7.59354,
+					"Top":0.211667,
+					"Width":5.60917,
+					"Height":1.19063,
+					"Font":{
+						"Name":"宋体",
+						"Size":217500,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"入库记录"
+				}
+			],
+			"RepeatOnPage":true
+		}
+	]
+}
\ No newline at end of file
diff --git a/DM_Weight/ReportTemp/machine_log_check.grf b/DM_Weight/ReportTemp/machine_log_check.grf
new file mode 100644
index 0000000..09cc4ae
--- /dev/null
+++ b/DM_Weight/ReportTemp/machine_log_check.grf
@@ -0,0 +1,283 @@
+{
+	"Version":"6.3.0.1",
+	"Font":{
+		"Name":"宋体",
+		"Size":105000,
+		"Weight":400,
+		"Charset":134
+	},
+	"Printer":{
+		"LeftMargin":0.3175,
+		"TopMargin":0.899583,
+		"RightMargin":0.396875
+	},
+	"DetailGrid":{
+		"CenterView":true,
+		"AppendBlankRow":true,
+		"Recordset":{
+			"QuerySQL":"SELECT \r\n  dmr.`drawer_no` AS drawerNo,\r\n  dmr.`col_no` AS colNo,\r\n  dmr.`type` AS `type`,\r\n  dmr.`quantity` AS quantity,\r\n  dmr.`manu_no` AS manuNo,\r\n  dmr.`eff_date` AS effDate,\r\n  dmr.`operation_time` AS operationTime,\r\n  di.`drug_name` AS drugName,\r\n  di.`drug_spec` AS drugSpec,\r\n  di.`pack_unit` AS packUnit,\r\n  di.`manufactory` AS manuFactory,\r\n  di.`max_stock` AS baseQuantity,\r\n  dmr.`drug_id` AS drugId,\r\n  ul.`user_name` AS nickname\r\nFROM\r\n  dm_machine_record dmr\r\nLEFT JOIN drug_info di ON di.`drug_id` = dmr.`drug_id`\r\nLEFT JOIN user_list ul ON ul.`id` = dmr.`Operator`\r\nWHERE dmr.`type` = 4 \r\n AND dmr.`machine_id` = :machine_id\r\n AND dmr.`operation_time` > :startDate\r\n AND dmr.`operation_time` < :endDate",
+			"Field":[
+				{
+					"Name":"操作人",
+					"DBFieldName":"Nickname"
+				},
+				{
+					"Name":"时间",
+					"Type":"DateTime",
+					"Format":"yyyy/MM/dd HH:mm:ss",
+					"DBFieldName":"operationTime"
+				},
+				{
+					"Name":"药品名称",
+					"DBFieldName":"DrugName"
+				},
+				{
+					"Name":"数量",
+					"DBFieldName":"quantity"
+				},
+				{
+					"Name":"批次",
+					"DBFieldName":"manuNo"
+				},
+				{
+					"Name":"效期",
+					"Type":"DateTime",
+					"Format":"yyyy/MM/dd",
+					"DBFieldName":"effDate"
+				},
+				{
+					"Name":"库位",
+					"DBFieldName":"drawerNo"
+				},
+				{
+					"Name":"colNo"
+				},
+				{
+					"Name":"type2",
+					"Type":"Integer",
+					"DBFieldName":"type"
+				}
+			]
+		},
+		"Column":[
+			{
+				"Name":"操作人",
+				"Width":2.38125
+			},
+			{
+				"Name":"时间",
+				"Width":3.78354
+			},
+			{
+				"Name":"药品名称",
+				"Width":4.63021
+			},
+			{
+				"Name":"数量",
+				"Width":1.98438
+			},
+			{
+				"Name":"批次",
+				"Width":2.61938
+			},
+			{
+				"Name":"效期",
+				"Width":2.38125
+			},
+			{
+				"Name":"库位",
+				"Width":2.59292
+			}
+		],
+		"ColumnContent":{
+			"Height":1.00542,
+			"ColumnContentCell":[
+				{
+					"Column":"操作人",
+					"TextAlign":"MiddleCenter",
+					"DataField":"操作人"
+				},
+				{
+					"Column":"时间",
+					"TextAlign":"MiddleCenter",
+					"DataField":"时间"
+				},
+				{
+					"Column":"药品名称",
+					"TextAlign":"MiddleCenter",
+					"DataField":"药品名称"
+				},
+				{
+					"Column":"数量",
+					"TextAlign":"MiddleCenter",
+					"DataField":"数量"
+				},
+				{
+					"Column":"批次",
+					"TextAlign":"MiddleCenter",
+					"DataField":"批次"
+				},
+				{
+					"Column":"效期",
+					"TextAlign":"MiddleCenter",
+					"DataField":"效期"
+				},
+				{
+					"Column":"库位",
+					"FreeCell":true,
+					"Control":[
+						{
+							"Type":"FieldBox",
+							"Name":"FieldBox1",
+							"Left":9.60438,
+							"Top":-2.16958,
+							"Width":2.80458,
+							"Height":0.661458
+						},
+						{
+							"Type":"MemoBox",
+							"Name":"MemoBox1",
+							"Dock":"Fill",
+							"Center":"Both",
+							"TextAlign":"MiddleCenter",
+							"Text":"[#库位#] - [#colNo#]"
+						}
+					]
+				}
+			]
+		},
+		"ColumnTitle":{
+			"Height":1.40229,
+			"RepeatStyle":"OnPage",
+			"ColumnTitleCell":[
+				{
+					"GroupTitle":false,
+					"Column":"操作人",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"操作人"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"时间",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"时间"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"药品名称",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"药品名称"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"数量",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"数量"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"批次",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"批次"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"效期",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"效期"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"库位",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"库位"
+				}
+			]
+		}
+	},
+	"Parameter":[
+		{
+			"Name":"startDate",
+			"DataType":"DateTime",
+			"Format":"yyyy-MM-dd hh:mm:ss",
+			"Value":"2023/1/1"
+		},
+		{
+			"Name":"endDate",
+			"DataType":"DateTime",
+			"Format":"yyyy-MM-dd hh:mm:ss",
+			"Value":"2023/4/28 23:59:59"
+		},
+		{
+			"Name":"machine_id",
+			"Value":"DM1"
+		}
+	],
+	"ReportHeader":[
+		{
+			"Name":"ReportHeader1",
+			"Height":1.79917,
+			"Control":[
+				{
+					"Type":"MemoBox",
+					"Name":"MemoBox2",
+					"Left":7.59354,
+					"Top":0.211667,
+					"Width":5.60917,
+					"Height":1.19063,
+					"Font":{
+						"Name":"宋体",
+						"Size":217500,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"盘点记录"
+				}
+			],
+			"RepeatOnPage":true
+		}
+	]
+}
\ No newline at end of file
diff --git a/DM_Weight/ReportTemp/machine_log_return.grf b/DM_Weight/ReportTemp/machine_log_return.grf
new file mode 100644
index 0000000..493f661
--- /dev/null
+++ b/DM_Weight/ReportTemp/machine_log_return.grf
@@ -0,0 +1,283 @@
+{
+	"Version":"6.3.0.1",
+	"Font":{
+		"Name":"宋体",
+		"Size":105000,
+		"Weight":400,
+		"Charset":134
+	},
+	"Printer":{
+		"LeftMargin":0.3175,
+		"TopMargin":0.899583,
+		"RightMargin":0.396875
+	},
+	"DetailGrid":{
+		"CenterView":true,
+		"AppendBlankRow":true,
+		"Recordset":{
+			"QuerySQL":"SELECT \r\n  dmr.`drawer_no` AS drawerNo,\r\n  dmr.`col_no` AS colNo,\r\n  dmr.`type` AS `type`,\r\n  CONCAT(dmr.`quantity`,IF(dmr.`type`=32,\"(空瓶)\",\"\")) AS quantity,\r\n  dmr.`manu_no` AS manuNo,\r\n  dmr.`eff_date` AS effDate,\r\n  dmr.`operation_time` AS operationTime,\r\n  di.`drug_name` AS drugName,\r\n  di.`drug_spec` AS drugSpec,\r\n  di.`pack_unit` AS packUnit,\r\n  di.`manufactory` AS manuFactory,\r\n  di.`max_stock` AS baseQuantity,\r\n  dmr.`drug_id` AS drugId,\r\n  ul.`user_name` AS nickname\r\nFROM\r\n  dm_machine_record dmr\r\nLEFT JOIN drug_info di ON di.`drug_id` = dmr.`drug_id`\r\nLEFT JOIN user_list ul ON ul.`id` = dmr.`Operator`\r\nWHERE dmr.`type` in (31, 32)\r\n AND dmr.`machine_id` = :machine_id\r\n AND dmr.`operation_time` > :startDate\r\n AND dmr.`operation_time` < :endDate",
+			"Field":[
+				{
+					"Name":"操作人",
+					"DBFieldName":"Nickname"
+				},
+				{
+					"Name":"时间",
+					"Type":"DateTime",
+					"Format":"yyyy/MM/dd HH:mm:ss",
+					"DBFieldName":"operationTime"
+				},
+				{
+					"Name":"药品名称",
+					"DBFieldName":"DrugName"
+				},
+				{
+					"Name":"数量",
+					"DBFieldName":"quantity"
+				},
+				{
+					"Name":"批次",
+					"DBFieldName":"manuNo"
+				},
+				{
+					"Name":"效期",
+					"Type":"DateTime",
+					"Format":"yyyy/MM/dd",
+					"DBFieldName":"effDate"
+				},
+				{
+					"Name":"库位",
+					"DBFieldName":"drawerNo"
+				},
+				{
+					"Name":"colNo"
+				},
+				{
+					"Name":"type2",
+					"Type":"Integer",
+					"DBFieldName":"type"
+				}
+			]
+		},
+		"Column":[
+			{
+				"Name":"操作人",
+				"Width":2.38125
+			},
+			{
+				"Name":"时间",
+				"Width":3.78354
+			},
+			{
+				"Name":"药品名称",
+				"Width":4.63021
+			},
+			{
+				"Name":"数量",
+				"Width":1.98438
+			},
+			{
+				"Name":"批次",
+				"Width":2.61938
+			},
+			{
+				"Name":"效期",
+				"Width":2.38125
+			},
+			{
+				"Name":"库位",
+				"Width":2.59292
+			}
+		],
+		"ColumnContent":{
+			"Height":1.00542,
+			"ColumnContentCell":[
+				{
+					"Column":"操作人",
+					"TextAlign":"MiddleCenter",
+					"DataField":"操作人"
+				},
+				{
+					"Column":"时间",
+					"TextAlign":"MiddleCenter",
+					"DataField":"时间"
+				},
+				{
+					"Column":"药品名称",
+					"TextAlign":"MiddleCenter",
+					"DataField":"药品名称"
+				},
+				{
+					"Column":"数量",
+					"TextAlign":"MiddleCenter",
+					"DataField":"数量"
+				},
+				{
+					"Column":"批次",
+					"TextAlign":"MiddleCenter",
+					"DataField":"批次"
+				},
+				{
+					"Column":"效期",
+					"TextAlign":"MiddleCenter",
+					"DataField":"效期"
+				},
+				{
+					"Column":"库位",
+					"FreeCell":true,
+					"Control":[
+						{
+							"Type":"FieldBox",
+							"Name":"FieldBox1",
+							"Left":9.60438,
+							"Top":-2.16958,
+							"Width":2.80458,
+							"Height":0.661458
+						},
+						{
+							"Type":"MemoBox",
+							"Name":"MemoBox1",
+							"Dock":"Fill",
+							"Center":"Both",
+							"TextAlign":"MiddleCenter",
+							"Text":"[#库位#] - [#colNo#]"
+						}
+					]
+				}
+			]
+		},
+		"ColumnTitle":{
+			"Height":1.40229,
+			"RepeatStyle":"OnPage",
+			"ColumnTitleCell":[
+				{
+					"GroupTitle":false,
+					"Column":"操作人",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"操作人"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"时间",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"时间"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"药品名称",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"药品名称"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"数量",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"数量"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"批次",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"批次"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"效期",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"效期"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"库位",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"库位"
+				}
+			]
+		}
+	},
+	"Parameter":[
+		{
+			"Name":"startDate",
+			"DataType":"DateTime",
+			"Format":"yyyy-MM-dd hh:mm:ss",
+			"Value":"2023/1/1"
+		},
+		{
+			"Name":"endDate",
+			"DataType":"DateTime",
+			"Format":"yyyy-MM-dd hh:mm:ss",
+			"Value":"2023/4/28 23:59:59"
+		},
+		{
+			"Name":"machine_id",
+			"Value":"DM1"
+		}
+	],
+	"ReportHeader":[
+		{
+			"Name":"ReportHeader1",
+			"Height":1.79917,
+			"Control":[
+				{
+					"Type":"MemoBox",
+					"Name":"MemoBox2",
+					"Left":7.59354,
+					"Top":0.211667,
+					"Width":5.60917,
+					"Height":1.19063,
+					"Font":{
+						"Name":"宋体",
+						"Size":217500,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"归还记录"
+				}
+			],
+			"RepeatOnPage":true
+		}
+	]
+}
\ No newline at end of file
diff --git a/DM_Weight/ReportTemp/machine_log_take.grf b/DM_Weight/ReportTemp/machine_log_take.grf
new file mode 100644
index 0000000..32fe037
--- /dev/null
+++ b/DM_Weight/ReportTemp/machine_log_take.grf
@@ -0,0 +1,283 @@
+{
+	"Version":"6.3.0.1",
+	"Font":{
+		"Name":"宋体",
+		"Size":105000,
+		"Weight":400,
+		"Charset":134
+	},
+	"Printer":{
+		"LeftMargin":0.3175,
+		"TopMargin":0.899583,
+		"RightMargin":0.396875
+	},
+	"DetailGrid":{
+		"CenterView":true,
+		"AppendBlankRow":true,
+		"Recordset":{
+			"QuerySQL":"SELECT \r\n  dmr.`drawer_no` AS drawerNo,\r\n  dmr.`col_no` AS colNo,\r\n  dmr.`type` AS `type`,\r\n  dmr.`quantity` AS quantity,\r\n  dmr.`manu_no` AS manuNo,\r\n  dmr.`eff_date` AS effDate,\r\n  dmr.`operation_time` AS operationTime,\r\n  di.`drug_name` AS drugName,\r\n  di.`drug_spec` AS drugSpec,\r\n  di.`pack_unit` AS packUnit,\r\n  di.`manufactory` AS manuFactory,\r\n  di.`max_stock` AS baseQuantity,\r\n  dmr.`drug_id` AS drugId,\r\n  ul.`user_name` AS nickname\r\nFROM\r\n  dm_machine_record dmr\r\nLEFT JOIN drug_info di ON di.`drug_id` = dmr.`drug_id`\r\nLEFT JOIN user_list ul ON ul.`id` = dmr.`Operator`\r\nWHERE dmr.`type` = 2 \r\n AND dmr.`machine_id` = :machine_id\r\n AND dmr.`operation_time` > :startDate\r\n AND dmr.`operation_time` < :endDate",
+			"Field":[
+				{
+					"Name":"操作人",
+					"DBFieldName":"Nickname"
+				},
+				{
+					"Name":"时间",
+					"Type":"DateTime",
+					"Format":"yyyy/MM/dd HH:mm:ss",
+					"DBFieldName":"operationTime"
+				},
+				{
+					"Name":"药品名称",
+					"DBFieldName":"DrugName"
+				},
+				{
+					"Name":"数量",
+					"DBFieldName":"quantity"
+				},
+				{
+					"Name":"批次",
+					"DBFieldName":"manuNo"
+				},
+				{
+					"Name":"效期",
+					"Type":"DateTime",
+					"Format":"yyyy/MM/dd",
+					"DBFieldName":"effDate"
+				},
+				{
+					"Name":"库位",
+					"DBFieldName":"drawerNo"
+				},
+				{
+					"Name":"colNo"
+				},
+				{
+					"Name":"type2",
+					"Type":"Integer",
+					"DBFieldName":"type"
+				}
+			]
+		},
+		"Column":[
+			{
+				"Name":"操作人",
+				"Width":2.38125
+			},
+			{
+				"Name":"时间",
+				"Width":3.78354
+			},
+			{
+				"Name":"药品名称",
+				"Width":4.63021
+			},
+			{
+				"Name":"数量",
+				"Width":1.98438
+			},
+			{
+				"Name":"批次",
+				"Width":2.61938
+			},
+			{
+				"Name":"效期",
+				"Width":2.38125
+			},
+			{
+				"Name":"库位",
+				"Width":2.59292
+			}
+		],
+		"ColumnContent":{
+			"Height":1.00542,
+			"ColumnContentCell":[
+				{
+					"Column":"操作人",
+					"TextAlign":"MiddleCenter",
+					"DataField":"操作人"
+				},
+				{
+					"Column":"时间",
+					"TextAlign":"MiddleCenter",
+					"DataField":"时间"
+				},
+				{
+					"Column":"药品名称",
+					"TextAlign":"MiddleCenter",
+					"DataField":"药品名称"
+				},
+				{
+					"Column":"数量",
+					"TextAlign":"MiddleCenter",
+					"DataField":"数量"
+				},
+				{
+					"Column":"批次",
+					"TextAlign":"MiddleCenter",
+					"DataField":"批次"
+				},
+				{
+					"Column":"效期",
+					"TextAlign":"MiddleCenter",
+					"DataField":"效期"
+				},
+				{
+					"Column":"库位",
+					"FreeCell":true,
+					"Control":[
+						{
+							"Type":"FieldBox",
+							"Name":"FieldBox1",
+							"Left":9.60438,
+							"Top":-2.16958,
+							"Width":2.80458,
+							"Height":0.661458
+						},
+						{
+							"Type":"MemoBox",
+							"Name":"MemoBox1",
+							"Dock":"Fill",
+							"Center":"Both",
+							"TextAlign":"MiddleCenter",
+							"Text":"[#库位#] - [#colNo#]"
+						}
+					]
+				}
+			]
+		},
+		"ColumnTitle":{
+			"Height":1.40229,
+			"RepeatStyle":"OnPage",
+			"ColumnTitleCell":[
+				{
+					"GroupTitle":false,
+					"Column":"操作人",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"操作人"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"时间",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"时间"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"药品名称",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"药品名称"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"数量",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"数量"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"批次",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"批次"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"效期",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"效期"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"库位",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"库位"
+				}
+			]
+		}
+	},
+	"Parameter":[
+		{
+			"Name":"startDate",
+			"DataType":"DateTime",
+			"Format":"yyyy-MM-dd hh:mm:ss",
+			"Value":"2023/1/1"
+		},
+		{
+			"Name":"endDate",
+			"DataType":"DateTime",
+			"Format":"yyyy-MM-dd hh:mm:ss",
+			"Value":"2023/4/28 23:59:59"
+		},
+		{
+			"Name":"machine_id",
+			"Value":"DM1"
+		}
+	],
+	"ReportHeader":[
+		{
+			"Name":"ReportHeader1",
+			"Height":1.79917,
+			"Control":[
+				{
+					"Type":"MemoBox",
+					"Name":"MemoBox2",
+					"Left":7.59354,
+					"Top":0.211667,
+					"Width":5.60917,
+					"Height":1.19063,
+					"Font":{
+						"Name":"宋体",
+						"Size":217500,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"出库记录"
+				}
+			],
+			"RepeatOnPage":true
+		}
+	]
+}
\ No newline at end of file
diff --git a/DM_Weight/ReportTemp/stock_template.grf b/DM_Weight/ReportTemp/stock_template.grf
new file mode 100644
index 0000000..6a2d5fb
--- /dev/null
+++ b/DM_Weight/ReportTemp/stock_template.grf
@@ -0,0 +1,346 @@
+{
+	"Version":"6.3.0.1",
+	"Font":{
+		"Name":"宋体",
+		"Size":105000,
+		"Weight":400,
+		"Charset":134
+	},
+	"Printer":{
+		"Oriention":"Landscape"
+	},
+	"DetailGrid":{
+		"CenterView":true,
+		"PrintAdaptMethod":"ResizeToFit",
+		"AppendBlankRow":true,
+		"Recordset":{
+			"QuerySQL":"SELECT \r\n  cl.`row_no` AS drawerNo,\r\n  cl.`col_no` AS colNo,\r\n  cl.`quantity` AS quantity,\r\n  cl.`manu_no` AS manuNo,\r\n  cl.`eff_date` AS effDate,\r\n  di.`drug_name` AS drugName,\r\n  di.`drug_spec` AS drugSpec,\r\n  di.`pack_unit` AS packUnit,\r\n  di.`manufactory` AS manuFactory,\r\n  di.`max_stock` AS baseQuantity,\r\n  cl.`drug_id` AS drugId\r\nFROM\r\n  channel_stock cl\r\nINNER JOIN drug_info di ON di.`drug_id` = cl.`drug_id`\r\nWHERE cl.`machine_id` =  :machine_id\r\n AND cl.`drawer_type` = 1\r\n ORDER BY cl.`drug_id`",
+			"Field":[
+				{
+					"Name":"drugName"
+				},
+				{
+					"Name":"drugSpec"
+				},
+				{
+					"Name":"manuFactory"
+				},
+				{
+					"Name":"quantityCount"
+				},
+				{
+					"Name":"manuNo"
+				},
+				{
+					"Name":"effDate"
+				},
+				{
+					"Name":"quantity",
+					"Type":"Integer",
+					"Format":"0"
+				},
+				{
+					"Name":"drawerNo"
+				},
+				{
+					"Name":"drugId"
+				},
+				{
+					"Name":"baseQuantity",
+					"Type":"Integer"
+				}
+			]
+		},
+		"Column":[
+			{
+				"Name":"drugName",
+				"Width":5.37104
+			},
+			{
+				"Name":"drugSpec"
+			},
+			{
+				"Name":"manuFactory",
+				"Width":4.60375
+			},
+			{
+				"Name":"Column1"
+			},
+			{
+				"Name":"quantityCount",
+				"Width":2.59292
+			},
+			{
+				"Name":"manuNo"
+			},
+			{
+				"Name":"effDate"
+			},
+			{
+				"Name":"quantity",
+				"Width":2.43417
+			}
+		],
+		"ColumnContent":{
+			"Height":0.79375,
+			"ColumnContentCell":[
+				{
+					"Column":"drugName",
+					"TextAlign":"MiddleCenter",
+					"DataField":"drugName"
+				},
+				{
+					"Column":"drugSpec",
+					"TextAlign":"MiddleCenter",
+					"DataField":"drugSpec"
+				},
+				{
+					"Column":"manuFactory",
+					"TextAlign":"MiddleCenter",
+					"DataField":"manuFactory"
+				},
+				{
+					"Column":"Column1",
+					"FreeCell":true
+				},
+				{
+					"Column":"quantityCount",
+					"FreeCell":true
+				},
+				{
+					"Column":"manuNo",
+					"TextAlign":"MiddleCenter",
+					"DataField":"manuNo"
+				},
+				{
+					"Column":"effDate",
+					"TextAlign":"MiddleCenter",
+					"DataField":"effDate"
+				},
+				{
+					"Column":"quantity",
+					"TextAlign":"MiddleCenter",
+					"DataField":"quantity"
+				}
+			]
+		},
+		"ColumnTitle":{
+			"Height":1.19063,
+			"RepeatStyle":"OnPage",
+			"ColumnTitleCell":[
+				{
+					"GroupTitle":false,
+					"Column":"drugName",
+					"Font":{
+						"Name":"宋体",
+						"Size":142500,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"药品名称"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"drugSpec",
+					"Font":{
+						"Name":"宋体",
+						"Size":142500,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"规格"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"manuFactory",
+					"Font":{
+						"Name":"宋体",
+						"Size":142500,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"厂家"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"Column1",
+					"Font":{
+						"Name":"宋体",
+						"Size":142500,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"基数"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"quantityCount",
+					"Font":{
+						"Name":"宋体",
+						"Size":142500,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"总库存"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"manuNo",
+					"Font":{
+						"Name":"宋体",
+						"Size":142500,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"批次"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"effDate",
+					"Font":{
+						"Name":"宋体",
+						"Size":142500,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"效期"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"quantity",
+					"Font":{
+						"Name":"宋体",
+						"Size":142500,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"数量"
+				}
+			]
+		},
+		"Group":[
+			{
+				"Name":"drugId",
+				"ByFields":"drugId",
+				"GroupHeader":{
+					"Visible":false,
+					"Height":0.79375,
+					"RepeatOnPage":true,
+					"OccupyColumn":true,
+					"IncludeFooter":true,
+					"OccupiedColumns":"drugName;drugSpec;manuFactory;quantityCount;Column1",
+					"VAlign":"Middle"
+				},
+				"GroupFooter":{
+					"Visible":false,
+					"Height":0.396875
+				}
+			},
+			{
+				"Name":"Group1",
+				"ByFields":"drugId",
+				"GroupHeader":{
+					"Control":[
+						{
+							"Type":"MemoBox",
+							"Name":"MemoBox3",
+							"AlignColumn":"drugName",
+							"Width":5.3975,
+							"Height":1.19063,
+							"TextAlign":"MiddleCenter",
+							"Text":"[#drugName#]"
+						},
+						{
+							"Type":"MemoBox",
+							"Name":"MemoBox4",
+							"AlignColumn":"drugSpec",
+							"Left":5.37104,
+							"Width":3.01625,
+							"Height":1.19063,
+							"TextAlign":"MiddleCenter",
+							"Text":"[#drugSpec#]"
+						},
+						{
+							"Type":"MemoBox",
+							"Name":"MemoBox5",
+							"AlignColumn":"manuFactory",
+							"Left":8.36083,
+							"Width":4.63021,
+							"Height":1.19063,
+							"TextAlign":"MiddleCenter",
+							"Text":"[#manuFactory#]"
+						},
+						{
+							"Type":"MemoBox",
+							"Name":"MemoBox6",
+							"AlignColumn":"Column1",
+							"Left":12.9646,
+							"Width":3.01625,
+							"Height":1.19063,
+							"TextAlign":"MiddleCenter",
+							"Text":"[#baseQuantity#]"
+						},
+						{
+							"Type":"SummaryBox",
+							"Name":"SummaryBox1",
+							"AlignColumn":"quantityCount",
+							"Left":15.9544,
+							"Width":2.61938,
+							"Height":1.19063,
+							"TextAlign":"MiddleCenter",
+							"DataField":"quantity",
+							"Format":"0"
+						}
+					],
+					"OccupyColumn":true,
+					"SameAsColumn":false,
+					"OccupiedColumns":"Column1;drugName;drugSpec;manuFactory;quantityCount",
+					"VAlign":"Middle"
+				},
+				"GroupFooter":{
+					"Visible":false
+				}
+			}
+		]
+	},
+	"Parameter":[
+		{
+			"Name":"machine_id",
+			"Value":"DM1"
+		}
+	],
+	"ReportHeader":[
+		{
+			"Name":"ReportHeader1",
+			"Height":2.40771,
+			"Control":[
+				{
+					"Type":"StaticBox",
+					"Name":"StaticBox1",
+					"Center":"Horizontal",
+					"Left":8.89,
+					"Top":0.608542,
+					"Width":9.18104,
+					"Height":1.21708,
+					"Font":{
+						"Name":"宋体",
+						"Size":217500,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"毒麻药品库存信息"
+				}
+			],
+			"RepeatOnPage":true
+		}
+	]
+}
\ No newline at end of file
diff --git a/DM_Weight/Validation/NotEmptyValidationRule.cs b/DM_Weight/Validation/NotEmptyValidationRule.cs
new file mode 100644
index 0000000..9532beb
--- /dev/null
+++ b/DM_Weight/Validation/NotEmptyValidationRule.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+
+namespace DM_Weight.Validation
+{
+    public class NotEmptyValidationRule : ValidationRule
+    {
+        public override ValidationResult Validate(object value, CultureInfo cultureInfo)
+        {
+            return string.IsNullOrWhiteSpace((value ?? "").ToString())
+                ? new ValidationResult(false, "字段不能为空")
+                : ValidationResult.ValidResult;
+        }
+    }
+}
diff --git a/DM_Weight/ViewModels/AddDrugControlViewModel.cs b/DM_Weight/ViewModels/AddDrugControlViewModel.cs
new file mode 100644
index 0000000..9592bee
--- /dev/null
+++ b/DM_Weight/ViewModels/AddDrugControlViewModel.cs
@@ -0,0 +1,534 @@
+using DM_Weight.Models;
+using DM_Weight.msg;
+using DM_Weight.Port;
+using DM_Weight.util;
+using log4net;
+using Prism.Commands;
+using Prism.Events;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Configuration;
+using System.Drawing.Printing;
+using System.Linq;
+using System.Reflection.PortableExecutable;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Documents;
+
+namespace DM_Weight.ViewModels
+{
+    public class AddDrugControlViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime
+    {
+        private readonly ILog logger = LogManager.GetLogger(typeof(DrawerAddDrugWindowViewModel));
+        private List<int> _drawerNoList = new List<int>();
+        public static AddDrugControlViewModel vm;
+        //凭证号
+        private string _pzh;
+        public string PZH { get => _pzh; set { SetProperty(ref _pzh, value); } }
+
+        private List<ChannelList>? _channelLsts;
+
+        public List<ChannelList>? ChannelLsts
+        {
+            get => _channelLsts;
+            set => SetProperty(ref _channelLsts, value);
+        }
+        private List<ChannelStock> __channelStocks = new List<ChannelStock>();
+        public List<ChannelStock> ChannelStocks
+        {
+            get => __channelStocks;
+            set => SetProperty(ref __channelStocks, value);
+        }
+
+        private ChannelStock? _channelStock;
+
+        public ChannelStock? CStock
+        {
+            get => _channelStock;
+            set => SetProperty(ref _channelStock, value);
+        }
+
+        //private ChannelList? _channelList;
+        //public ChannelList? ChannelLst
+        //{
+        //    get => _channelList;
+        //    set => SetProperty(ref _channelList, value);
+        //}
+
+        private static readonly DateTime Jan1st1970 = new DateTime
+    (1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+
+        private PortUtil _portUtil;
+        IEventAggregator _eventAggregator;
+        IDialogService _dialogService;
+        public AddDrugControlViewModel(IDialogService DialogService, PortUtil portUtil, IEventAggregator eventAggregator)
+        {
+            _dialogService = DialogService;
+            _portUtil = portUtil;
+            _eventAggregator = eventAggregator;
+            vm = this;
+        }
+        public DelegateCommand SelectionChangedCommand => new DelegateCommand(selectionAction);
+
+        private async void selectionAction()
+        {
+            if (CStock != null)
+            {
+                // 此处延时1毫秒，等待页面渲染
+                await Task.Delay(TimeSpan.FromMilliseconds(1));
+                DialogParameters dialogParameters = new DialogParameters();
+                dialogParameters.Add("addManuno", CStock);
+                DialogServiceExtensions.ShowDialogHost(_dialogService, "AddManunoDialog", dialogParameters, DoDialogResult, "RootDialog");
+
+            }
+
+        }
+        private void DoDialogResult(IDialogResult dialogResult)
+        {
+            // 委托   被动执行     被子窗口执行
+            // dialogResult  第一方面可以拿到任意参数   第二方面   可判断关闭状态
+            //if(dialogResult.Result == ButtonResult.OK)
+            //{
+            CStock = null;
+            RequestData();
+            //}
+            //MessageBox.Show("返回值：" + dialogResult.Result.ToString());
+        }
+        void DoMyPrismEvent(DeviceMsg msg)
+        {
+            if (msg.WindowName == "DrawerAddDrugWindow")
+            {
+                switch (msg.EventType)
+                {
+                    // 抽屉打开
+                    case EventType.DRAWEROPEN:
+                        if (Status == 1)
+                        {
+                            Status = 2;
+                        }
+
+                        break;
+                    // 抽屉关闭
+                    case EventType.DRAWERCLOSE:
+                        if (Status == 2)
+                        {
+                            Status = 3;
+                        }
+                        break;
+                    // 数量变化
+                    case EventType.UPDATEQUANTITY:
+                        if (Status == 2)
+                        {
+                            //ChannelStocks.ForEach(it => it.AddQuantity = msg.Quantitys[it.ColNo - 1]);
+                        }
+                        break;
+                    // 打开失败
+                    case EventType.OPENERROR:
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = msg.Message,
+                            Type = MsgType.ERROR,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        Status = 0;
+                        break;
+                }
+            }
+
+            if (msg.WindowName == "AddDrugControl")
+            {
+
+            }
+
+        }
+
+        private int _status;
+
+        public int Status { get => _status; set => SetProperty(ref _status, value); }
+
+        private int _drawerNo = 1;
+
+        public int DrawerNo
+        {
+            get => _drawerNo;
+            set => SetProperty(ref _drawerNo, value);
+        }
+
+        private bool _is8Drawer = true;
+
+        public bool Is8Drawer { get => _is8Drawer; set => SetProperty(ref _is8Drawer, value); }
+
+        private bool _is16Drawer = false;
+
+        public bool Is16Drawer { get => _is16Drawer; set => SetProperty(ref _is16Drawer, value); }
+
+
+        private bool _is17Drawer = false;
+
+        public bool Is17Drawer { get => _is17Drawer; set => SetProperty(ref _is17Drawer, value); }
+
+
+        public DelegateCommand<string> UpdateDrawerNo
+        {
+            get => new DelegateCommand<string>((DrawerNo) =>
+            {
+                this.DrawerNo = Convert.ToInt32(DrawerNo);
+                RequestData();
+            }, (DrawerNo) => Status == 0
+            );
+        }
+        public DelegateCommand OpenDrawer
+
+        {
+            get => new DelegateCommand(() =>
+            {
+                Status = 1;
+                _portUtil.SpeakAsync("正在打开" + DrawerNo + "号抽屉");
+
+                try
+                {
+                    //List<ChannelStock> singleChannels = ChannelStocks.FindAll(it => it.BoardType != 1);
+                    List<ChannelList> singleChannels = ChannelLsts.FindAll(it => it.BoardType != 1);
+
+                    _portUtil.WindowName = "DrawerAddDrugWindow";
+                    _portUtil.Operate = true;
+                    _portUtil.BoardType = singleChannels.Count > 0 ? singleChannels[0].BoardType : 1;
+                    _portUtil.ColNos = singleChannels.Select(it => it.ColNo).ToArray();
+                    //_portUtil.Stocks = singleChannels.Select(it => it.Quantity).ToArray();
+                    _portUtil.DrawerNo = DrawerNo;
+                    _portUtil.Start();
+
+                }
+                catch (Exception ex)
+                {
+                    logger.Info($"OpenDrawer异常：{ex.Message}");
+                }
+
+
+            }, () => Status == 0).ObservesProperty(() => Status);
+        }
+        private bool _isFinishClick = false;
+
+        // 完成按钮
+        public DelegateCommand TakeFinish
+        {
+            get => new DelegateCommand(() =>
+            {
+                if (!_isFinishClick)
+                {
+                    _isFinishClick = true;
+                    foreach (ChannelList lst in ChannelLsts)
+                    {
+                        ChannelStocks.AddRange(lst.channelStocks);
+                    }
+                    List<ChannelStock> record = ChannelStocks.FindAll(it => it.AddQuantity != 0).ToList();
+                    if (record.Count > 0)
+                    {
+                        //string InvoiceId = "DRAWER_" + CurrentTimeMillis();
+                        string InvoiceId = PZH;
+                        //List<string> repeatList = new List<string>();
+                        List<ChannelStock> stockRepeats = new List<ChannelStock>();
+                        var f = SqlSugarHelper.Db.UseTran(() =>
+                        {
+
+                            for (int i = 0; i < record.Count; i++)
+                            {
+                                ChannelStock it = record[i];
+                                it.ManuNo = it.drugManuNo.ManuNo;
+                                it.EffDate = it.drugManuNo.EffDate;
+                                if (it.Id != null)
+                                {
+                                    // 更新数据 库存信息
+                                    SqlSugarHelper.Db.Updateable(new ChannelStock()
+                                    {
+                                        Quantity = it.Quantity + it.AddQuantity,
+                                        ManuNo = it.ManuNo,
+                                        EffDate = it.EffDate,
+                                        Id = it.Id,
+                                    }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate }).ExecuteCommand();
+                                }
+                                else
+                                {
+                                    //如果批号重复则不让添加
+                                    List<ChannelStock> csCount = SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrawerNo == it.DrawerNo && cs.ManuNo == it.ManuNo && cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).ToList();
+                                    if (csCount.Count > 0)
+                                    {
+                                        //repeatList.Add(it.ManuNo);
+                                        stockRepeats.Add(it);
+                                        continue;
+                                    }
+
+                                    // 更新数据 库存信息
+                                    SqlSugarHelper.Db.Insertable(new ChannelStock()
+                                    {
+                                        Quantity = it.AddQuantity,
+                                        Chnguid = it.Chnguid,
+                                        ManuNo = it.ManuNo,
+                                        EffDate = it.EffDate,
+                                        DrawerNo = it.DrawerNo,
+                                        ColNo = it.ColNo,
+                                        DrugId = it.DrugId,
+                                        DrawerType = it.DrawerType,
+                                        BoardType = it.BoardType,
+                                        Id = Guid.NewGuid().ToString(),
+                                        MachineId = ConfigurationManager.AppSettings["machineId"] ?? "DM1"
+                                    }).ExecuteCommand();
+                                }
+                                // 获取更新完库存后的药品库存
+                                List<ChannelStock> nowChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                                    .Where(cs => cs.MachineId.Equals(it.MachineId))
+                                    .Where(cs => cs.DrugId.Equals(it.DrugId))
+                                    .Where(cs => cs.DrawerType == 1)
+                                    .ToList();
+
+                                // 保存数据 入库记录
+                                SqlSugarHelper.Db.Insertable(new MachineRecord()
+                                {
+                                    MachineId = it.MachineId,
+                                    DrawerNo = it.DrawerNo,
+                                    ColNo = it.ColNo,
+                                    DrugId = it.DrugId,
+                                    ManuNo = it.ManuNo,
+                                    EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
+                                    Operator = HomeWindowViewModel.Operator?.Id,
+                                    OperationTime = DateTime.Now,
+                                    Quantity = it.AddQuantity,
+                                    Type = 1,
+                                    InvoiceId = InvoiceId,
+                                    StockQuantity = nowChannels.Sum(it => it.Quantity),
+                                    ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity)
+                                }).ExecuteCommand();
+                            }
+                            return true;
+                        });
+                        ChannelStocks.Clear();
+                        //if (record.Count == repeatList.Count)
+                        if (stockRepeats.Count == record.Count)
+                        {
+                            AlertMsg alertMsg = new AlertMsg
+                            {
+                                Message = $"该抽屉已存在此药品批次{string.Join(',', stockRepeats.Select(r=>r.ManuNo).ToArray())}，请选择其他批次",
+                                Type = MsgType.ERROR
+                            };
+                            _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        }
+                        else
+                        {
+                            //if (repeatList.Count > 0)
+                            //{
+                            //    AlertMsg alertMsg = new AlertMsg
+                            //    {
+                            //        Message = $"该抽屉已存在此药品批次{string.Join(',', repeatList)}，请选择其他批次",
+                            //        Type = MsgType.ERROR
+                            //    };
+                            //    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                            //}
+                            if (f.Data)
+                            {
+
+                                string msg = string.Empty;
+                                MsgType type = MsgType.SUCCESS;
+                                //if (repeatList.Count > 0)
+                                if (stockRepeats.Count > 0)
+                                {
+                                    msg = $"该抽屉下批次{string.Join(',', stockRepeats.Select(r => r.ManuNo).ToArray())}已存在，不可重复添加，其他批次加药完成，库存已更新";
+                                    foreach(var stockRpt in stockRepeats)
+                                    {
+                                        //移除重复的信息，以免更新屏显库存时更新了重复数据
+                                        record.Remove(stockRpt);
+
+                                    }
+                                    type = MsgType.WARING;
+                                }
+                                else
+                                {
+                                    msg = "抽屉加药完成，库存已更新";
+                                }
+                                // 更新屏显库存
+                                List<ChannelStock> singleChannels = record.FindAll(it => it.BoardType != 1);
+                                if ((singleChannels.Count > 0 ? singleChannels[0].BoardType : 1) == 5)
+                                {
+                                    singleChannels.ForEach(it =>
+                                    {
+                                        _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.Quantity + it.AddQuantity);
+                                    });
+                                }
+                                RequestData();
+                                AlertMsg alertMsg = new AlertMsg
+                                {
+                                    Message = msg,
+                                    Type = type,
+                                };
+                                _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                            }
+                            else
+                            {
+                                AlertMsg alertMsg = new AlertMsg
+                                {
+                                    Message = "更新库存失败",
+                                    Type = MsgType.SUCCESS,
+                                };
+                                _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                            }
+                        }
+                        Status = 0;
+                        _isFinishClick = false;
+
+                        PZH = string.Empty;
+                    }
+                    else
+                    {
+                        _isFinishClick = false;
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "没有填写加药数量",
+                            Type = MsgType.ERROR
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    }
+
+                }
+
+            });
+        }
+
+        // 取消按钮
+        public DelegateCommand CancleTake
+        {
+            get => new DelegateCommand(() =>
+            {
+                _portUtil.ResetData();
+                Status = 0;
+            });
+        }
+
+
+
+        //添加批次
+        public void AddAction(ChannelList channelLS)
+        {
+            if (channelLS != null)
+            {
+                ChannelStock cls = new ChannelStock();
+                DrugManuNo drugManu = new DrugManuNo();
+                cls.DrugInfo = channelLS.Drug;
+                if (channelLS.channelStocks.Count > 0)
+                {
+                    //drugManu = channelLS.channelStocks[0].DrugInfo.DrugManuNos[0];
+                    cls.drugManuNo = channelLS.channelStocks[0].drugManuNo;
+                }
+                else
+                {
+                    //drugManu= cls.DrugInfo.DrugManuNos[0];
+                    if (cls.DrugInfo.DrugManuNos.Count > 0)
+                    {
+                        cls.drugManuNo = cls.DrugInfo.DrugManuNos[0];
+                    }
+                    else
+                    {
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "该药品下没有批次，请先添加批次",
+                            Type = MsgType.ERROR
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        return;
+                    }
+                }
+                //cls.Id = "";
+                cls.Chnguid = channelLS.Id;
+                cls.MachineId = ConfigurationManager.AppSettings["machineId"] ?? "DM1";
+                cls.DrawerNo = channelLS.DrawerNo;
+                cls.BoardType = channelLS.BoardType;
+                cls.DrawerType = channelLS.DrawerType;
+                cls.ColNo = channelLS.ColNo;
+                cls.DrugId = channelLS.DrugId;
+                cls.AddQuantity = 0;
+                //string sqlStr = @"select drug_id,manu_no,manu_date,eff_date from drug_manu_no where drug_id=@drugId 
+                //    and manu_no not in(select manu_no from channel_stock where drug_id=@drugId) ";
+                //cls.DrugInfo.DrugManuNos=SqlSugarHelper.Db.SqlQueryable<dynamic>(sqlStr).AddParameters(new
+                //{
+                //    drugId = channelLS.DrugId
+                //})
+                //.Select(it => new DrugManuNo()).ToList();
+                List<ChannelStock> stockList = new List<ChannelStock>();
+                stockList.AddRange(channelLS.channelStocks);
+                stockList.Add(cls);
+                channelLS.channelStocks = stockList;
+            }
+        }
+
+        public long CurrentTimeMillis()
+        {
+            return (long)(DateTime.UtcNow - Jan1st1970).TotalMilliseconds;
+        }
+        public bool KeepAlive => false;
+
+        public void FindDrawerCount()
+        {
+            int count = SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrawerType != 3)
+                .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).GroupBy(cs => cs.DrawerNo).Select(cs => SqlFunc.AggregateCount(cs.DrawerNo)).Count();
+            Is8Drawer = count < 9;
+            Is16Drawer = count >= 16;
+            Is17Drawer = count > 16;
+        }
+
+        //这个方法用于拦截请求,continuationCallback(true)就是不拦截，continuationCallback(false)拦截本次操作
+        public void ConfirmNavigationRequest(NavigationContext navigationContext, Action<bool> continuationCallback)
+        {
+            continuationCallback(true);
+        }
+        public void RequestData()
+        {
+            List<ChannelList> queryData = SqlSugarHelper.Db.Queryable<ChannelList>()
+                .Includes(cl => cl.Drug, di => di.DrugManuNos)
+                .Includes(cl => cl.channelStocks, dr => dr.DrugInfo, d => d.DrugManuNos)
+                .Where(cl => cl.DrawerNo == DrawerNo)
+                .Where(cl => cl.DrawerType == 1)
+                .Where(cl => cl.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
+                .Where(cl => cl.DrugId != null)
+                .OrderBy(cl => cl.ColNo)
+                .ToList();
+            ChannelLsts = queryData.Select(cl =>
+            {
+                cl.channelStocks = cl.channelStocks.Select(cs =>
+                {
+                    cs.drugManuNo = cl.Drug.DrugManuNos.Find(it => it.ManuNo.Equals(cs.ManuNo));
+                    return cs;
+                }).ToList();
+                return cl;
+            }).ToList();
+            //ChannelLsts = new ObservableCollection<ChannelList>(queryData);
+            ChannelLsts.ForEach(cl => cl.channelStocks.ForEach(cs => cs.DrugInfo = cl.Drug));
+        }
+
+        //接收导航传过来的参数  现在是在此处初始化了表格数据
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            _eventAggregator.GetEvent<PortUtilEvent>().Subscribe(DoMyPrismEvent);
+            _eventAggregator.GetEvent<AddDrugEvent>().Subscribe(AddAction);
+            FindDrawerCount();
+            RequestData();
+        }
+
+
+        //每次导航的时候，该实列用不用重新创建，true是不重新创建,false是重新创建
+        public bool IsNavigationTarget(NavigationContext navigationContext)
+        {
+            return true;
+        }
+
+        //这个方法用于拦截请求
+        public void OnNavigatedFrom(NavigationContext navigationContext)
+        {
+            // 取消消息订阅
+            _eventAggregator.GetEvent<PortUtilEvent>().Unsubscribe(DoMyPrismEvent);
+            _eventAggregator.GetEvent<AddDrugEvent>().Unsubscribe(AddAction);
+        }
+    }
+}
diff --git a/DM_Weight/ViewModels/AddManunoDialogViewModel.cs b/DM_Weight/ViewModels/AddManunoDialogViewModel.cs
new file mode 100644
index 0000000..9d66155
--- /dev/null
+++ b/DM_Weight/ViewModels/AddManunoDialogViewModel.cs
@@ -0,0 +1,151 @@
+using DM_Weight.Models;
+using DM_Weight.msg;
+using DM_Weight.Port;
+using DM_Weight.util;
+using Prism.Commands;
+using Prism.Events;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.ViewModels
+{
+    public class AddManunoDialogViewModel : BindableBase, IDialogAware, IRegionMemberLifetime
+    {
+        public string Title => "添加批次";
+
+        public bool KeepAlive => false;
+        private ChannelStock? _channelStock;
+
+        private ObservableCollection<AddChannelStockManuNo>? _addChannelStocks;
+
+        public ObservableCollection<AddChannelStockManuNo>? AddChannelStocks
+        {
+            get => _addChannelStocks;
+            set => SetProperty(ref _addChannelStocks, value);
+        }
+        public ChannelStock? ChStock
+        {
+            get => _channelStock;
+            set => SetProperty(ref _channelStock, value);
+        }
+        /// <summary>
+         ///全选
+         /// </summary>
+        private bool _allChecked = false;
+        public bool IsAllChecked
+        {
+            get { return _allChecked; }
+            set
+            {
+                SetProperty(ref _allChecked, value);
+                if (!IsItemCheck)
+                {
+                    RequestData();
+                    //根据全选或反选设置其后的选中状态
+                    AddChannelStocks.ToList().ForEach(oi => oi.ItemIsChecked = _allChecked);
+                }
+                else
+                {
+                    IsItemCheck = false;
+                }
+            }
+
+        }
+        public bool _isItemCheck = false;
+        public bool IsItemCheck
+        {
+            get => _isItemCheck;
+            set
+            {
+                SetProperty(ref _isItemCheck, value);
+                if (AddChannelStocks.ToList().Where(od => od.ItemIsChecked == false).Count() <= 0)
+                {
+                    IsAllChecked = true;
+                }
+            }
+        }
+        public event Action<IDialogResult> RequestClose;
+
+        public bool CanCloseDialog()
+        {
+            return true;
+        }
+
+        public void OnDialogClosed()
+        {
+        }
+
+        public void OnDialogOpened(IDialogParameters parameters)
+        {
+            ChannelStock channelStock = parameters.GetValue<ChannelStock>("addManuno");
+            ChStock = channelStock;
+            RequestData();
+        }
+        IDialogService _dialogService;
+        IEventAggregator _eventAggregator;
+        public AddManunoDialogViewModel(IDialogService DialogService, IEventAggregator eventAggregator)
+        {
+            _dialogService = DialogService;
+            _eventAggregator = eventAggregator;
+        }
+        public void RequestData()
+        {
+            //List<ChannelStock> queryData = SqlSugarHelper.Db.Queryable<ChannelStock>()
+            //    .Includes(cs => cs.DrugInfo, di => di.DrugManuNos)
+            //    .Where(cs => cs.DrawerNo == ChStock.DrawerNo&&cs.ColNo==ChStock.ColNo)
+            //    .Where(cs => cs.DrawerType == 1)
+            //    .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
+            //    .Where(cs => cs.DrugId ==ChStock.DrugId )
+            //    .OrderBy(cs => cs.ManuNo)
+            //    .ToList();
+            //ChannelStocks = queryData.Select(cs =>
+            //{
+            //    cs.drugManuNo = cs.DrugInfo.DrugManuNos.Find(it => it.ManuNo.Equals(cs.ManuNo));
+
+            //    return cs;
+            //}).ToList();
+            //obChannelStock = new ObservableCollection<ChannelStock>(ChannelStocks);
+
+            string strSQl = @"SELECT DISTINCT c.Col_no as ColNo,d.DRUG_NAME as DrugName,d.DRUG_SPEC as DrugSpec,m.eff_date as EffDate,m.Manu_No as ManuNo
+                            from drug_manu_no m inner join drug_info d on m.drug_id=d.drug_id  inner join  channel_stock c on m.drug_id=c.drug_id  
+                            where c.row_no=@RowNo and col_no=@ColNo and machine_id=@MachineId and m.Manu_NO<>@ManuNo order by m.Manu_No desc";
+
+
+            List<AddChannelStockManuNo> queryData = SqlSugarHelper.Db.SqlQueryable<dynamic>(strSQl)
+                .AddParameters(new
+                {
+                    MachineId = ConfigurationManager.AppSettings["machineId"] ?? "DM1",
+                    RowNo = ChStock.DrawerNo,
+                    ColNo = ChStock.ColNo,
+                    ManuNo=ChStock.ManuNo
+                })
+                .Select(it => new AddChannelStockManuNo())
+                .ToList();
+            AddChannelStocks = new ObservableCollection<AddChannelStockManuNo>(queryData);
+        }
+        public DelegateCommand SaveCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                
+
+            });
+        }
+        public DelegateCommand BtnCloseCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                // 关闭当前窗口
+                RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+            });
+        }
+    }
+}
diff --git a/DM_Weight/ViewModels/BindingChannelDialogViewModel.cs b/DM_Weight/ViewModels/BindingChannelDialogViewModel.cs
new file mode 100644
index 0000000..bdb2be3
--- /dev/null
+++ b/DM_Weight/ViewModels/BindingChannelDialogViewModel.cs
@@ -0,0 +1,506 @@
+using MaterialDesignThemes.Wpf;
+using Prism.Commands;
+using Prism.Events;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media;
+using DM_Weight.Models;
+using DM_Weight.msg;
+using DM_Weight.Port;
+using DM_Weight.util;
+using log4net;
+using System.Threading;
+
+namespace DM_Weight.ViewModels
+{
+    public class BindingChannelDialogViewModel : BindableBase, IDialogAware, IRegionMemberLifetime
+    {
+
+        public string Title => "库位绑定";
+
+        public event Action<IDialogResult> RequestClose;
+
+        private int _drawerNo = 0;
+
+
+        private SolidColorBrush _colorBrush;
+
+        public SolidColorBrush SnackbarBackground
+        {
+            get => _colorBrush;
+            set => SetProperty(ref _colorBrush, value);
+        }
+
+        private ISnackbarMessageQueue _snackbarMessageQueue = new SnackbarMessageQueue(TimeSpan.FromSeconds(3));
+
+        public ISnackbarMessageQueue SnackbarMessageQueue
+        {
+            get => _snackbarMessageQueue;
+            set => SetProperty(ref _snackbarMessageQueue, value);
+        }
+
+        IEventAggregator _eventAggregator;
+        PortUtil _portUtil;
+        //ScreenUtil _screenUtil;
+
+        public BindingChannelDialogViewModel(IEventAggregator eventAggregator, PortUtil portUtil//, ScreenUtil screenUtil
+            )
+        {
+            _eventAggregator = eventAggregator;
+            _portUtil = portUtil;
+            //_screenUtil = screenUtil;
+        }
+
+        public int DrawerNo
+        {
+            get => _drawerNo;
+            set
+            {
+                SetProperty(ref _drawerNo, value);
+                GetChannelsByDrawerNo();
+            }
+        }
+
+        private DrugInfo? _drugInfo;
+
+        public DrugInfo? DrugInfo
+        {
+            get => _drugInfo;
+            set
+            {
+                SetProperty(ref _drugInfo, value);
+                if (_drugInfo != null)
+                {
+                    DrugManuNos = _drugInfo.DrugManuNos.OrderByDescending(dm => dm.ManuNo).ToList();
+                }
+            }
+        }
+        //拼音码对应药品实体
+        private DrugInfo? _durgInfo_for_py;
+        public DrugInfo? DrugInfo_Py
+        {
+            get => _durgInfo_for_py;
+            set
+            {
+
+                SetProperty(ref _durgInfo_for_py, value);
+                if(_durgInfo_for_py!=null)
+                {
+                    DrugInfos = GetDrugByDrugPY(_durgInfo_for_py.PyCode);
+                }
+                else
+                {
+                    DrugInfos = GetDrugByDrugPY("");
+                }
+            }
+        }
+
+        #region 根据药品拼音码查询药品名称
+        private List<DrugInfo> GetDrugByDrugPY(string pycode)
+        {
+            List<DrugInfo> DrugList = null;
+            if (!string.IsNullOrEmpty(pycode))
+            {
+                DrugList = SqlSugarHelper.Db.Queryable<DrugInfo>().Includes<DrugManuNo>(di => di.DrugManuNos).Where(di => di.PyCode.Contains(pycode)).OrderBy(di => di.DrugId).ToList();
+            }
+            else
+            {
+                DrugList = SqlSugarHelper.Db.Queryable<DrugInfo>().Includes<DrugManuNo>(di => di.DrugManuNos).OrderBy(di => di.DrugId).ToList();
+            }
+            return DrugList;
+        }
+        private List<DrugInfo>? _drugInfos_py;
+        public List<DrugInfo>? DrugInfos_PY
+        {
+            get => _drugInfos_py;
+            set => SetProperty(ref _drugInfos_py, value);
+        }
+        #endregion 根据药品拼音码查询药品名称
+
+
+        private List<DrugInfo>? _drugInfos;
+
+        public List<DrugInfo>? DrugInfos
+        {
+            get => _drugInfos;
+            set => SetProperty(ref _drugInfos, value);
+        }
+
+        private DrugManuNo? _drugManuNo;
+
+        public DrugManuNo? DrugManuNo
+        {
+            get => _drugManuNo;
+            set => SetProperty(ref _drugManuNo, value);
+        }
+        private List<DrugManuNo>? _drugManuNos;
+
+        public List<DrugManuNo>? DrugManuNos
+        {
+            get => _drugManuNos;
+            set => SetProperty(ref _drugManuNos, value);
+        }
+
+
+        private List<ChannelStock>? _channels;
+
+        public List<ChannelStock>? Channels
+        {
+            get => _channels;
+            set => SetProperty(ref _channels, value);
+        }
+
+        private int _totalCount = 0;
+        public int TotalCount { get => _totalCount; set => SetProperty(ref _totalCount, value); }
+
+        private int _pageNum = 1;
+        public int PageNum
+        {
+            get => _pageNum;
+            set
+            {
+                SetProperty(ref _pageNum, value);
+                GetChannelsByDrawerNo();
+            }
+        }
+
+        private int _pageCount = 1;
+        public int PageCount
+        {
+            get => _pageCount;
+            set
+            {
+                SetProperty(ref _pageCount, value);
+            }
+        }
+
+        private int _pageSize = 8;
+        public int PageSize
+        {
+            get => _pageSize;
+            set
+            {
+                SetProperty(ref _pageSize, value);
+            }
+        }
+
+
+
+        public bool CanCloseDialog()
+        {
+            return true;
+        }
+
+        public void OnDialogClosed()
+        {
+            _eventAggregator.GetEvent<PortUtilEvent>().Unsubscribe(DoMyPrismEvent);
+        }
+
+        private void GetAllDrugInfos()
+        {
+            var list = SqlSugarHelper.Db.Queryable<DrugInfo>().Includes<DrugManuNo>(di => di.DrugManuNos).OrderBy(di => di.DrugId).ToList();
+            DrugInfos = list;
+            DrugInfos_PY = list;
+        }
+
+        private void GetChannelsByDrawerNo()
+        {
+            Channels?.Clear();
+            int totalCount = 0;
+            var list = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                .Includes<DrugInfo>(cs => cs.DrugInfo)
+                .WhereIF(DrawerNo > 0, cs => cs.DrawerNo == DrawerNo)
+                .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
+                .OrderBy(cs => cs.DrawerNo)
+                .OrderBy(cs => cs.ColNo)
+                .ToPageList(PageNum, PageSize, ref totalCount);
+            Channels = list;
+            TotalCount = totalCount;
+        }
+        public void OnDialogOpened(IDialogParameters parameters)
+        {
+            if (parameters.ContainsKey("DrawerNo"))
+            {
+                DrawerNo = parameters.GetValue<int>("DrawerNo");
+            }
+            GetAllDrugInfos();
+            GetChannelsByDrawerNo();
+            _eventAggregator.GetEvent<PortUtilEvent>().Subscribe(DoMyPrismEvent);
+        }
+        public DelegateCommand Query
+        {
+            get => new DelegateCommand(() =>
+            {
+                GetChannelsByDrawerNo();
+            });
+        }
+
+
+        public DelegateCommand BindingDrug
+        {
+            get => new DelegateCommand(async () =>
+            {
+
+                var SelectChannels = Channels.FindAll(item => item.IsSelected && item.Quantity == 0);
+
+                if (SelectChannels.All(it => it.DrawerType != 1))
+                {
+                    if (SelectChannels.Count == 1)
+                    {
+                        if (DrugInfo != null)
+                        {
+                            int count = SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrugId.Equals(DrugInfo.DrugId.ToString())).Where(cs => cs.DrawerType != 1).Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).Count();
+                            if (count == 0)
+                            {
+                                var item = SelectChannels[0];
+
+                                if (item.DrugId == null || !DrugInfo.DrugId.ToString().Equals(item.DrugId))
+                                {
+                                    item.PosNo = 0;
+                                }
+                                item.DrugId = DrugInfo.DrugId.ToString();
+                                SqlSugarHelper.Db.Updateable(item).UpdateColumns(it => new { it.DrugId, it.PosNo }).ExecuteCommand();
+                                GetChannelsByDrawerNo();
+
+                                if (item.BoardType == 5)
+                                {
+                                    _portUtil.WindowName = "BindingChannelDialog";
+                                    // 向显示屏写入库位信息
+                                    _portUtil.WriteChannelInfo(1, DrugInfo.DrugName, item.DrawerNo, item.ColNo);
+                                    await Task.Delay(200);
+                                    _portUtil.WriteChannelInfo(2, DrugInfo.DrugSpec, item.DrawerNo, item.ColNo);
+                                    await Task.Delay(200);
+                                    _portUtil.WriteChannelInfo(8, DrugInfo.Manufactory, item.DrawerNo, item.ColNo);
+                                    await Task.Delay(200);
+                                    _portUtil.WriteChannelInfo(6, DrugManuNo.EffDate==null?"": DrugManuNo.EffDate, item.DrawerNo, item.ColNo);
+                                    await Task.Delay(200);
+                                    _portUtil.WriteChannelInfo(5, DrugManuNo.ManuNo, item.DrawerNo, item.ColNo);
+                                    await Task.Delay(200);
+                                    _portUtil.ShowContent(item.DrawerNo, item.ColNo);
+                                }
+                                //_screenUtil.SetStockInfo(item, 1);
+
+                            }
+                            else
+                            {
+                                SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
+                                SnackbarMessageQueue.Enqueue($"药品【{DrugInfo.DrugName}】已经绑定了回收库位不可再次绑定");
+                            }
+                        }
+                        else
+                        {
+                            SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
+                            SnackbarMessageQueue.Enqueue("请选择库位需要绑定的药品信息");
+                        }
+                    }
+                    else
+                    {
+                        SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
+                        SnackbarMessageQueue.Enqueue("每种药品只能绑定一个回收库位");
+                    }
+                }
+                else
+                {
+                    if (DrugInfo != null && DrugManuNo != null)
+                    {
+
+                        var c = SelectChannels.Count;
+
+                        if (c > 0)
+                        {
+                            //SelectChannels.ForEach(async (item) =>
+                            //{
+                            //    if (item.DrugId == null || !DrugInfo.DrugId.ToString().Equals(item.DrugId))
+                            //    {
+                            //        item.PosNo = 0;
+                            //    }
+
+                            //    item.DrugId = DrugInfo.DrugId.ToString();
+                            //    item.ManuNo = DrugManuNo.ManuNo;
+                            //    item.DrugInfo = DrugInfo;
+                            //    item.EffDate = String.Format("{0:yyyy-MM-dd}", DrugManuNo.EffDate);
+                            //    SqlSugarHelper.Db.Updateable(item).UpdateColumns(it => new { it.DrugId, it.ManuNo, it.EffDate, it.PosNo }).ExecuteCommand();
+
+                            //    if (item.BoardType == 5)
+                            //    {
+                            //        _portUtil.WindowName = "BindingChannelDialog";
+                            //        // 向显示屏写入库位信息
+                            //        _portUtil.WriteChannelInfo(1, DrugInfo.DrugName, item.DrawerNo, item.ColNo);
+                            //        await Task.Delay(200);
+                            //        _portUtil.WriteChannelInfo(2, DrugInfo.DrugSpec, item.DrawerNo, item.ColNo);
+                            //        await Task.Delay(200);
+                            //        _portUtil.WriteChannelInfo(8, DrugInfo.Manufactory, item.DrawerNo, item.ColNo);
+                            //        await Task.Delay(200);
+                            //        _portUtil.WriteChannelInfo(6, DrugManuNo.ManuNo, item.DrawerNo, item.ColNo);
+                            //        await Task.Delay(200);
+                            //        _portUtil.WriteChannelInfo(5, String.Format("{0:yyyy-MM-dd}", DrugManuNo.EffDate), item.DrawerNo, item.ColNo);
+                            //        await Task.Delay(200);
+                            //        _portUtil.ShowContent(item.DrawerNo, item.ColNo);
+                            //    }
+                            //    //_screenUtil.SetStockInfo(item, 1);
+                            //});                            //SelectChannels.ForEach(async (item) =>
+                            //{
+                            //    if (item.DrugId == null || !DrugInfo.DrugId.ToString().Equals(item.DrugId))
+                            //    {
+                            //        item.PosNo = 0;
+                            //    }
+
+                            //    item.DrugId = DrugInfo.DrugId.ToString();
+                            //    item.ManuNo = DrugManuNo.ManuNo;
+                            //    item.DrugInfo = DrugInfo;
+                            //    item.EffDate = String.Format("{0:yyyy-MM-dd}", DrugManuNo.EffDate);
+                            //    SqlSugarHelper.Db.Updateable(item).UpdateColumns(it => new { it.DrugId, it.ManuNo, it.EffDate, it.PosNo }).ExecuteCommand();
+
+                            //    if (item.BoardType == 5)
+                            //    {
+                            //        _portUtil.WindowName = "BindingChannelDialog";
+                            //        // 向显示屏写入库位信息
+                            //        _portUtil.WriteChannelInfo(1, DrugInfo.DrugName, item.DrawerNo, item.ColNo);
+                            //        await Task.Delay(200);
+                            //        _portUtil.WriteChannelInfo(2, DrugInfo.DrugSpec, item.DrawerNo, item.ColNo);
+                            //        await Task.Delay(200);
+                            //        _portUtil.WriteChannelInfo(8, DrugInfo.Manufactory, item.DrawerNo, item.ColNo);
+                            //        await Task.Delay(200);
+                            //        _portUtil.WriteChannelInfo(6, DrugManuNo.ManuNo, item.DrawerNo, item.ColNo);
+                            //        await Task.Delay(200);
+                            //        _portUtil.WriteChannelInfo(5, String.Format("{0:yyyy-MM-dd}", DrugManuNo.EffDate), item.DrawerNo, item.ColNo);
+                            //        await Task.Delay(200);
+                            //        _portUtil.ShowContent(item.DrawerNo, item.ColNo);
+                            //    }
+                            //    //_screenUtil.SetStockInfo(item, 1);
+                            //});
+
+                            for (int i = 0; i < SelectChannels.Count; i++)
+                            {
+                                var item = SelectChannels[i];
+                                if (item.DrugId == null || !DrugInfo.DrugId.ToString().Equals(item.DrugId))
+                                {
+                                    item.PosNo = 0;
+                                }
+
+                                item.DrugId = DrugInfo.DrugId.ToString();
+                                item.ManuNo = DrugManuNo.ManuNo;
+                                item.DrugInfo = DrugInfo;
+                                item.EffDate = String.Format("{0:yyyy-MM-dd}", DrugManuNo.EffDate);
+                                SqlSugarHelper.Db.Updateable(item).UpdateColumns(it => new { it.DrugId, it.ManuNo, it.EffDate, it.PosNo }).ExecuteCommand();
+
+                                if (item.BoardType == 5)
+                                {
+                                    _portUtil.WindowName = "BindingChannelDialog";
+                                    // 向显示屏写入库位信息
+                                    _portUtil.WriteChannelInfo(1, DrugInfo.DrugName, item.DrawerNo, item.ColNo);
+                                    //await Task.Delay(200);
+                                    Thread.Sleep(200);
+                                    _portUtil.WriteChannelInfo(2, DrugInfo.DrugSpec, item.DrawerNo, item.ColNo);
+                                    //await Task.Delay(200);
+                                    Thread.Sleep(200);
+                                    _portUtil.WriteChannelInfo(8, DrugInfo.Manufactory, item.DrawerNo, item.ColNo);
+                                    //await Task.Delay(200);
+                                    Thread.Sleep(200);
+                                    _portUtil.WriteChannelInfo(6, DrugManuNo.ManuNo, item.DrawerNo, item.ColNo);
+                                    //await Task.Delay(200);
+                                    Thread.Sleep(200);
+                                    _portUtil.WriteChannelInfo(5, String.Format("{0:yyyy-MM-dd}", DrugManuNo.EffDate), item.DrawerNo, item.ColNo);
+                                    //await Task.Delay(200);
+                                    Thread.Sleep(200);
+                                    _portUtil.ShowContent(item.DrawerNo, item.ColNo);
+                                }
+                            }
+
+
+                            GetChannelsByDrawerNo();
+                        }
+                        else
+                        {
+                            SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
+                            SnackbarMessageQueue.Enqueue("所选库位中无可绑定库位【库位还存在药品】");
+                        }
+                    }
+                    else
+                    {
+                        SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
+                        SnackbarMessageQueue.Enqueue("请选择库位需要绑定的药品及批次信息");
+                    }
+                }
+            });
+        }
+
+        public DelegateCommand RemoveBinding
+        {
+            get => new DelegateCommand(async () =>
+            {
+                var SelectChannels = Channels.FindAll(item => item.IsSelected && item.Quantity == 0);
+                var c = SelectChannels.Count;
+                if (c > 0)
+                {
+                    SelectChannels.ForEach(async item =>
+                    {
+                        item.DrugId = null;
+                        item.ManuNo = null;
+                        item.EffDate = null;
+                        item.DrugInfo = null;
+                        SqlSugarHelper.Db.Updateable(item).UpdateColumns(it => new { it.DrugId, it.ManuNo, it.EffDate }).ExecuteCommand();
+                        if (item.BoardType == 5)
+                        {
+                            // 清除显示屏库位信息
+                            _portUtil.ClearContent(item.DrawerNo, item.ColNo);
+                            await Task.Delay(200);
+                            _portUtil.ShowContent(item.DrawerNo, item.ColNo);
+                        }
+
+                        //_screenUtil.SetStockInfo(item, 1);
+                    });
+                    GetChannelsByDrawerNo();
+                }
+                else
+                {
+                    SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
+                    SnackbarMessageQueue.Enqueue("所选库位中无可解绑库位【库位还存在药品】");
+                }
+            });
+        }
+
+        public DelegateCommand BtnCloseCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                //DialogParameters parameters = new DialogParameters();
+                //parameters.Add("",);
+                // 关闭当前窗口
+                RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+            });
+        }
+
+        public bool KeepAlive => false;
+        string message = string.Empty;
+        private void DoMyPrismEvent(DeviceMsg msg)
+        {
+            if (msg.WindowName == "BindingChannelDialog")
+            {
+                switch (msg.EventType)
+                {
+                    case EventType.OPENERROR:
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = msg.Message,
+                            Type = MsgType.ERROR,
+                        };
+                        if (message != msg.Message)
+                        {
+                            message = msg.Message;
+                            _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        }
+                        break;
+                }
+            }
+        }
+    }
+}
diff --git a/DM_Weight/ViewModels/BindingChannelNewDialogViewModel.cs b/DM_Weight/ViewModels/BindingChannelNewDialogViewModel.cs
new file mode 100644
index 0000000..2598ab1
--- /dev/null
+++ b/DM_Weight/ViewModels/BindingChannelNewDialogViewModel.cs
@@ -0,0 +1,465 @@
+using MaterialDesignThemes.Wpf;
+using Prism.Commands;
+using Prism.Events;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media;
+using DM_Weight.Models;
+using DM_Weight.msg;
+using DM_Weight.Port;
+using DM_Weight.util;
+using log4net;
+using System.Threading;
+using System.Reflection.Metadata.Ecma335;
+
+namespace DM_Weight.ViewModels
+{
+    public class BindingChannelNewDialogViewModel : BindableBase, IDialogAware, IRegionMemberLifetime
+    {
+
+        public string Title => "库位绑定";
+
+        public event Action<IDialogResult> RequestClose;
+
+        private int _drawerNo = 0;
+
+
+        private SolidColorBrush _colorBrush;
+
+        public SolidColorBrush SnackbarBackground
+        {
+            get => _colorBrush;
+            set => SetProperty(ref _colorBrush, value);
+        }
+
+        private ISnackbarMessageQueue _snackbarMessageQueue = new SnackbarMessageQueue(TimeSpan.FromSeconds(3));
+
+        public ISnackbarMessageQueue SnackbarMessageQueue
+        {
+            get => _snackbarMessageQueue;
+            set => SetProperty(ref _snackbarMessageQueue, value);
+        }
+
+        IEventAggregator _eventAggregator;
+        PortUtil _portUtil;
+        //ScreenUtil _screenUtil;
+
+        public BindingChannelNewDialogViewModel(IEventAggregator eventAggregator, PortUtil portUtil//, ScreenUtil screenUtil
+            )
+        {
+            _eventAggregator = eventAggregator;
+            _portUtil = portUtil;
+            //_screenUtil = screenUtil;
+        }
+
+        public int DrawerNo
+        {
+            get => _drawerNo;
+            set
+            {
+                SetProperty(ref _drawerNo, value);
+                GetChannelsByDrawerNo();
+            }
+        }
+
+        private DrugInfo? _drugInfo;
+
+        public DrugInfo? DrugInfo
+        {
+            get => _drugInfo;
+            set
+            {
+                SetProperty(ref _drugInfo, value);
+                //if (_drugInfo != null)
+                //{
+                //    DrugManuNos = _drugInfo.DrugManuNos.OrderByDescending(dm => dm.ManuNo).ToList();
+                //}
+            }
+        }
+        //拼音码对应药品实体
+        private DrugInfo? _durgInfo_for_py;
+        public DrugInfo? DrugInfo_Py
+        {
+            get => _durgInfo_for_py;
+            set
+            {
+
+                SetProperty(ref _durgInfo_for_py, value);
+                if (_durgInfo_for_py != null)
+                {
+                    DrugInfos = GetDrugByDrugPY(_durgInfo_for_py.PyCode);
+                }
+                else
+                {
+                    DrugInfos = GetDrugByDrugPY("");
+                }
+            }
+        }
+
+        #region 根据药品拼音码查询药品名称
+        private List<DrugInfo> GetDrugByDrugPY(string pycode)
+        {
+            List<DrugInfo> DrugList = null;
+            if (!string.IsNullOrEmpty(pycode))
+            {
+                DrugList = SqlSugarHelper.Db.Queryable<DrugInfo>().Includes<DrugManuNo>(di => di.DrugManuNos).Where(di => di.PyCode.Contains(pycode)).OrderBy(di => di.DrugId).ToList();
+            }
+            else
+            {
+                DrugList = SqlSugarHelper.Db.Queryable<DrugInfo>().Includes<DrugManuNo>(di => di.DrugManuNos).OrderBy(di => di.DrugId).ToList();
+            }
+            return DrugList;
+        }
+        private List<DrugInfo>? _drugInfos_py;
+        public List<DrugInfo>? DrugInfos_PY
+        {
+            get => _drugInfos_py;
+            set => SetProperty(ref _drugInfos_py, value);
+        }
+        #endregion 根据药品拼音码查询药品名称
+
+
+        private List<DrugInfo>? _drugInfos;
+
+        public List<DrugInfo>? DrugInfos
+        {
+            get => _drugInfos;
+            set => SetProperty(ref _drugInfos, value);
+        }
+
+        //private DrugManuNo? _drugManuNo;
+
+        //public DrugManuNo? DrugManuNo
+        //{
+        //    get => _drugManuNo;
+        //    set => SetProperty(ref _drugManuNo, value);
+        //}
+        //private List<DrugManuNo>? _drugManuNos;
+
+        //public List<DrugManuNo>? DrugManuNos
+        //{
+        //    get => _drugManuNos;
+        //    set => SetProperty(ref _drugManuNos, value);
+        //}
+
+
+        private List<ChannelList>? _channels;
+
+        public List<ChannelList>? Channels
+        {
+            get => _channels;
+            set => SetProperty(ref _channels, value);
+        }
+
+        private int _totalCount = 0;
+        public int TotalCount { get => _totalCount; set => SetProperty(ref _totalCount, value); }
+
+        private int _pageNum = 1;
+        public int PageNum
+        {
+            get => _pageNum;
+            set
+            {
+                SetProperty(ref _pageNum, value);
+                GetChannelsByDrawerNo();
+            }
+        }
+
+        private int _pageCount = 1;
+        public int PageCount
+        {
+            get => _pageCount;
+            set
+            {
+                SetProperty(ref _pageCount, value);
+            }
+        }
+
+        private int _pageSize = 8;
+        public int PageSize
+        {
+            get => _pageSize;
+            set
+            {
+                SetProperty(ref _pageSize, value);
+            }
+        }
+
+
+
+        public bool CanCloseDialog()
+        {
+            return true;
+        }
+
+        public void OnDialogClosed()
+        {
+            _eventAggregator.GetEvent<PortUtilEvent>().Unsubscribe(DoMyPrismEvent);
+        }
+
+        private void GetAllDrugInfos()
+        {
+            var list = SqlSugarHelper.Db.Queryable<DrugInfo>().Includes<DrugManuNo>(di => di.DrugManuNos).OrderBy(di => di.DrugId).ToList();
+            DrugInfos = list;
+            DrugInfos_PY = list;
+        }
+
+        private void GetChannelsByDrawerNo()
+        {
+            Channels?.Clear();
+            int totalCount = 0;
+            var list = SqlSugarHelper.Db.Queryable<ChannelList>()
+                .Includes<DrugInfo>(cl => cl.Drug)
+                //.Includes<ChannelStock>(cs => cs.channelStock)
+                .WhereIF(DrawerNo > 0, cl => cl.DrawerNo == DrawerNo)
+                .Where(cl => cl.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
+                .OrderBy(cl => cl.DrawerNo)
+                .OrderBy(cl => cl.ColNo)
+                .ToPageList(PageNum, PageSize, ref totalCount);
+            Channels = list;
+            TotalCount = totalCount;
+        }
+        public void OnDialogOpened(IDialogParameters parameters)
+        {
+            if (parameters.ContainsKey("DrawerNo"))
+            {
+                DrawerNo = parameters.GetValue<int>("DrawerNo");
+            }
+            GetAllDrugInfos();
+            GetChannelsByDrawerNo();
+            _eventAggregator.GetEvent<PortUtilEvent>().Subscribe(DoMyPrismEvent);
+        }
+        public DelegateCommand Query
+        {
+            get => new DelegateCommand(() =>
+            {
+                GetChannelsByDrawerNo();
+            });
+        }
+
+
+        public DelegateCommand BindingDrug
+        {
+            get => new DelegateCommand(async () =>
+            {
+
+                var SelectChannels = Channels.FindAll(item => item.IsSelected);
+
+                if (SelectChannels.All(it => it.DrawerType != 1))
+                {
+                    if (SelectChannels.Count == 1)
+                    {
+                        if (DrugInfo != null)
+                        {
+                            int count = SqlSugarHelper.Db.Queryable<ChannelList>().Where(cs => cs.DrugId.Equals(DrugInfo.DrugId.ToString())).Where(cs => cs.DrawerType != 1).Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).Count();
+                            if (count == 0)
+                            {
+                                var item = SelectChannels[0];
+
+                                if (item.DrugId == null || !DrugInfo.DrugId.ToString().Equals(item.DrugId))
+                                {
+                                    item.PosNo = 0;
+                                }
+                                item.DrugId = DrugInfo.DrugId.ToString();
+                                SqlSugarHelper.Db.Updateable(item).UpdateColumns(it => new { it.DrugId, it.PosNo }).ExecuteCommand();
+                                GetChannelsByDrawerNo();
+
+                                if (item.BoardType == 5)
+                                {
+                                    _portUtil.WindowName = "BindingChannelDialog";
+                                    // 向显示屏写入库位信息
+                                    _portUtil.WriteChannelInfo(1, DrugInfo.DrugName, item.DrawerNo, item.ColNo);
+                                    await Task.Delay(200);
+                                    _portUtil.WriteChannelInfo(2, DrugInfo.DrugSpec, item.DrawerNo, item.ColNo);
+                                    await Task.Delay(200);
+                                    _portUtil.WriteChannelInfo(8, DrugInfo.Manufactory, item.DrawerNo, item.ColNo);
+                                    await Task.Delay(200);
+                                    //_portUtil.WriteChannelInfo(6, DrugManuNo.EffDate==null?"": DrugManuNo.EffDate, item.DrawerNo, item.ColNo);
+                                    //await Task.Delay(200);
+                                    //_portUtil.WriteChannelInfo(5, DrugManuNo.ManuNo, item.DrawerNo, item.ColNo);
+                                    //await Task.Delay(200);
+                                    _portUtil.ShowContent(item.DrawerNo, item.ColNo);
+                                }
+                                //_screenUtil.SetStockInfo(item, 1);
+
+                            }
+                            else
+                            {
+                                SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
+                                SnackbarMessageQueue.Enqueue($"药品【{DrugInfo.DrugName}】已经绑定了回收库位不可再次绑定");
+                            }
+                        }
+                        else
+                        {
+                            SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
+                            SnackbarMessageQueue.Enqueue("请选择库位需要绑定的药品信息");
+                        }
+                    }
+                    else
+                    {
+                        SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
+                        SnackbarMessageQueue.Enqueue("每种药品只能绑定一个回收库位");
+                    }
+                }
+                else
+                {
+                    //if (DrugInfo != null && DrugManuNo != null)
+                    //{
+
+                    var c = SelectChannels.Count;
+
+                    if (c > 0)
+                    {
+                        for (int i = 0; i < SelectChannels.Count; i++)
+                        {
+                            var item = SelectChannels[i];
+                            var channelStock = SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.Chnguid == item.Id&&cs.Quantity>0).ToList();
+                            if(channelStock.Count>0)
+                            {
+                                //有库存，不能解绑
+
+                                SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
+                                SnackbarMessageQueue.Enqueue($"库位{item.DrawerNo}-{item.ColNo}中还存在药品,不能绑定其他药品");
+                                continue;
+                            }
+                            if (item.DrugId == null || !DrugInfo.DrugId.ToString().Equals(item.DrugId))
+                            {
+                                item.PosNo = 0;
+                            }
+
+                            item.DrugId = DrugInfo.DrugId.ToString();
+                            //item.ManuNo = DrugManuNo.ManuNo;
+                            item.Drug = DrugInfo;
+                            //item.EffDate = String.Format("{0:yyyy-MM-dd}", DrugManuNo.EffDate);
+                            SqlSugarHelper.Db.Updateable(item).UpdateColumns(it => new { it.DrugId, it.PosNo }).ExecuteCommand();
+
+                            if (item.BoardType == 5)
+                            {
+                                _portUtil.WindowName = "BindingChannelDialog";
+                                // 向显示屏写入库位信息
+                                _portUtil.WriteChannelInfo(1, DrugInfo.DrugName, item.DrawerNo, item.ColNo);
+                                //await Task.Delay(200);
+                                Thread.Sleep(200);
+                                _portUtil.WriteChannelInfo(2, DrugInfo.DrugSpec, item.DrawerNo, item.ColNo);
+                                //await Task.Delay(200);
+                                Thread.Sleep(200);
+                                _portUtil.WriteChannelInfo(8, DrugInfo.Manufactory, item.DrawerNo, item.ColNo);
+                                //await Task.Delay(200);
+                                Thread.Sleep(200);
+                                //_portUtil.WriteChannelInfo(6, DrugManuNo.ManuNo, item.DrawerNo, item.ColNo);
+                                //await Task.Delay(200);
+                                //Thread.Sleep(200);
+                                //_portUtil.WriteChannelInfo(5, String.Format("{0:yyyy-MM-dd}", DrugManuNo.EffDate), item.DrawerNo, item.ColNo);
+                                ////await Task.Delay(200);
+                                //Thread.Sleep(200);
+                                _portUtil.ShowContent(item.DrawerNo, item.ColNo);
+                            }
+                        }
+
+
+                        GetChannelsByDrawerNo();
+                    }
+                    else
+                    {
+                        SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
+                        SnackbarMessageQueue.Enqueue("所选库位中无可绑定库位【库位还存在药品】");
+                    }
+                    //}
+                    //else
+                    //{
+                    //    SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
+                    //    SnackbarMessageQueue.Enqueue("请选择库位需要绑定的药品及批次信息");
+                    //}
+                }
+            });
+        }
+
+        public DelegateCommand RemoveBinding
+        {
+            get => new DelegateCommand(async () =>
+            {
+                var SelectChannels = Channels.FindAll(item => item.IsSelected && item.DrugId != null);
+                var c = SelectChannels.Count;
+                if (c > 0)
+                {
+
+                    SelectChannels.ForEach(async item =>
+                    {
+                        var channelStock = SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.Chnguid == item.Id && cs.Quantity > 0).ToList();
+                        if (channelStock.Count > 0)
+                        {
+                            SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
+                            SnackbarMessageQueue.Enqueue("所选库位中无可解绑药品【库位还存在药品】");
+                            //该药品下的批次还有库存则不能解绑
+                            return;
+                        }
+
+                        item.DrugId = null;
+                        //item.ManuNo = null;
+                        //item.EffDate = null;
+                        item.Drug = null;
+                        SqlSugarHelper.Db.Updateable(item).UpdateColumns(it => new { it.DrugId }).ExecuteCommand();
+                        if (item.BoardType == 5)
+                        {
+                            // 清除显示屏库位信息
+                            _portUtil.ClearContent(item.DrawerNo, item.ColNo);
+                            await Task.Delay(200);
+                            _portUtil.ShowContent(item.DrawerNo, item.ColNo);
+                        }
+
+                        //_screenUtil.SetStockInfo(item, 1);
+                    });
+                    GetChannelsByDrawerNo();
+                }
+                else
+                {
+                    SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
+                    SnackbarMessageQueue.Enqueue("所选库位中无可解绑药品");
+                }
+            });
+        }
+
+        public DelegateCommand BtnCloseCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                //DialogParameters parameters = new DialogParameters();
+                //parameters.Add("",);
+                // 关闭当前窗口
+                RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+            });
+        }
+
+        public bool KeepAlive => false;
+        string message = string.Empty;
+        private void DoMyPrismEvent(DeviceMsg msg)
+        {
+            if (msg.WindowName == "BindingChannelDialog")
+            {
+                switch (msg.EventType)
+                {
+                    case EventType.OPENERROR:
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = msg.Message,
+                            Type = MsgType.ERROR,
+                        };
+                        if (message != msg.Message)
+                        {
+                            message = msg.Message;
+                            _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        }
+                        break;
+                }
+            }
+        }
+    }
+}
diff --git a/DM_Weight/ViewModels/ChangeShiftsDialogViewModel.cs b/DM_Weight/ViewModels/ChangeShiftsDialogViewModel.cs
new file mode 100644
index 0000000..0cc4d14
--- /dev/null
+++ b/DM_Weight/ViewModels/ChangeShiftsDialogViewModel.cs
@@ -0,0 +1,660 @@
+using DM_Weight.Finger;
+using DM_Weight.Models;
+using DM_Weight.msg;
+using DM_Weight.Port;
+using DM_Weight.util;
+using log4net;
+using Prism.Commands;
+using Prism.Events;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Configuration;
+using System.Drawing;
+using System.Drawing.Printing;
+using System.Linq;
+using System.Reflection.PortableExecutable;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+using System.Xml;
+
+namespace DM_Weight.ViewModels
+{
+    public class ChangeShiftsDialogViewModel : BindableBase, IDialogAware, IRegionMemberLifetime
+    {
+        public string Title => "交接班";
+
+        public bool KeepAlive => false;
+        //交班人 发药人
+        public UserList Operator { get; set; }
+        private bool _operatorLogin = false;
+        public bool OperatorLogin
+        {
+            get => _operatorLogin;
+            set { SetProperty(ref _operatorLogin, value); }
+        }
+        //private _brushesOperator = Brushes.Green;
+        //public System.Drawing.Brush BrushesOperator
+        //{
+        //    get=> _brushesOperator;
+        //    set { SetProperty(ref _brushesOperator, value);}
+        //}
+        //交班人 审核人
+        public UserList Reviewer { get; set; }
+        private bool _reviewerLogin = false;
+        public bool ReviewerLogin
+        {
+            get => _reviewerLogin;
+            set
+            {
+                SetProperty(ref _reviewerLogin, value);
+            }
+        }
+        //private System.Drawing.Brush _brushesReviewer=Brushes.Green;
+        //public System.Drawing.Brush BrushesReviewer
+        //{
+        //    get=> _brushesReviewer;
+        //    set
+        //    {
+        //        SetProperty(ref _brushesReviewer, value);
+        //    }
+        //}
+
+        //接班人 发药人
+        public UserList JieOperator { get; set; }
+        //接班人 审核人
+        public UserList JieReviewer { get; set; }
+
+        //当前操作人
+        public UserList CurrentUser { get; set; }
+        //双人登录还是单人登录
+        private int loginMode = Convert.ToInt32(ConfigurationManager.AppSettings["loginMode"]?.ToString() ?? "1");
+        //第一个登录的是发药人还是接班人
+        private string firstLogin = ConfigurationManager.AppSettings["firstLogin"]?.ToString() ?? "operator";
+        //验证按钮可用状态
+        private bool _jiaoBanOk = true;
+        public bool JiaoBanOk
+        {
+            get => _jiaoBanOk;
+            set { SetProperty(ref _jiaoBanOk, value); }
+        }
+
+        private NavigationParameters keys = new NavigationParameters();
+
+        public bool SingleLogin
+        {
+            get => ReadAppSetting("loginMode") == "1";
+            //get => loginMode == 1;
+        }
+        public bool MultiLogin
+        {
+            //get => loginMode == 2;
+            get => ReadAppSetting("loginMode") == "2";
+        }
+
+        private PortUtil _portUtil;
+        private Boolean _loginBtnEnable = true;
+        public Boolean LoginBtnEnable { get { return _loginBtnEnable; } set { SetProperty(ref _loginBtnEnable, value); } }
+        public string Password { get { return password; } set { SetProperty(ref password, value); } }
+
+        public string Username { get { return username; } set { SetProperty(ref username, value); } }
+        private readonly ILog logger = LogManager.GetLogger(typeof(LoginWindowViewModel));
+
+        private string username;
+        private string password;
+
+        private bool _fingerMsg;
+
+        public bool FingerMsg
+        {
+            get => _fingerMsg;
+            set => SetProperty(ref _fingerMsg, value);
+        }
+        public event Action<IDialogResult> RequestClose;
+
+        public DelegateCommand BtnCloseCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                // 关闭当前窗口
+                RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+            });
+        }
+        //确认交接
+        public DelegateCommand ShiftsCommand => new DelegateCommand(ShiftsAction);
+        private void ShiftsAction()
+        {
+            if (Operator != null && !OperatorLogin)
+            {
+                AlertMsg alertMsg = new AlertMsg
+                {
+                    Message = "交班发药人需要系统验证！",
+                    Type = MsgType.ERROR,
+                };
+                _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                return;
+            }
+            if (Reviewer != null && !ReviewerLogin)
+            {
+                AlertMsg alertMsg = new AlertMsg
+                {
+                    Message = "交班审核人需要系统验证！",
+                    Type = MsgType.ERROR,
+                };
+                _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                return;
+            }
+            if (JieOperator == null && JieReviewer == null)
+            {
+                AlertMsg alertMsg = new AlertMsg
+                {
+                    Message = "接班发药人或审核需要系统验证！",
+                    Type = MsgType.ERROR,
+                };
+                _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                return;
+            }
+            //1验证交班人与接班人是否都已登录验证2写交接信息
+            //if ((Operator != null || Reviewer != null) && (JieOperator != null || JieReviewer != null))
+            //{
+            DateTime dt = DateTime.Now;
+            //保存交接班信息（查询当前值班人的最后一条交接班信息（如有则修改状态，没有则插入一条）并写入一条接班人信息）
+            var f = SqlSugarHelper.Db.UseTran(() =>
+            {
+                List<HkcChangeShifts> listHkcChangeShifts = SqlSugarHelper.Db.Queryable<HkcChangeShifts>()
+                  .Where(cs => cs.State == "0")
+                  .WhereIF(Operator != null && !string.IsNullOrEmpty(Operator.UserName), cs => cs.FromOperator == Operator.UserName)
+                  .WhereIF(Reviewer != null && !string.IsNullOrEmpty(Reviewer.UserName), cs => cs.FromRviewer == Reviewer.UserName)
+                  .OrderByDescending(cs => cs.OptState)
+                  .ToList();
+
+                if (listHkcChangeShifts != null && listHkcChangeShifts.Count > 0)
+                {
+                    //存在则修改，不存在则插入一条
+                    SqlSugarHelper.Db.Updateable(new HkcChangeShifts()
+                    {
+                        Id = listHkcChangeShifts[0].Id,
+                        ToOperator = JieOperator == null ? "" : JieOperator.UserName,
+                        ToReviewer = JieReviewer == null ? "" : JieReviewer.UserName,
+                        State = "1",
+                        ToDate = dt
+                    }).UpdateColumns(it => new { it.ToOperator, it.ToReviewer, it.State, it.ToDate }).WhereColumns(it => new { it.Id }).ExecuteCommand();
+                }
+                else
+                {
+                    SqlSugarHelper.Db.Insertable(new HkcChangeShifts()
+                    {
+                        FromOperator = Operator == null ? "" : Operator.UserName,
+                        FromRviewer = Reviewer == null ? "" : Reviewer.UserName,
+                        ToOperator = JieOperator == null ? "" : JieOperator.UserName,
+                        ToReviewer = JieReviewer == null ? "" : JieReviewer.UserName,
+                        State = "1",
+                        OptState = "0",
+                        OptDate = dt,
+                        Machineid = ConfigurationManager.AppSettings["machineId"] ?? "DM1"
+                    }).ExecuteCommand();
+
+                }
+                SqlSugarHelper.Db.Insertable(new HkcChangeShifts()
+                {
+                    FromOperator = JieOperator == null ? "" : JieOperator.UserName,
+                    FromRviewer = JieReviewer == null ? "" : JieReviewer.UserName,
+                    State = "0",
+                    OptState = "0",
+                    OptDate = dt,
+                    //ToDate = dt,
+                    Machineid = ConfigurationManager.AppSettings["machineId"] ?? "DM1"
+                }).ExecuteCommand();
+
+                //插入交接班报表数据信息
+                string strSql = @"SELECT drug.drug_name,drug.DRUG_SPEC,c.manu_no,d.useNum,d.getNum,sum(quantity) as surplus,
+                                    (SELECT d2.manunoquantity FROM dm_machine_record d2 WHERE d2.drug_id = c.`drug_id`  and d2.manu_no=c.manu_no  AND d2.operation_time < @beforeDate
+                                    ORDER BY d2.operation_time DESC,d2.id DESC LIMIT 1) AS beforeNum
+                                    from channel_stock		c LEFT JOIN drug_info drug on c.drug_id=drug.drug_id left JOIN	(SELECT drug_id,manu_no,
+                                    SUM(IF(d1.`type` = 1, d1.quantity, 0)) AS getNum,SUM(IF(d1.`type` = 2, d1.quantity, 0)) AS useNum FROM dm_machine_record d1
+                                    WHERE d1.`type` IN (1, 2) AND d1.`operation_time` >= @startDate and d1.`operation_time` <=@endDate and d1.machine_id=@machineId GROUP BY d1.Drug_ID ,d1.manu_no) d
+                                    on c.drug_id=d.drug_id and c.manu_no=d.manu_no WHERE c.machine_id=@machineId and c.drug_id is not NULL GROUP BY c.Drug_ID ,c.manu_no
+                                    UNION
+                                    SELECT drug.drug_name,drug.DRUG_SPEC,d.manu_no,d.useNum,d.getNum,sum(quantity) as surplus,(SELECT d2.manunoquantity FROM dm_machine_record d2 WHERE d2.drug_id = d.`drug_id`  and d2.manu_no=d.manu_no  AND d2.operation_time < @beforeDate
+                                    ORDER BY d2.operation_time DESC,d2.id DESC LIMIT 1) AS beforeNum from (SELECT drug_id,manu_no, SUM(IF(d1.`type` = 1, d1.quantity, 0)) AS getNum,SUM(IF(d1.`type` = 2, d1.quantity, 0)) AS useNum FROM dm_machine_record d1 
+                                     WHERE d1.`type` IN (1, 2) AND d1.`operation_time` >= @startDate and d1.`operation_time` <=@endDate and d1.machine_id=@machineId GROUP BY d1.Drug_ID ,d1.manu_no) d	
+                                    LEFT JOIN drug_info drug on d.drug_id=drug.drug_id left JOIN		 channel_stock		c on c.drug_id=d.drug_id and c.manu_no=d.manu_no AND c.machine_id=@machineId GROUP BY d.Drug_ID ,d.manu_no ";
+                List<ShiftsReport> shiftsReports = SqlSugarHelper.Db.SqlQueryable<dynamic>(strSql)
+                 .AddParameters(new
+                 {
+                     machineId = ConfigurationManager.AppSettings["machineId"] ?? "DM1",
+                     beforeDate = listHkcChangeShifts[0].OptDate,
+                     startDate = listHkcChangeShifts[0].OptDate,
+                     endDate = dt
+                 })
+                .Select(it => new ShiftsReport())
+                .ToList();
+                if (shiftsReports != null && shiftsReports.Count > 0)
+                {
+                    for (int i = 0; i < shiftsReports.Count; i++)
+                    {
+
+                        SqlSugarHelper.Db.Insertable(new ShiftsReport()
+                        {
+                            OptDate = dt,
+                            DrugName = shiftsReports[i].DrugName,
+                            DrugSpec = shiftsReports[i].DrugSpec,
+                            BeforeNum = shiftsReports[i].BeforeNum ?? 0,
+                            GetNum = shiftsReports[i].GetNum ?? 0,
+                            UseNum = shiftsReports[i].UseNum ?? 0,
+                            ManuNo = shiftsReports[i].ManuNo,
+                            Surplus = shiftsReports[i].Surplus ?? 0,
+                            FromOperator = Operator == null ? "" : Operator.Nickname,
+                            FromReviewer = Reviewer == null ? "" : Reviewer.Nickname,
+                            ToOperator = JieOperator == null ? "" : JieOperator.Nickname,
+                            ToReviewer = JieReviewer == null ? "" : JieReviewer.Nickname,
+                            MachineId = ConfigurationManager.AppSettings["machineId"] ?? "DM1"
+                        }).ExecuteCommand();
+                    }
+                }
+                return true;
+            });
+            if (f.Data)
+            {
+                AlertMsg alertMsg = new AlertMsg
+                {
+                    Message = "交接班操作完成！",
+                    Type = MsgType.SUCCESS,
+                };
+                _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                // 关闭当前窗口
+                RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+            }
+            if (!f.IsSuccess)
+            {
+                AlertMsg alertMsg = new AlertMsg
+                {
+                    Message = "交接班操作失败！",
+                    Type = MsgType.ERROR,
+                };
+                _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+            }
+            //}
+            //else
+            //{
+            //    AlertMsg alertMsg = new AlertMsg
+            //    {
+            //        Message = "交接班需要交班人与接班人全部系统验证！",
+            //        Type = MsgType.ERROR,
+            //    };
+            //    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+            //}
+        }
+        //用户名密码登录
+        public DelegateCommand LoginCommand => new DelegateCommand(LoginAction);
+
+        //清空
+        public DelegateCommand ClearCommand => new DelegateCommand(ClearAction);
+        private void ClearAction()
+        {
+            Username = string.Empty;
+            Password = string.Empty;
+        }
+
+        private void LoginAction()
+        {
+            Login();
+        }
+
+        void Login()
+        {
+            LoginBtnEnable = false;
+            if (!string.IsNullOrEmpty(Username) && !string.IsNullOrEmpty(Password))
+            {
+                UserList userList = SqlSugarHelper.Db.Queryable<UserList>()
+                                    .Includes<RoleDm>(u => u.Role)
+                                   .InnerJoin<RoleDm>((u, r) => u.RoleId == r.Id)
+                                   .First(u => u.UserName == username && ConfigurationManager.AppSettings["machineId"].ToString().Equals(u.MachineId));
+
+                if (userList == null)
+                {
+                    AlertMsg alertMsg = new AlertMsg
+                    {
+                        Message = "无此用户",
+                        Type = MsgType.ERROR
+                    };
+                    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    Username = string.Empty;
+                    Password = string.Empty;
+                }
+                else if (userList.Role == null)
+                {
+                    AlertMsg alertMsg = new AlertMsg
+                    {
+                        Message = "用户还未设置权限，请联系管理员",
+                        Type = MsgType.ERROR
+                    };
+                    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    Username = string.Empty;
+                    Password = string.Empty;
+                }
+                else
+                {
+                    if (userList.PassWord == MD5.GetMD5Hash(Password))
+                    {
+                        Username = string.Empty;
+                        Password = string.Empty;
+                        HkcChangeShifts changeOperator = GetOperator();
+                        if (changeOperator != null)
+                        {
+
+                            if (userList.UserName == changeOperator.FromOperator)
+                            {
+
+                                Operator = userList;
+                                RaisePropertyChanged("Operator");
+                                //交班人的发药人登录
+                                OperatorLogin = true;
+                                if (((Reviewer != null && ReviewerLogin) || (Reviewer == null)) && JieOperator != null && JieReviewer != null)
+                                { JiaoBanOk = false; }
+                            }
+                            else if (userList.UserName == changeOperator.FromRviewer)
+                            {
+                                //交班人的审核人登录
+                                Reviewer = userList;
+                                RaisePropertyChanged("Reviewer");
+                                ReviewerLogin = true;
+                                if (((Operator != null && OperatorLogin) || (Operator == null)) && JieOperator != null && JieReviewer != null)
+                                { JiaoBanOk = false; }
+                            }
+                            else
+                            {
+                                if (keys.ContainsKey("operator"))
+                                {
+                                    if (userList.UserName == (JieOperator == null ? "" : JieOperator.UserName))
+                                    {
+                                        AlertMsg alertMsg = new AlertMsg
+                                        {
+                                            Message = "接班发药人不能与审核人相同",
+                                            Type = MsgType.ERROR
+                                        };
+                                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                                    }
+                                    else
+                                    {
+                                        keys.Add("reviewer", userList);
+                                        JieReviewer = userList;
+                                        RaisePropertyChanged("JieReviewer");
+                                        if (((Operator != null && OperatorLogin)||(Operator==null))&& ((Reviewer != null && ReviewerLogin)||(Reviewer==null)) &&JieOperator != null)
+                                        { JiaoBanOk = false; }
+                                    }
+                                }
+                                else
+                                {
+                                    if (userList.UserName == (JieReviewer == null ? "" : JieReviewer.UserName))
+                                    {
+                                        AlertMsg alertMsg = new AlertMsg
+                                        {
+                                            Message = "接班发药人不能与审核人相同",
+                                            Type = MsgType.ERROR
+                                        };
+                                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                                    }
+                                    else
+                                    {
+                                        keys.Add("operator", userList);
+                                        JieOperator = userList;
+                                        RaisePropertyChanged("JieOperator");
+                                        if (((Operator != null && OperatorLogin) || (Operator == null)) && ((Reviewer != null && ReviewerLogin) || (Reviewer == null)) && JieReviewer != null)
+                                        { JiaoBanOk = false; }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "密码错误",
+                            Type = MsgType.ERROR
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        Password = string.Empty;
+                    }
+                }
+
+            }
+            else
+            {
+                AlertMsg alertMsg = new AlertMsg
+                {
+                    Message = "请输入账号或密码",
+                    Type = MsgType.ERROR
+                };
+                _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+            }
+            LoginBtnEnable = true;
+        }
+        //void SetUser(UserList user)
+        //{
+        //    // 双人登录模式
+        //    {
+        //        // 如果已经录入了发药人，已经有一个用户登录
+        //        if (keys.ContainsKey("operator"))
+        //        {
+        //            if (keys.GetValue<UserList>("operator").Id != user.Id)
+        //            {
+        //                keys.Add("reviewer", user);
+        //                JieReviewer = user;
+        //                RaisePropertyChanged("JieReviewer");
+        //            }
+        //            else
+        //            {
+        //                AlertMsg alertMsg = new AlertMsg
+        //                {
+        //                    Message = "该发药人账号已登录，请输入不同账号",
+        //                    Type = MsgType.ERROR
+        //                };
+        //                _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+        //            }
+        //        }
+        //        // 如果已经录入了审核人， 已经有一个用户登录
+        //        else if (keys.ContainsKey("reviewer"))
+        //        {
+        //            if (keys.GetValue<UserList>("reviewer").Id != user.Id)
+        //            {
+        //                keys.Add("operator", user);
+        //                JieOperator = user;
+        //                RaisePropertyChanged("JieOperator");
+        //            }
+        //            else
+        //            {
+        //                AlertMsg alertMsg = new AlertMsg
+        //                {
+        //                    Message = "该审核人账号已登录，请输入不同账号",
+        //                    Type = MsgType.ERROR
+        //                };
+        //                _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+        //            }
+        //        }
+        //        // 第一个用户登录
+        //        else
+        //        {
+        //            if (firstLogin.Equals("operator"))
+        //            {
+        //                keys.Add("operator", user);
+        //                JieOperator = user;
+        //                RaisePropertyChanged("JieOperator");
+        //            }
+        //            else
+        //            {
+        //                keys.Add("reviewer", user);
+        //                JieReviewer = user;
+        //                RaisePropertyChanged("JieReviewer");
+        //            }
+        //        }
+        //    }
+        //}
+        void ChangeShiftsLoginEvent(FingerprintMsg msg)
+        {
+            logger.Info(msg.ToString());
+            if (msg.Message.Equals("CONNECT"))
+            {
+                FingerMsg = !msg.Result;
+            }
+            if (LoginBtnEnable)
+            {
+                if (msg.Message.Equals("LOGIN"))
+                {
+                    UserList userList = SqlSugarHelper.Db.Queryable<UserList>()
+                    .Includes<RoleDm>(u => u.Role)
+                    .First(u => u.Id == msg.Id);
+
+                    if (userList == null)
+                    {
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "无此用户",
+                            Type = MsgType.ERROR
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        //Username = "";
+                        //Password = "";
+                    }
+                    else if (userList.Role == null)
+                    {
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "用户还未设置权限，请联系管理员",
+                            Type = MsgType.ERROR
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        //Username = "";
+                        //Password = "";
+                    }
+                    else
+                    {
+                        HkcChangeShifts changeOperator = GetOperator();
+                        if (changeOperator != null)
+                        {
+                            if (userList.UserName == changeOperator.FromOperator)
+                            {
+                                Operator = userList;
+                                RaisePropertyChanged("Operator");
+                                //交班人的发药人登录
+                                OperatorLogin = true;
+                                if (((Reviewer != null && ReviewerLogin) || (Reviewer == null)) && JieOperator != null && JieReviewer != null)
+                                { JiaoBanOk = false; }
+
+                            }
+                            else if (userList.UserName == changeOperator.FromRviewer)
+                            {
+                                //交班人的审核人登录
+                                Reviewer = userList;
+                                RaisePropertyChanged("Reviewer");
+                                ReviewerLogin = true;
+                                if (((Operator != null && OperatorLogin) || (Operator == null)) && JieOperator != null && JieReviewer != null)
+                                { JiaoBanOk = false; }
+                            }
+                            else
+                            {
+                                if (keys.ContainsKey("operator"))
+                                {
+                                    if (userList.UserName == (JieOperator == null ? "" : JieOperator.UserName))
+                                    {
+                                        AlertMsg alertMsg = new AlertMsg
+                                        {
+                                            Message = "接班发药人不能与审核人相同",
+                                            Type = MsgType.ERROR
+                                        };
+                                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                                    }
+                                    else
+                                    {
+                                        keys.Add("reviewer", userList);
+                                        JieReviewer = userList;
+                                        RaisePropertyChanged("JieReviewer");
+                                        if (((Operator != null && OperatorLogin) || (Operator == null)) && ((Reviewer != null && ReviewerLogin) || (Reviewer == null)) && JieOperator != null)
+                                        { JiaoBanOk = false; }
+
+                                    }
+                                }
+                                else
+                                {
+                                    if (userList.UserName == (JieReviewer == null ? "" : JieReviewer.UserName))
+                                    {
+                                        AlertMsg alertMsg = new AlertMsg
+                                        {
+                                            Message = "接班发药人不能与审核人相同",
+                                            Type = MsgType.ERROR
+                                        };
+                                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                                    }
+                                    else
+                                    {
+                                        keys.Add("operator", userList);
+                                        JieOperator = userList;
+                                        RaisePropertyChanged("JieOperator");
+                                        if (((Operator != null && OperatorLogin) || (Operator == null)) && ((Reviewer != null && ReviewerLogin) || (Reviewer == null)) && JieReviewer != null)
+                                        { JiaoBanOk = false; }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+        }
+        IEventAggregator _eventAggregator;
+        public ChangeShiftsDialogViewModel(IEventAggregator eventAggregator)
+        {
+            _eventAggregator = eventAggregator;
+        }
+
+        public bool CanCloseDialog()
+        {
+            return true;
+        }
+
+        public void OnDialogClosed()
+        {
+            _eventAggregator.GetEvent<FingerprintEvent>().Unsubscribe(ChangeShiftsLoginEvent);
+        }
+
+        public void OnDialogOpened(IDialogParameters parameters)
+        {
+            HkcChangeShifts changeOperator = GetOperator();
+            if (changeOperator != null)
+            {
+                Operator = SqlSugarHelper.Db.Queryable<UserList>().Where(u => u.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).Single(u => u.UserName == changeOperator.FromOperator);
+                Reviewer = SqlSugarHelper.Db.Queryable<UserList>().Where(u => u.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).Single(u => u.UserName == changeOperator.FromRviewer);
+            }
+
+            FingerMsg = false;// !_fingerprintUtil.bIsConnected;
+            _eventAggregator.GetEvent<FingerprintEvent>().Subscribe(ChangeShiftsLoginEvent);
+        }
+        //查询值班人信息
+        private HkcChangeShifts GetOperator()
+        {
+            //查询发药人及审核人
+            HkcChangeShifts changeOperator = SqlSugarHelper.Db.Queryable<HkcChangeShifts>().Single(change => change.State == "0");
+            //if (changeOperator != null)
+            //{
+            //    Operator = SqlSugarHelper.Db.Queryable<UserList>().Single(u => u.UserName == changeOperator.FromOperator);
+            //    Reviewer = SqlSugarHelper.Db.Queryable<UserList>().Single(u => u.UserName == changeOperator.ToOperator);
+            //}
+            return changeOperator;
+        }
+        //手动实现调用配置的逻辑 规避修改配置文件后不起作用的问题
+        public string ReadAppSetting(string key)
+        {
+            string xPath = $"/configuration/appSettings//add[@key='{key}']";
+            XmlDocument doc = new XmlDocument();
+            string exeFileName = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
+            doc.Load(exeFileName + ".dll.config");
+            XmlNode node = doc.SelectSingleNode(xPath);
+            return node.Attributes["value"].Value.ToString();
+        }
+    }
+}
diff --git a/DM_Weight/ViewModels/ChangeShiftsListWindowViewModel.cs b/DM_Weight/ViewModels/ChangeShiftsListWindowViewModel.cs
new file mode 100644
index 0000000..63cf86b
--- /dev/null
+++ b/DM_Weight/ViewModels/ChangeShiftsListWindowViewModel.cs
@@ -0,0 +1,185 @@
+using DM_Weight.Models;
+using DM_Weight.Report;
+using DM_Weight.util;
+using Prism.Commands;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.ViewModels
+{
+    public class ChangeShiftsListWindowViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime
+    {
+        private int _pageNum = 1;
+        public int PageNum
+        {
+            get => _pageNum;
+            set
+            {
+                SetProperty(ref _pageNum, value);
+                RequestData();
+            }
+        }
+
+        private int _pageCount = 1;
+        public int PageCount
+        {
+            get => _pageCount;
+            set
+            {
+                SetProperty(ref _pageCount, value);
+            }
+        }
+
+        private int _pageSize = 8;
+        public int PageSize
+        {
+            get => _pageSize;
+            set
+            {
+                SetProperty(ref _pageSize, value);
+            }
+        }
+
+        private int _totalCount = 0;
+        public int TotalCount
+        {
+            get => _totalCount;
+            set
+            {
+                SetProperty(ref _totalCount, value);
+            }
+        }
+        private DateTime? _startDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);
+
+        public DateTime? StartDate
+        {
+            get => _startDate;
+            set
+            {
+                if (value != null)
+                {
+                    SetProperty(ref _startDate, new DateTime(value?.Year ?? 0, value?.Month ?? 0, value?.Day ?? 0));
+                }
+                else
+                {
+                    SetProperty(ref _startDate, value);
+                }
+                RequestData();
+            }
+        }
+
+        private DateTime? _endDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59);
+
+        public DateTime? EndDate
+        {
+            get => _endDate;
+            set
+            {
+                if (value != null)
+                {
+                    TimeSpan ershisi = new TimeSpan(23, 59, 59);
+                    SetProperty(ref _endDate, new DateTime(value?.Year ?? 0, value?.Month ?? 0, value?.Day ?? 0, 23, 59, 59));
+                }
+                else
+                {
+                    SetProperty(ref _endDate, value);
+                }
+
+                RequestData();
+            }
+        }
+        private List<HkcChangeShifts>? hkcChangeShifts;
+
+        public List<HkcChangeShifts>? HkcChangeShifts
+        {
+            get { return hkcChangeShifts; }
+            set { SetProperty(ref hkcChangeShifts, value); }
+        }
+
+        public bool KeepAlive => false;
+        IDialogService _dialogService;
+
+        //交接班
+        public DelegateCommand ShiftsCommand => new DelegateCommand(ShiftsAction);
+        private void ShiftsAction()
+        {
+            DialogParameters dialogParameters = new DialogParameters();
+            DialogServiceExtensions.ShowDialogHost(_dialogService, "ChangeShiftsDialog", dialogParameters, DoDialogResult, "RootDialog");
+        }
+        private void DoDialogResult(IDialogResult dialogResult)
+        {
+            RequestData();
+        }
+        //导出报表
+        public DelegateCommand Download => new DelegateCommand(DownloadAction);
+        private void DownloadAction()
+        {
+            GridReportUtil.PrintChangeShiftsReport(StartDate, EndDate);
+        }
+
+        public ChangeShiftsListWindowViewModel(IDialogService dialogService)
+        {
+            _dialogService = dialogService;
+        }
+        void RequestData()
+        {
+            int totalCount = 0;
+            string machineId = ConfigurationManager.AppSettings["machineId"] ?? "DM1";
+            string sqlStr = @"SELECT c.id,c.OptDate,u.User_Name as fromoperator,u2.User_Name fromrviewer,u3.User_Name as tooperator,u4.User_Name as toreviewer,
+                            c.todate,c.State from hkc_changeshifts c LEFT JOIN user_list u on c.fromoperator=u.user_id 
+                            LEFT JOIN user_list u2 on c.fromrviewer=u2.user_id  LEFT JOIN user_list u3 on c.tooperator=u3.user_id  
+                            left join user_list u4 on c.toreviewer=u4.user_id where c.machine_id=@machineId ";
+            if(StartDate!=null)
+            {
+                sqlStr += " and c.optdate>=@starOptDate ";
+            }
+            if(EndDate!=null)
+            {
+                sqlStr += " and c.optdate<=@endOptDate ";
+            }
+            sqlStr+=" group by c.id";
+            HkcChangeShifts = SqlSugarHelper.Db.SqlQueryable<dynamic>(sqlStr)
+                .AddParameters(new
+                {
+                    machineId = machineId,
+                    starOptDate = StartDate,
+                    endOptDate = EndDate
+                })
+                .Select(it=>new HkcChangeShifts())
+                //.Select("*")
+                .ToPageList(PageNum, PageSize, ref totalCount);
+
+
+            TotalCount = totalCount;
+        }
+
+        public DelegateCommand Query => new DelegateCommand(RequestData);
+
+        public void ConfirmNavigationRequest(NavigationContext navigationContext, Action<bool> continuationCallback)
+        {
+            continuationCallback(true);
+        }
+
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            //查询表格数据
+            RequestData();
+        }
+
+        public bool IsNavigationTarget(NavigationContext navigationContext)
+        {
+            return true;
+        }
+
+        public void OnNavigatedFrom(NavigationContext navigationContext)
+        {
+        }
+    }
+}
diff --git a/DM_Weight/ViewModels/ChangeShiftsRecordWindowViewModel.cs b/DM_Weight/ViewModels/ChangeShiftsRecordWindowViewModel.cs
new file mode 100644
index 0000000..dcd4e24
--- /dev/null
+++ b/DM_Weight/ViewModels/ChangeShiftsRecordWindowViewModel.cs
@@ -0,0 +1,161 @@
+using DM_Weight.Models;
+using DM_Weight.util;
+using Prism.Commands;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.ViewModels
+{
+    public class ChangeShiftsRecordWindowViewModel:BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime
+    {
+        private int _pageNum = 1;
+        public int PageNum
+        {
+            get => _pageNum;
+            set
+            {
+                SetProperty(ref _pageNum, value);
+                RequestData();
+            }
+        }
+
+        private int _pageCount = 1;
+        public int PageCount
+        {
+            get => _pageCount;
+            set
+            {
+                SetProperty(ref _pageCount, value);
+            }
+        }
+
+        private int _pageSize = 8;
+        public int PageSize
+        {
+            get => _pageSize;
+            set
+            {
+                SetProperty(ref _pageSize, value);
+            }
+        }
+
+        private int _totalCount = 0;
+        public int TotalCount
+        {
+            get => _totalCount;
+            set
+            {
+                SetProperty(ref _totalCount, value);
+            }
+        }
+        private DateTime? _startDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);
+
+        public DateTime? StartDate
+        {
+            get => _startDate;
+            set
+            {
+                if (value != null)
+                {
+                    SetProperty(ref _startDate, new DateTime(value?.Year ?? 0, value?.Month ?? 0, value?.Day ?? 0));
+                }
+                else
+                {
+                    SetProperty(ref _startDate, value);
+                }
+                RequestData();
+            }
+        }
+
+        private DateTime? _endDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59);
+
+        public DateTime? EndDate
+        {
+            get => _endDate;
+            set
+            {
+                if (value != null)
+                {
+                    TimeSpan ershisi = new TimeSpan(23, 59, 59);
+                    SetProperty(ref _endDate, new DateTime(value?.Year ?? 0, value?.Month ?? 0, value?.Day ?? 0, 23, 59, 59));
+                }
+                else
+                {
+                    SetProperty(ref _endDate, value);
+                }
+
+                RequestData();
+            }
+        }
+        private List<MachineRecord>? machineRecords;
+
+        public List<MachineRecord>? MachineRecords
+        {
+            get { return machineRecords; }
+            set { SetProperty(ref machineRecords, value); }
+        }
+
+        public bool KeepAlive => false;
+        IDialogService _dialogService;
+
+        //交接班
+        public DelegateCommand ShiftsCommand => new DelegateCommand(ShiftsAction);
+        private void ShiftsAction()
+        {
+            DialogParameters dialogParameters = new DialogParameters();
+            DialogServiceExtensions.ShowDialogHost(_dialogService, "ChangeShiftsDialog", dialogParameters, DoDialogResult, "RootDialog");
+        }
+        private void DoDialogResult(IDialogResult dialogResult)
+        {
+            RequestData();
+        }
+        public ChangeShiftsRecordWindowViewModel(IDialogService dialogService)
+        {
+            _dialogService= dialogService;
+        }
+        void RequestData()
+        {
+            int totalCount = 0;
+            string machineId = ConfigurationManager.AppSettings["machineId"] ?? "DM1";
+            //MachineRecords = SqlSugarHelper.Db.Queryable<MachineRecord>()
+            //    .Includes<DrugInfo>(mr => mr.DrugInfo)
+            //    .Includes<UserList>(mr => mr.User)
+            //    .Where(mr => mr.MachineId == machineId)
+            //    .WhereIF(Type == 3, (mr) => new int[] { 31, 32 }.Contains(mr.Type))
+            //    .WhereIF(Type != 3, (mr) => mr.Type == Type)
+            //    .WhereIF(StartDate != null, (mr) => mr.OperationTime > StartDate)
+            //    .WhereIF(EndDate != null, (mr) => mr.OperationTime < EndDate)
+            //    //.Select(mr => mr)
+            //    .ToPageList(PageNum, PageSize, ref totalCount);
+            ////.ToList();
+            TotalCount = totalCount;
+        }
+
+        public void ConfirmNavigationRequest(NavigationContext navigationContext, Action<bool> continuationCallback)
+        {
+            continuationCallback(true);
+        }
+
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            //查询表格数据
+            RequestData();
+        }
+
+        public bool IsNavigationTarget(NavigationContext navigationContext)
+        {
+            return true;
+        }
+
+        public void OnNavigatedFrom(NavigationContext navigationContext)
+        {
+        }
+    }
+}
diff --git a/DM_Weight/ViewModels/ChangeShiftsWindowViewModel.cs b/DM_Weight/ViewModels/ChangeShiftsWindowViewModel.cs
new file mode 100644
index 0000000..dabb8cc
--- /dev/null
+++ b/DM_Weight/ViewModels/ChangeShiftsWindowViewModel.cs
@@ -0,0 +1,562 @@
+using DM_Weight.Finger;
+using DM_Weight.Models;
+using DM_Weight.msg;
+using DM_Weight.Port;
+using DM_Weight.util;
+using log4net;
+using log4net.Core;
+using Prism.Commands;
+using Prism.Events;
+using Prism.Mvvm;
+using Prism.Regions;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.ViewModels
+{
+    public class ChangeShiftsWindowViewModel : BindableBase, IRegionMemberLifetime, IConfirmNavigationRequest
+    {
+        private readonly ILog logger = LogManager.GetLogger(typeof(LoginWindowViewModel));
+
+        //交班人发药人用户名
+        private string jiaoFaUsername = App.CurrentFaUserList.UserName ?? "";
+        public string JiaoFaUsername { get => jiaoFaUsername; set { SetProperty(ref jiaoFaUsername, value); } }
+
+        //交班人发药人密码
+        private string jiaoFaPassword;
+        public string JiaoFaPassword { get => jiaoFaPassword; set { SetProperty(ref jiaoFaPassword, value); } }
+
+        //交班人审核人用户名
+        private string jiaoShenUsername = App.CurrentShenUserList.UserName ?? "";
+        public string JiaoShenUsername { get => jiaoShenUsername; set { SetProperty(ref jiaoShenUsername, value); } }
+
+        //交班人审核人密码
+        private string jiaoShenPassword;
+        public string JiaoShenPassword { get => jiaoShenPassword; set { SetProperty(ref jiaoShenPassword, value); } }
+
+        //接班人发药人用户名
+        private string jieFaUsername;
+        public string JieFaUsername { get => jieFaUsername; set { SetProperty(ref jieFaUsername, value); } }
+
+        //接班人发药人密码
+        private string jieFaPassword;
+        public string JieFaPassword { get => jieFaPassword; set { SetProperty(ref jieFaPassword, value); } }
+
+        //接班人审核人用户名
+        private string jieShenUsername;
+        public string JieShenUsername { get => jieShenUsername; set { SetProperty(ref jieShenUsername, value); } }
+
+        //接班人审核人密码
+        private string jieShenPassword;
+        public string JieShenPassword { get => jieShenPassword; set { SetProperty(ref jieShenPassword, value); } }
+
+        //接班人发药人
+        public UserList Operator { get; set; }
+        //接班人审核人
+        public UserList Reviewer { get; set; }
+
+        private Boolean _loginBtnEnable = true;
+        public Boolean LoginBtnEnable { get { return _loginBtnEnable; } set { SetProperty(ref _loginBtnEnable, value); } }
+
+        private string firstLogin = ConfigurationManager.AppSettings["firstLogin"]?.ToString() ?? "operator";
+
+        //交班确认按钮是否可用
+        private bool _jieBanOk = true;
+        public bool JieBanOk { get => _jieBanOk; set { SetProperty(ref _jieBanOk, value); } }
+
+
+        //接班确认按钮是否可用
+        private bool _jiaoBanOk = true;
+        public bool JiaoBanOk { get => _jiaoBanOk; set { SetProperty(ref _jiaoBanOk, value); } }
+
+
+        private PortUtil _portUtil;
+        IRegionManager _regionManager;
+        IEventAggregator _eventAggregator;
+        public bool KeepAlive => false;
+
+        private bool _fingerMsg;
+
+        public bool FingerMsg
+        {
+            get => _fingerMsg;
+            set => SetProperty(ref _fingerMsg, value);
+        }
+
+        public ChangeShiftsWindowViewModel(IRegionManager regionManager, IEventAggregator eventAggregator, PortUtil portUtil)
+        {
+            _portUtil = portUtil;
+            _regionManager = regionManager;
+            _eventAggregator = eventAggregator;
+        }
+
+        #region 交班确认按钮
+
+        private bool JiaoBanFYRFlag = false; //交班发药人flag
+        private bool JiaoBanSHRFlag = false; //交班审核人flag
+        public DelegateCommand JiaobanCommand => new DelegateCommand(JiaoBanAction);
+        private void JiaoBanAction()
+        {
+            if (!string.IsNullOrEmpty(JiaoFaUsername) && !string.IsNullOrEmpty(JiaoFaPassword))
+            {
+                JiaoBanFYRFlag = ChangeShiftsLogin(JiaoFaUsername.Trim(), JiaoFaPassword.Trim());
+            }
+            else if (!string.IsNullOrEmpty(JiaoShenUsername) && !string.IsNullOrEmpty(JiaoShenPassword))
+            {
+                JiaoBanSHRFlag = ChangeShiftsLogin(JiaoShenUsername.Trim(), JiaoShenPassword.Trim());
+            }
+            else
+            {
+                //提示：请输入交班人中发药人或审核人的用户名密码
+                AlertMsg alertMsg = new AlertMsg
+                {
+                    Message = "请输入交班人中发药人或审核人的用户名密码",
+                    Type = MsgType.ERROR
+                };
+                _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+            }
+            if (JiaoBanFYRFlag || JiaoBanSHRFlag)
+            {
+                JiaoBanOk = false;
+            }
+        }
+        #endregion  交班确认按钮
+
+        #region 接班确认按钮
+        private bool JieBanFYRFlag = false; //接班发药人flag
+        private bool JieBanSHRFlag = false; //接班审核人flag
+        public DelegateCommand JiebanCommand => new DelegateCommand(JiebanAction);
+        private void JiebanAction()
+        {
+            if (!string.IsNullOrEmpty(JieFaUsername) && !string.IsNullOrEmpty(JieFaPassword))
+            {
+                ChangeShiftsForJieLogin(JieFaUsername.Trim(), JieFaPassword.Trim());
+            }
+            else if (!string.IsNullOrEmpty(JieShenUsername) && !string.IsNullOrEmpty(JieShenPassword))
+            {
+                ChangeShiftsForJieLogin(JieShenUsername.Trim(), JieShenPassword.Trim());
+            }
+            else
+            {
+                //提示：请输入接班人中发药人或审核人的用户名密码
+                AlertMsg alertMsg = new AlertMsg
+                {
+                    Message = "请输入接班人中发药人或审核人的用户名密码",
+                    Type = MsgType.ERROR
+                };
+                _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+            }
+            if (JieBanFYRFlag || JieBanSHRFlag)
+            {
+                JieBanOk = false;
+            }
+        }
+        #endregion 接班确认按钮
+
+        #region 清空按钮
+        public DelegateCommand ClearOneCommand => new DelegateCommand(ClearAction);
+        private void ClearAction()
+        {
+            JiaoFaPassword = string.Empty;
+            JiaoShenPassword = string.Empty;
+        }
+        #endregion
+
+        #region 接班人清空按钮
+        public DelegateCommand ClearTwoCommand => new DelegateCommand(ClearTwoAction);
+        private void ClearTwoAction()
+        {
+            JieFaUsername = string.Empty;
+            JieFaPassword = string.Empty;
+            JieShenUsername = string.Empty;
+            JieShenPassword = string.Empty;
+        }
+        #endregion
+
+        #region 确认交接
+        public DelegateCommand ShiftsCommand => new DelegateCommand(ShiftsAction);
+        private void ShiftsAction()
+        {
+            //1验证交班人与接班人是否都已登录验证2写交接信息
+            if ((JiaoBanFYRFlag || JiaoBanSHRFlag) && (JieBanFYRFlag || JieBanSHRFlag))
+            {
+                //保存交接班信息（查询当前值班人的最后一条交接班信息（如有则修改状态，没有则插入一条）并写入一条接班人信息）
+                var f = SqlSugarHelper.Db.UseTran(() =>
+                {
+                    List<HkcChangeShifts> listHkcChangeShifts = SqlSugarHelper.Db.Queryable<HkcChangeShifts>()
+                      .Where(cs => cs.State == "0")
+                      .WhereIF(App.CurrentFaUserList != null && !string.IsNullOrEmpty(App.CurrentFaUserList.UserName), cs => cs.FromOperator == App.CurrentFaUserList.UserName)
+                      .WhereIF(App.CurrentShenUserList != null && !string.IsNullOrEmpty(App.CurrentShenUserList.UserName), cs => cs.FromRviewer == App.CurrentShenUserList.UserName)
+                      .OrderByDescending(cs => cs.OptState)
+                      .ToList();
+
+                    //List<MachineRecord> listMachineRecord=SqlSugarHelper.Db.Queryable<MachineRecord>()
+                    //.Where(m=>)
+
+                    if (listHkcChangeShifts != null && listHkcChangeShifts.Count > 0)
+                    {
+                        //存在则修改，不存在则插入一条
+                        SqlSugarHelper.Db.Updateable(new HkcChangeShifts()
+                        {
+                            Id = listHkcChangeShifts[0].Id,
+                            ToOperator = Operator == null ? "" : Operator.UserName,
+                            ToReviewer = Reviewer == null ? "" : Reviewer.UserName,
+                            State = "1",
+                            OptState = "1",
+                            ToDate = DateTime.Now
+                        }).UpdateColumns(it => new { it.ToOperator, it.ToReviewer, it.State, it.OptState,it.ToDate }).WhereColumns(it => new { it.Id }).ExecuteCommand();
+                    }
+                    else
+                    {
+                        SqlSugarHelper.Db.Insertable(new HkcChangeShifts()
+                        {
+                            FromOperator = App.CurrentFaUserList.UserName,
+                            FromRviewer = App.CurrentShenUserList.UserName,
+                            ToOperator = Operator == null ? "" : Operator.UserName,
+                            ToReviewer = Reviewer == null ? "" : Reviewer.UserName,
+                            State = "1",
+                            OptState = "0",
+                            OptDate = DateTime.Now
+                        }).ExecuteCommand();
+
+                    }
+                    SqlSugarHelper.Db.Insertable(new HkcChangeShifts()
+                    {
+                        FromOperator = App.CurrentFaUserList.UserName,
+                        FromRviewer = App.CurrentShenUserList.UserName,
+                        State = "0",
+                        OptState = "0",
+                        OptDate = DateTime.Now,
+                        ToDate = DateTime.Now
+                    }).ExecuteCommand();
+                    return true;
+                });
+                if (f.Data)
+                {
+                    AlertMsg alertMsg = new AlertMsg
+                    {
+                        Message = "交接班操作完成！",
+                        Type = MsgType.SUCCESS,
+                    };
+                    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                }
+                if (!f.IsSuccess)
+                {
+                    AlertMsg alertMsg = new AlertMsg
+                    {
+                        Message = "交接班操作失败！",
+                        Type = MsgType.ERROR,
+                    };
+                    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                }
+            }
+        }
+        #endregion 确认交接
+        private NavigationParameters keys = new NavigationParameters();
+        bool ChangeShiftsLogin(string userName, string passWord)
+        {
+            LoginBtnEnable = false;
+            if (!string.IsNullOrEmpty(userName) && !string.IsNullOrEmpty(passWord))
+            {
+                {
+                    UserList userList = SqlSugarHelper.Db.Queryable<UserList>()
+                                        .Includes<RoleDm>(u => u.Role)
+                                       .InnerJoin<RoleDm>((u, r) => u.RoleId == r.Id)
+                                       .First(u => u.UserName == userName && ConfigurationManager.AppSettings["machineId"].ToString().Equals(u.MachineId));
+
+                    if (userList == null)
+                    {
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "无此用户",
+                            Type = MsgType.ERROR
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        userName = "";
+                        passWord = "";
+                        return false;
+                    }
+                    else if (userList.Role == null)
+                    {
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "用户还未设置权限，请联系管理员",
+                            Type = MsgType.ERROR
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        userName = "";
+                        passWord = "";
+                        return false;
+                    }
+                    else
+                    {
+                        if (userList.PassWord == MD5.GetMD5Hash(passWord))
+                        {
+
+                            if (userList.UserName == App.CurrentShenUserList.UserName)
+                            {
+                                //交班人  指纹验证发药人成功
+                                JiaoBanFYRFlag = true;
+                            }
+                            else if (userList.UserName == App.CurrentFaUserList.UserName)
+                            {
+                                //交班人  指纹验证审核人成功
+                                JiaoBanSHRFlag = true;
+                            }
+                            else
+                            {
+                                //接班人登录
+                                SetUser(userList);
+                            }
+                            return true;
+                        }
+                        else
+                        {
+                            AlertMsg alertMsg = new AlertMsg
+                            {
+                                Message = "密码错误",
+                                Type = MsgType.ERROR
+                            };
+                            _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                            passWord = "";
+                            return false;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                AlertMsg alertMsg = new AlertMsg
+                {
+                    Message = "请输入账号或密码",
+                    Type = MsgType.ERROR
+                };
+                _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                return false;
+            }
+            //LoginBtnEnable = true;
+        }
+
+        void ChangeShiftsForJieLogin(string userName, string passWord)
+        {
+            LoginBtnEnable = false;
+            if (!string.IsNullOrEmpty(userName) && !string.IsNullOrEmpty(passWord))
+            {
+                {
+                    UserList userList = SqlSugarHelper.Db.Queryable<UserList>()
+                                        .Includes<RoleDm>(u => u.Role)
+                                       .InnerJoin<RoleDm>((u, r) => u.RoleId == r.Id)
+                                       .First(u => u.UserName == userName && ConfigurationManager.AppSettings["machineId"].ToString().Equals(u.MachineId));
+
+                    if (userList == null)
+                    {
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "无此用户",
+                            Type = MsgType.ERROR
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        userName = "";
+                        passWord = "";
+                    }
+                    else if (userList.Role == null)
+                    {
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "用户还未设置权限，请联系管理员",
+                            Type = MsgType.ERROR
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        userName = "";
+                        passWord = "";
+                    }
+                    else
+                    {
+                        if (userList.PassWord == MD5.GetMD5Hash(passWord))
+                        {
+                            //接班人登录
+                            SetUser(userList);
+                        }
+                        else
+                        {
+                            AlertMsg alertMsg = new AlertMsg
+                            {
+                                Message = "密码错误",
+                                Type = MsgType.ERROR
+                            };
+                            _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                            passWord = "";
+                        }
+                    }
+                }
+            }
+            else
+            {
+                AlertMsg alertMsg = new AlertMsg
+                {
+                    Message = "请输入账号或密码",
+                    Type = MsgType.ERROR
+                };
+                _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+            }
+            //LoginBtnEnable = true;
+        }
+        void ChangeShiftsLoginEvent(FingerprintMsg msg)
+        {
+            logger.Info(msg.ToString());
+            if (msg.Message.Equals("CONNECT"))
+            {
+                FingerMsg = !msg.Result;
+            }
+            if (LoginBtnEnable)
+            {
+                if (msg.Message.Equals("LOGIN"))
+                {
+                    UserList userList = SqlSugarHelper.Db.Queryable<UserList>()
+                    .Includes<RoleDm>(u => u.Role)
+                    .First(u => u.Id == msg.Id);
+
+                    if (userList == null)
+                    {
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "无此用户",
+                            Type = MsgType.ERROR
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        //Username = "";
+                        //Password = "";
+                    }
+                    else if (userList.Role == null)
+                    {
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "用户还未设置权限，请联系管理员",
+                            Type = MsgType.ERROR
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        //Username = "";
+                        //Password = "";
+                    }
+                    else
+                    {
+                        if (userList.UserName == App.CurrentShenUserList.UserName)
+                        {
+                            //交班人  指纹验证发药人成功
+                            JiaoBanFYRFlag = true;
+                        }
+                        else if (userList.UserName == App.CurrentFaUserList.UserName)
+                        {
+                            //交班人  指纹验证审核人成功
+                            JiaoBanSHRFlag = true;
+                        }
+                        else
+                        {
+                            //接班人登录
+                            SetUser(userList);
+                        }
+                        if (JiaoBanFYRFlag || JiaoBanSHRFlag)
+                        {
+                            JiaoBanOk = false;
+                        }
+                        if (JieBanFYRFlag || JieBanSHRFlag)
+                        {
+                            JieBanOk = false;
+                        }
+                    }
+                }
+            }
+
+        }
+
+        void SetUser(UserList user)
+        {
+            // 双人登录模式
+            {
+                // 如果已经录入了发药人，已经有一个用户登录
+                if (keys.ContainsKey("operator"))
+                {
+                    if (keys.GetValue<UserList>("operator").Id != user.Id)
+                    {
+                        keys.Add("reviewer", user);
+                        Reviewer = user;
+                        JieBanFYRFlag = true;
+                        //RaisePropertyChanged("Reviewer");
+                    }
+                    else
+                    {
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "该发药人账号已登录，请输入不同账号",
+                            Type = MsgType.ERROR
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    }
+                }
+                // 如果已经录入了审核人， 已经有一个用户登录
+                else if (keys.ContainsKey("reviewer"))
+                {
+                    if (keys.GetValue<UserList>("reviewer").Id != user.Id)
+                    {
+                        keys.Add("operator", user);
+                        Operator = user;
+                        //RaisePropertyChanged("Operator");
+                        JieBanSHRFlag = true;
+                    }
+                    else
+                    {
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "该审核人账号已登录，请输入不同账号",
+                            Type = MsgType.ERROR
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    }
+                }
+                // 第一个用户登录
+                else
+                {
+                    if (firstLogin.Equals("operator"))
+                    {
+                        keys.Add("operator", user);
+                        Operator = user;
+                        JieBanFYRFlag = true;
+                    }
+                    else
+                    {
+                        keys.Add("reviewer", user);
+                        Reviewer = user;
+                        JieBanSHRFlag = true;
+                    }
+                }
+            }
+        }
+
+        public void ConfirmNavigationRequest(NavigationContext navigationContext, Action<bool> continuationCallback)
+        {
+            continuationCallback(true);
+        }
+
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            FingerMsg = false;// !_fingerprintUtil.bIsConnected;
+            _eventAggregator.GetEvent<FingerprintEvent>().Subscribe(ChangeShiftsLoginEvent);
+        }
+
+        public bool IsNavigationTarget(NavigationContext navigationContext)
+        {
+            return true;
+        }
+
+        public void OnNavigatedFrom(NavigationContext navigationContext)
+        {
+            _eventAggregator.GetEvent<FingerprintEvent>().Unsubscribe(ChangeShiftsLoginEvent);
+        }
+    }
+}
diff --git a/DM_Weight/ViewModels/CheckStockWindowViewModel.cs b/DM_Weight/ViewModels/CheckStockWindowViewModel.cs
new file mode 100644
index 0000000..87c3b71
--- /dev/null
+++ b/DM_Weight/ViewModels/CheckStockWindowViewModel.cs
@@ -0,0 +1,319 @@
+using log4net;
+using Prism.Commands;
+using Prism.Events;
+using Prism.Mvvm;
+using Prism.Regions;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Speech.Synthesis;
+using System.Text;
+using System.Threading.Tasks;
+using DM_Weight.Models;
+using DM_Weight.msg;
+using DM_Weight.Port;
+using DM_Weight.util;
+
+namespace DM_Weight.ViewModels
+{
+    public class CheckStockWindowViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime
+    {
+        private readonly ILog logger = LogManager.GetLogger(typeof(CheckStockWindowViewModel));
+        private List<ChannelStock> _channelStocks = new();
+
+        public List<ChannelStock> ChannelStocks
+        {
+            get => _channelStocks;
+            set => SetProperty(ref _channelStocks, value);
+        }
+        private static readonly DateTime Jan1st1970 = new DateTime
+    (1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+
+        private PortUtil _portUtil;
+        IEventAggregator _eventAggregator;
+
+        public CheckStockWindowViewModel(PortUtil portUtil, IEventAggregator eventAggregator)
+        {
+            _portUtil = portUtil;
+            _eventAggregator = eventAggregator;
+        }
+
+        void DoMyPrismEvent(DeviceMsg msg)
+        {
+            if (msg.WindowName == "CheckStockWindow")
+            {
+                switch (msg.EventType)
+                {
+                    // 抽屉打开
+                    case EventType.DRAWEROPEN:
+                        if (Status == 1)
+                        {
+                            Status = 2;
+                        }
+
+                        break;
+                    // 抽屉关闭
+                    case EventType.DRAWERCLOSE:
+                        if (Status == 2)
+                        {
+                            Status = 3;
+                        }
+                        break;
+                    // 数量变化
+                    case EventType.UPDATEQUANTITY:
+                        if (Status == 2)
+                        {
+                            logger.Info($"抽屉【{DrawerNo}】库位药品数量【{msg.Quantitys}】");
+                        }
+                        break;
+                    // 打开失败
+                    case EventType.OPENERROR:
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = msg.Message,
+                            Type = MsgType.ERROR,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        Status = 0;
+                        break;
+                }
+            }
+
+        }
+
+        private int _status;
+
+        public int Status { get => _status; set => SetProperty(ref _status, value); }
+
+        private int _drawerNo = 1;
+
+        public int DrawerNo
+        {
+            get => _drawerNo;
+            set => SetProperty(ref _drawerNo, value);
+        }
+
+        private bool _is8Drawer = true;
+
+        public bool Is8Drawer { get => _is8Drawer; set => SetProperty(ref _is8Drawer, value); }
+
+        private bool _is16Drawer = false;
+
+        public bool Is16Drawer { get => _is16Drawer; set => SetProperty(ref _is16Drawer, value); }
+
+
+        private bool _is17Drawer = false;
+
+        public bool Is17Drawer { get => _is17Drawer; set => SetProperty(ref _is17Drawer, value); }
+        public DelegateCommand<string> UpdateDrawerNo
+        {
+            get => new DelegateCommand<string>((DrawerNo) =>
+            {
+                this.DrawerNo = Convert.ToInt32(DrawerNo);
+                RequestData();
+            }, (DrawerNo) => Status == 0
+            );
+        }
+        public DelegateCommand OpenDrawer
+        {
+            get => new DelegateCommand(() =>
+            {
+                Status = 1;
+                _portUtil.SpeakAsync("正在打开" + DrawerNo + "号抽屉");
+
+
+                List<ChannelStock> singleChannels = ChannelStocks.FindAll(it => it.BoardType != 1);
+
+                _portUtil.WindowName = "CheckStockWindow";
+                _portUtil.Operate = true;
+                _portUtil.BoardType = singleChannels.Count > 0 ? singleChannels[0].BoardType : 1;
+                _portUtil.ColNos = singleChannels.Select(it => it.ColNo).ToArray();
+                _portUtil.Stocks = singleChannels.Select(it => it.Quantity).ToArray();
+                _portUtil.DrawerNo = DrawerNo;
+                _portUtil.Start();
+
+            }, () => Status == 0).ObservesProperty(() => Status);
+        }
+
+        private bool _isFinishClick = false;
+
+        // 完成按钮
+        public DelegateCommand TakeFinish
+        {
+            get => new DelegateCommand(() =>
+            {
+                _isFinishClick = true;
+                //List<ChannelStock> record = ChannelStocks.FindAll(it => it.Quantity != it.CheckQuantity).ToList();
+                List<ChannelStock> record = ChannelStocks;
+                if (record.Count > 0)
+                {
+                    string InvoiceId = "CHECK_" + CurrentTimeMillis();
+                    var f = SqlSugarHelper.Db.UseTran(() =>
+                    {
+
+                        for (int i = 0; i < record.Count; i++)
+                        {
+                            ChannelStock it = record[i];
+
+
+                            // 更新数据 库存信息
+                            SqlSugarHelper.Db.Updateable(new ChannelStock()
+                            {
+                                Quantity = it.CheckQuantity,
+                                ManuNo = it.ManuNo,
+                                EffDate = it.EffDate,
+                                Id = it.Id,
+                            }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate }).ExecuteCommand();
+                            // 获取更新完库存后的药品库存
+                            List<ChannelStock> nowChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                                .Where(cs => cs.MachineId.Equals(it.MachineId))
+                                .Where(cs => cs.DrugId.Equals(it.DrugId))
+                                .Where(cs => cs.DrawerType == 1)
+                                .ToList();
+
+                            // 保存数据 盘点记录
+                            SqlSugarHelper.Db.Insertable(new MachineRecord()
+                            {
+                                MachineId = it.MachineId,
+                                DrawerNo = it.DrawerNo,
+                                ColNo = it.ColNo,
+                                DrugId = it.DrugId,
+                                ManuNo = it.ManuNo,
+                                EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
+                                Operator = HomeWindowViewModel.Operator?.Id,
+                                Reviewer = HomeWindowViewModel.Reviewer?.Id,
+                                OperationTime = DateTime.Now,
+                                Quantity =  it.CheckQuantity - it.Quantity,
+                                Type = 4,
+                                InvoiceId = InvoiceId,
+                                StockQuantity = nowChannels.Sum(it => it.Quantity),
+                                CheckQuantity = it.CheckQuantity,
+                                ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity)
+                            }).ExecuteCommand();
+
+
+                            logger.Info($"库存盘点->库位【{it.DrawerNo}-{it.ColNo}】药品【{it.DrugInfo.DrugName}】盘点前库存【{it.Quantity}】，更改后【{it.CheckQuantity}】");
+                        }
+                        return true;
+                    });
+                    if (f.Data)
+                    {
+                        // 更新屏显库存
+                        List<ChannelStock> singleChannels = record.FindAll(it => it.BoardType != 1);
+                        if ((singleChannels.Count > 0 ? singleChannels[0].BoardType : 1) == 5)
+                        {
+                            singleChannels.ForEach(it =>
+                            {
+                                _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.CheckQuantity);
+                            });
+                        }
+
+                        RequestData();
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "抽屉盘点完成，库存已更新",
+                            Type = MsgType.SUCCESS,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    }
+                    if (!f.IsSuccess)
+                    {
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "抽屉盘点完成，库存更新失败！",
+                            Type = MsgType.ERROR,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    }
+                    Status = 0;
+                    _isFinishClick = false;
+                }
+                else
+                {
+                    _isFinishClick = false;
+                    AlertMsg alertMsg = new AlertMsg
+                    {
+                        Message = "盘点完成，库存无改变",
+                        Type = MsgType.ERROR
+                    };
+                    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    Status = 0;
+                    _isFinishClick = false;
+                }
+
+
+            }, () => Status == 3 && !_isFinishClick).ObservesProperty(() => Status);
+        }
+
+        // 取消按钮
+        public DelegateCommand CancleTake
+        {
+            get => new DelegateCommand(() =>
+            {
+                _portUtil.ResetData();
+                Status = 0;
+            });
+        }
+
+        public long CurrentTimeMillis()
+        {
+            return (long)(DateTime.UtcNow - Jan1st1970).TotalMilliseconds;
+        }
+
+        public bool KeepAlive => false;
+
+        public void FindDrawerCount()
+        {
+            int count = SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrawerType != 3)
+                .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).GroupBy(cs => cs.DrawerNo).Select(cs => SqlFunc.AggregateCount(cs.DrawerNo)).Count();
+            Is8Drawer = count < 9;
+            Is16Drawer = count >= 16;
+            Is17Drawer = count > 16;
+        }
+
+
+        //这个方法用于拦截请求,continuationCallback(true)就是不拦截，continuationCallback(false)拦截本次操作
+        public void ConfirmNavigationRequest(NavigationContext navigationContext, Action<bool> continuationCallback)
+        {
+            continuationCallback(true);
+        }
+
+
+        public void RequestData()
+        {
+            List<ChannelStock> queryData = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                .Includes(cs => cs.DrugInfo)
+                .Where(cs => cs.DrawerNo == DrawerNo)
+                .Where(cs => cs.DrugId != null)
+                .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
+                .OrderBy(cs => cs.ColNo)
+                .ToList();
+            ChannelStocks = queryData.Select(it => { it.CheckQuantity = it.Quantity; return it; }).ToList();
+        }
+
+        //接收导航传过来的参数  现在是在此处初始化了表格数据
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            _eventAggregator.GetEvent<PortUtilEvent>().Subscribe(DoMyPrismEvent);
+            FindDrawerCount();
+            RequestData();
+        }
+
+
+        //每次导航的时候，该实列用不用重新创建，true是不重新创建,false是重新创建
+        public bool IsNavigationTarget(NavigationContext navigationContext)
+        {
+            return true;
+        }
+
+        //这个方法用于拦截请求
+        public void OnNavigatedFrom(NavigationContext navigationContext)
+        { 
+            // 取消消息订阅
+            _eventAggregator.GetEvent<PortUtilEvent>().Unsubscribe(DoMyPrismEvent);
+        }
+    }
+}
+
diff --git a/DM_Weight/ViewModels/CollectionViewGroupInternal.cs b/DM_Weight/ViewModels/CollectionViewGroupInternal.cs
new file mode 100644
index 0000000..4cd9511
--- /dev/null
+++ b/DM_Weight/ViewModels/CollectionViewGroupInternal.cs
@@ -0,0 +1,6 @@
+namespace DM_Weight.ViewModels
+{
+    internal class CollectionViewGroupInternal
+    {
+    }
+}
\ No newline at end of file
diff --git a/DM_Weight/ViewModels/DebugWindowViewModel.cs b/DM_Weight/ViewModels/DebugWindowViewModel.cs
new file mode 100644
index 0000000..b2af10e
--- /dev/null
+++ b/DM_Weight/ViewModels/DebugWindowViewModel.cs
@@ -0,0 +1,40 @@
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.ViewModels
+{
+    public class DebugWindowViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime
+    {
+
+
+
+
+        public bool KeepAlive => false;
+
+        public void ConfirmNavigationRequest(NavigationContext navigationContext, Action<bool> continuationCallback)
+        {
+            continuationCallback(true);
+        }
+
+        public bool IsNavigationTarget(NavigationContext navigationContext)
+        {
+            return true;
+        }
+
+        public void OnNavigatedFrom(NavigationContext navigationContext)
+        {
+            
+        }
+
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            
+        }
+    }
+}
diff --git a/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs b/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs
new file mode 100644
index 0000000..ef19b37
--- /dev/null
+++ b/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs
@@ -0,0 +1,392 @@
+using log4net;
+using Prism.Commands;
+using Prism.Events;
+using Prism.Mvvm;
+using Prism.Regions;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Speech.Synthesis;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Threading;
+using DM_Weight.Models;
+using DM_Weight.msg;
+using DM_Weight.Port;
+using DM_Weight.util;
+using System.Collections.ObjectModel;
+using Prism.Services.Dialogs;
+
+namespace DM_Weight.ViewModels
+{
+    public class DrawerAddDrugWindowViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime
+    {
+        private readonly ILog logger = LogManager.GetLogger(typeof(DrawerAddDrugWindowViewModel));
+        private List<int> _drawerNoList = new List<int>();
+
+        //凭证号
+        private string _pzh;
+        public string PZH { get => _pzh; set { SetProperty(ref _pzh, value); } }
+
+        private List<ChannelStock>? _channelStocks;
+
+        public List<ChannelStock>? ChannelStocks
+        {
+            get => _channelStocks;
+            set => SetProperty(ref _channelStocks, value);
+        }
+
+
+        private ChannelStock? _channelStock;
+
+        public ChannelStock? CStock
+        {
+            get => _channelStock;
+            set => SetProperty(ref _channelStock, value);
+        }
+
+        //private ObservableCollection<ChannelStock> _obChannelStock=new ObservableCollection<ChannelStock>();
+        //public ObservableCollection<ChannelStock> obChannelStock
+        //{
+        //    get => _obChannelStock;
+        //    set=>SetProperty(ref _obChannelStock, value);
+        //}
+
+        private static readonly DateTime Jan1st1970 = new DateTime
+    (1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+
+        private PortUtil _portUtil;
+        IEventAggregator _eventAggregator;
+        IDialogService _dialogService;
+        public DrawerAddDrugWindowViewModel(IDialogService DialogService, PortUtil portUtil, IEventAggregator eventAggregator)
+        {
+            _dialogService = DialogService;
+            _portUtil = portUtil;
+            _eventAggregator = eventAggregator;
+        }
+        public DelegateCommand SelectionChangedCommand => new DelegateCommand(selectionAction);
+
+        private async void selectionAction()
+        {
+            if (CStock != null)
+            {
+                // 此处延时1毫秒，等待页面渲染
+                await Task.Delay(TimeSpan.FromMilliseconds(1));
+                DialogParameters dialogParameters = new DialogParameters();
+                dialogParameters.Add("addManuno", CStock);
+                DialogServiceExtensions.ShowDialogHost(_dialogService, "AddManunoDialog", dialogParameters, DoDialogResult, "RootDialog");
+
+            }
+
+        }
+        private void DoDialogResult(IDialogResult dialogResult)
+        {
+            // 委托   被动执行     被子窗口执行
+            // dialogResult  第一方面可以拿到任意参数   第二方面   可判断关闭状态
+            //if(dialogResult.Result == ButtonResult.OK)
+            //{
+            CStock = null;
+            RequestData();
+            //}
+            //MessageBox.Show("返回值：" + dialogResult.Result.ToString());
+        }
+        void DoMyPrismEvent(DeviceMsg msg)
+        {
+            if (msg.WindowName == "DrawerAddDrugWindow")
+            {
+                switch (msg.EventType)
+                {
+                    // 抽屉打开
+                    case EventType.DRAWEROPEN:
+                        if (Status == 1)
+                        {
+                            Status = 2;
+                        }
+
+                        break;
+                    // 抽屉关闭
+                    case EventType.DRAWERCLOSE:
+                        if (Status == 2)
+                        {
+                            Status = 3;
+                        }
+                        break;
+                    // 数量变化
+                    case EventType.UPDATEQUANTITY:
+                        if (Status == 2)
+                        {
+                            ChannelStocks.ForEach(it => it.AddQuantity = msg.Quantitys[it.ColNo - 1]);
+                        }
+                        break;
+                    // 打开失败
+                    case EventType.OPENERROR:
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = msg.Message,
+                            Type = MsgType.ERROR,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        Status = 0;
+                        break;
+                }
+            }
+
+        }
+
+        private int _status;
+
+        public int Status { get => _status; set => SetProperty(ref _status, value); }
+
+        private int _drawerNo = 1;
+
+        public int DrawerNo
+        {
+            get => _drawerNo;
+            set => SetProperty(ref _drawerNo, value);
+        }
+
+        private bool _is8Drawer = true;
+
+        public bool Is8Drawer { get => _is8Drawer; set => SetProperty(ref _is8Drawer, value); }
+
+        private bool _is16Drawer = false;
+
+        public bool Is16Drawer { get => _is16Drawer; set => SetProperty(ref _is16Drawer, value); }
+
+
+        private bool _is17Drawer = false;
+
+        public bool Is17Drawer { get => _is17Drawer; set => SetProperty(ref _is17Drawer, value); }
+        public DelegateCommand<string> UpdateDrawerNo
+        {
+            get => new DelegateCommand<string>((DrawerNo) =>
+            {
+                this.DrawerNo = Convert.ToInt32(DrawerNo);
+                RequestData();
+            }, (DrawerNo) => Status == 0
+            );
+        }
+        public DelegateCommand OpenDrawer
+        {
+            get => new DelegateCommand(() =>
+            {
+                Status = 1;
+                _portUtil.SpeakAsync("正在打开" + DrawerNo + "号抽屉");
+
+                try
+                {
+                    List<ChannelStock> singleChannels = ChannelStocks.FindAll(it => it.BoardType != 1);
+
+                    _portUtil.WindowName = "DrawerAddDrugWindow";
+                    _portUtil.Operate = true;
+                    _portUtil.BoardType = singleChannels.Count > 0 ? singleChannels[0].BoardType : 1;
+                    _portUtil.ColNos = singleChannels.Select(it => it.ColNo).ToArray();
+                    _portUtil.Stocks = singleChannels.Select(it => it.Quantity).ToArray();
+                    _portUtil.DrawerNo = DrawerNo;
+                    _portUtil.Start();
+
+                }
+                catch (Exception ex)
+                {
+                    logger.Info($"OpenDrawer异常：{ex.Message}");
+                }
+
+
+            }, () => Status == 0).ObservesProperty(() => Status);
+        }
+
+        private bool _isFinishClick = false;
+
+        // 完成按钮
+        public DelegateCommand TakeFinish
+        {
+            get => new DelegateCommand(() =>
+            {
+                if (!_isFinishClick)
+                {
+                    _isFinishClick = true;
+                    List<ChannelStock> record = ChannelStocks.FindAll(it => it.AddQuantity != 0).ToList();
+                    if (record.Count > 0)
+                    {
+                        //string InvoiceId = "DRAWER_" + CurrentTimeMillis();
+                        string InvoiceId = PZH;
+                        var f = SqlSugarHelper.Db.UseTran(() =>
+                        {
+
+                            for (int i = 0; i < record.Count; i++)
+                            {
+                                ChannelStock it = record[i];
+                                //it.ManuNo = it.drugManuNo.ManuNo;
+                                //it.EffDate = it.drugManuNo.EffDate;
+
+                                // 更新数据 库存信息
+                                SqlSugarHelper.Db.Updateable(new ChannelStock()
+                                {
+                                    Quantity = it.Quantity + it.AddQuantity,
+                                    ManuNo = it.ManuNo,
+                                    EffDate = it.EffDate,
+                                    Id = it.Id,
+                                }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate }).ExecuteCommand();
+                                // 获取更新完库存后的药品库存
+                                List<ChannelStock> nowChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                                    .Where(cs => cs.MachineId.Equals(it.MachineId))
+                                    .Where(cs => cs.DrugId.Equals(it.DrugId))
+                                    .Where(cs => cs.DrawerType == 1)
+                                    .ToList();
+
+                                // 保存数据 入库记录
+                                SqlSugarHelper.Db.Insertable(new MachineRecord()
+                                {
+                                    MachineId = it.MachineId,
+                                    DrawerNo = it.DrawerNo,
+                                    ColNo = it.ColNo,
+                                    DrugId = it.DrugId,
+                                    ManuNo = it.ManuNo,
+                                    EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
+                                    Operator = HomeWindowViewModel.Operator?.Id,
+                                    OperationTime = DateTime.Now,
+                                    Quantity = it.AddQuantity,
+                                    Type = 1,
+                                    InvoiceId = InvoiceId,
+                                    StockQuantity = nowChannels.Sum(it => it.Quantity),
+                                    ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity)
+                                }).ExecuteCommand();
+                            }
+                            return true;
+                        });
+                        if (f.Data)
+                        {
+                            // 更新屏显库存
+                            List<ChannelStock> singleChannels = record.FindAll(it => it.BoardType != 1);
+                            if ((singleChannels.Count > 0 ? singleChannels[0].BoardType : 1) == 5)
+                            {
+                                singleChannels.ForEach(it =>
+                                {
+                                    _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.Quantity+it.AddQuantity);
+                                });
+                            }
+                            RequestData();
+                            AlertMsg alertMsg = new AlertMsg
+                            {
+                                Message = "抽屉加药完成，库存已更新",
+                                Type = MsgType.SUCCESS,
+                            };
+                            _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        }
+                        else
+                        {
+                            AlertMsg alertMsg = new AlertMsg
+                            {
+                                Message = "更新库存失败",
+                                Type = MsgType.SUCCESS,
+                            };
+                            _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        }
+                        Status = 0;
+                        _isFinishClick = false;
+                    }
+                    else
+                    {
+                        _isFinishClick = false;
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "没有填写加药数量",
+                            Type = MsgType.ERROR
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    }
+
+                }
+
+            });
+        }
+
+        // 取消按钮
+        public DelegateCommand CancleTake
+        {
+            get => new DelegateCommand(() =>
+            {
+                _portUtil.ResetData();
+                Status = 0;
+            });
+        }
+
+        //选中批次
+        public DelegateCommand ComboboxSelected
+        {
+            get => new DelegateCommand(() =>
+            {
+                ChannelStocks.Where(it => it.Location == "").Select(it => it.ManuNo = "12").ToList();
+            });
+        }
+
+        public long CurrentTimeMillis()
+        {
+            return (long)(DateTime.UtcNow - Jan1st1970).TotalMilliseconds;
+        }
+        public bool KeepAlive => false;
+
+        public void FindDrawerCount()
+        {
+            int count = SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrawerType != 3)
+                .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).GroupBy(cs => cs.DrawerNo).Select(cs => SqlFunc.AggregateCount(cs.DrawerNo)).Count();
+            Is8Drawer = count < 9;
+            Is16Drawer = count >= 16;
+            Is17Drawer = count > 16;
+        }
+
+
+        //这个方法用于拦截请求,continuationCallback(true)就是不拦截，continuationCallback(false)拦截本次操作
+        public void ConfirmNavigationRequest(NavigationContext navigationContext, Action<bool> continuationCallback)
+        {
+            continuationCallback(true);
+        }
+
+
+
+        public void RequestData()
+        {
+            List<ChannelStock> queryData = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                .Includes(cs => cs.DrugInfo,di=>di.DrugManuNos)
+                .Where(cs => cs.DrawerNo == DrawerNo)
+                .Where(cs => cs.DrawerType == 1)
+                .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
+                .Where(cs => cs.DrugId != null)
+                .OrderBy(cs => cs.ColNo)
+                .ToList();
+            ChannelStocks = queryData.Select(cs =>
+            {
+                cs.drugManuNo = cs.DrugInfo.DrugManuNos.Find(it => it.ManuNo.Equals(cs.ManuNo));
+
+                return cs;
+            }).ToList();
+             //obChannelStock = new ObservableCollection<ChannelStock>(ChannelStocks);
+        }
+
+        //接收导航传过来的参数  现在是在此处初始化了表格数据
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            _eventAggregator.GetEvent<PortUtilEvent>().Subscribe(DoMyPrismEvent);
+            FindDrawerCount();
+            RequestData();
+        }
+
+
+        //每次导航的时候，该实列用不用重新创建，true是不重新创建,false是重新创建
+        public bool IsNavigationTarget(NavigationContext navigationContext)
+        {
+            return true;
+        }
+
+        //这个方法用于拦截请求
+        public void OnNavigatedFrom(NavigationContext navigationContext)
+        {
+            // 取消消息订阅
+            _eventAggregator.GetEvent<PortUtilEvent>().Unsubscribe(DoMyPrismEvent);
+        }
+
+
+    }
+}
diff --git a/DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs b/DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs
new file mode 100644
index 0000000..769ebf5
--- /dev/null
+++ b/DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs
@@ -0,0 +1,334 @@
+using log4net;
+using Prism.Commands;
+using Prism.Events;
+using Prism.Mvvm;
+using Prism.Regions;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Speech.Synthesis;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Threading;
+using DM_Weight.Models;
+using DM_Weight.msg;
+using DM_Weight.Port;
+using DM_Weight.util;
+using Newtonsoft.Json;
+using System.Text.RegularExpressions;
+using System.Windows.Controls;
+
+namespace DM_Weight.ViewModels
+{
+    public class DrawerTakeDrugWindowViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime
+    {
+        private readonly ILog logger = LogManager.GetLogger(typeof(DrawerTakeDrugWindowViewModel));
+
+        private List<ChannelStock> _channelStocks = new List<ChannelStock>();
+
+        public List<ChannelStock> ChannelStocks
+        {
+            get => _channelStocks;
+            set => SetProperty(ref _channelStocks, value);
+        }
+        
+        private static readonly DateTime Jan1st1970 = new DateTime
+    (1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+
+       
+
+        private PortUtil _portUtil;
+        IEventAggregator _eventAggregator;
+
+
+        public DrawerTakeDrugWindowViewModel(PortUtil portUtil, IEventAggregator eventAggregator)
+        {
+            _portUtil = portUtil;
+            _eventAggregator = eventAggregator;
+        }
+
+        void DoMyPrismEvent(DeviceMsg msg)
+        {
+            if(msg.WindowName == "DrawerTakeDrugWindow")
+            {
+                switch (msg.EventType)
+                {
+                    // 抽屉打开
+                    case EventType.DRAWEROPEN:
+                        if (Status == 1)
+                        {
+                            Status = 2;
+                        }
+
+                        break;
+                    // 抽屉关闭
+                    case EventType.DRAWERCLOSE:
+                        if (Status == 2)
+                        {
+                            Status = 3;
+                        }
+                        break;
+                    // 数量变化
+                    case EventType.UPDATEQUANTITY:
+                        if (Status == 2)
+                        {
+                            ChannelStocks.ForEach(it => it.TakeQuantity = msg.Quantitys[it.ColNo - 1]);
+                        }
+                        break;
+                    // 打开失败
+                    case EventType.OPENERROR:
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = msg.Message,
+                            Type = MsgType.ERROR,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        Status = 0;
+                        break;
+                }
+            }
+            
+        }
+
+        private int _status;
+
+        public int Status { get => _status; set => SetProperty(ref _status, value); }
+
+        private int _drawerNo = 1;
+
+        public int DrawerNo
+        {
+            get => _drawerNo;
+            set => SetProperty(ref _drawerNo, value);
+        }
+
+        private bool _is8Drawer = true;
+
+        public bool Is8Drawer { get => _is8Drawer; set => SetProperty(ref _is8Drawer, value); }
+
+        private bool _is16Drawer = false;
+
+        public bool Is16Drawer { get => _is16Drawer; set => SetProperty(ref _is16Drawer, value); }
+
+
+        private bool _is17Drawer = false;
+
+        public bool Is17Drawer { get => _is17Drawer; set => SetProperty(ref _is17Drawer, value); }
+        public DelegateCommand<string> UpdateDrawerNo
+        {
+            get => new DelegateCommand<string>((DrawerNo) =>
+            {
+                this.DrawerNo = Convert.ToInt32(DrawerNo);
+                RequestData();
+            }, (DrawerNo) => Status == 0
+            );
+        }
+        
+
+        public DelegateCommand OpenDrawer
+        {
+            get => new DelegateCommand(() =>
+            {
+                if (Status == 0)
+                {
+                    Status = 1;
+                    _portUtil.SpeakAsync("正在打开" + DrawerNo + "号抽屉");
+
+
+                    List<ChannelStock> singleChannels = ChannelStocks.FindAll(it => it.BoardType != 1);
+
+                    _portUtil.WindowName = "DrawerTakeDrugWindow";
+                    _portUtil.BoardType = singleChannels.Count > 0 ? singleChannels[0].BoardType : 1;
+                    _portUtil.ColNos = singleChannels.Select(it => it.ColNo).ToArray();
+                    _portUtil.Stocks = singleChannels.Select(it => it.Quantity).ToArray();
+                    _portUtil.DrawerNo = DrawerNo;
+                    Dispatcher.CurrentDispatcher.BeginInvoke(DispatcherPriority.Normal, () => _portUtil.Start())
+                    ;
+                }
+
+            });
+        }
+
+        private bool _isFinishClick = false;
+
+        // 完成按钮
+        public DelegateCommand TakeFinish
+        {
+            get => new DelegateCommand(() =>
+            {
+                if (!_isFinishClick)
+                {
+                    _isFinishClick = true;
+                    List<ChannelStock> record = ChannelStocks.FindAll(it => it.TakeQuantity != 0).ToList();
+                    logger.Info("点击完成按钮，库位数据：" + JsonConvert.SerializeObject(record));
+                    if (record.Count > 0)
+                    {
+                        string InvoiceId = "DRAWER_" + CurrentTimeMillis();
+                        var f = SqlSugarHelper.Db.UseTran(() =>
+                        {
+
+                            for (int i = 0; i < record.Count; i++)
+                            {
+                                ChannelStock it = record[i];
+
+
+                                // 更新数据 库存信息
+                                SqlSugarHelper.Db.Updateable(new ChannelStock()
+                                {
+                                    Quantity = it.Quantity - it.TakeQuantity,
+                                    ManuNo = it.ManuNo,
+                                    EffDate = it.EffDate,
+                                    Id = it.Id,
+                                }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate }).ExecuteCommand();
+                                // 获取更新完库存后的药品库存
+                                List<ChannelStock> nowChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                                    .Where(cs => cs.MachineId.Equals(it.MachineId))
+                                    .Where(cs => cs.DrugId.Equals(it.DrugId))
+                                    .Where(cs => cs.DrawerType == 1)
+                                    .ToList();
+
+                                // 保存数据 出库记录
+                                SqlSugarHelper.Db.Insertable(new MachineRecord()
+                                {
+                                    MachineId = it.MachineId,
+                                    DrawerNo = it.DrawerNo,
+                                    ColNo = it.ColNo,
+                                    DrugId = it.DrugId,
+                                    ManuNo = it.ManuNo,
+                                    EffDate = !String.IsNullOrEmpty(it.EffDate) ?DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture):null,
+                                    Operator = HomeWindowViewModel.Operator?.Id,
+                                    Reviewer = HomeWindowViewModel.Reviewer?.Id,
+                                    OperationTime = DateTime.Now,
+                                    Quantity = it.TakeQuantity,
+                                    Type = 2,
+                                    InvoiceId = InvoiceId,
+                                    StockQuantity = nowChannels.Sum(it => it.Quantity),
+                                    ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity)
+                                }).ExecuteCommand();
+
+                                logger.Info($"抽屉取药保存->库位【{it.DrawerNo}-{it.ColNo}】取出药品【{it.DrugInfo.DrugName}】个数【{it.TakeQuantity}】，取药前库存【{it.Quantity}】");
+                            }
+                            return true;
+                        });
+                        if (f.Data)
+                        {
+                            // 更新屏显库存
+                            List<ChannelStock> singleChannels = record.FindAll(it => it.BoardType != 1);
+                            if ((singleChannels.Count > 0 ? singleChannels[0].BoardType : 1) == 5)
+                            {
+                                singleChannels.ForEach(it =>
+                                {
+                                    _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.Quantity - it.TakeQuantity);
+                                });
+                            }
+                            RequestData();
+                            AlertMsg alertMsg = new AlertMsg
+                            {
+                                Message = "抽屉取药完成，库存已更新",
+                                Type = MsgType.SUCCESS,
+                            };
+                            _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        }
+                        if (!f.IsSuccess)
+                        {
+                            AlertMsg alertMsg = new AlertMsg
+                            {
+                                Message = "抽屉取药完成，库存更新失败！",
+                                Type = MsgType.ERROR,
+                            };
+                            _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        }
+                        Status = 0;
+                        _isFinishClick = false;
+                    }
+                    else
+                    {
+                        _isFinishClick = false;
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "没有填写取药数量",
+                            Type = MsgType.ERROR
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    }
+
+                }
+                
+            });
+        }
+
+        // 取消按钮
+        public DelegateCommand CancleTake
+        {
+            get => new DelegateCommand(() =>
+            {
+                _portUtil.ResetData();
+                Status = 0;
+            });
+        }
+
+        public long CurrentTimeMillis()
+        {
+            return (long)(DateTime.UtcNow - Jan1st1970).TotalMilliseconds;
+        }
+
+        public bool KeepAlive => false;
+
+        public void FindDrawerCount()
+        {
+            int count = SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrawerType != 3)
+                .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).GroupBy(cs => cs.DrawerNo).Select(cs => SqlFunc.AggregateCount(cs.DrawerNo)).Count();
+            Is8Drawer = count < 9;
+            Is16Drawer = count >= 16;
+            Is17Drawer = count > 16;
+        }
+
+
+        //这个方法用于拦截请求,continuationCallback(true)就是不拦截，continuationCallback(false)拦截本次操作
+        public void ConfirmNavigationRequest(NavigationContext navigationContext, Action<bool> continuationCallback)
+        {
+            continuationCallback(true);
+        }
+
+
+        public void RequestData()
+        {
+            List<ChannelStock> queryData = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                .Includes(cs => cs.DrugInfo)
+                .Where(cs => cs.DrawerNo == DrawerNo)
+                .Where(cs => cs.DrugId != null)
+                .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
+                .Where(cs => cs.DrawerType == 1)
+                .Where(cs => cs.Quantity > 0)
+                .OrderBy(cs => cs.ColNo)
+                .ToList();
+            ChannelStocks = queryData;
+        }
+
+        //接收导航传过来的参数  现在是在此处初始化了表格数据
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            _eventAggregator.GetEvent<PortUtilEvent>().Subscribe(DoMyPrismEvent);
+            FindDrawerCount();
+            RequestData();
+        }
+
+
+        //每次导航的时候，该实列用不用重新创建，true是不重新创建,false是重新创建
+        public bool IsNavigationTarget(NavigationContext navigationContext)
+        {
+            return true;
+        }
+
+        //这个方法用于拦截请求, 不让走
+        public void OnNavigatedFrom(NavigationContext navigationContext)
+        {
+            // 取消消息订阅
+            _eventAggregator.GetEvent<PortUtilEvent>().Unsubscribe(DoMyPrismEvent);
+        }
+    }
+}
diff --git a/DM_Weight/ViewModels/DrugListWindowViewModel.cs b/DM_Weight/ViewModels/DrugListWindowViewModel.cs
new file mode 100644
index 0000000..b425277
--- /dev/null
+++ b/DM_Weight/ViewModels/DrugListWindowViewModel.cs
@@ -0,0 +1,283 @@
+using Prism.Commands;
+using Prism.Mvvm;
+using Prism.Regions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using DM_Weight.Models;
+using DM_Weight.select;
+using DM_Weight.util;
+using log4net.Repository.Hierarchy;
+using log4net;
+
+namespace DM_Weight.ViewModels
+{
+    public class DrugListWindowViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime
+    {
+        private int _pageNum = 1;
+        public int PageNum
+        {
+            get => _pageNum;
+            set
+            {
+                SetProperty(ref _pageNum, value);
+                RequestData();
+            }
+        }
+
+        private int _pageCount = 1;
+        public int PageCount
+        {
+            get => _pageCount;
+            set
+            {
+                SetProperty(ref _pageCount, value);
+            }
+        }
+
+        private int _pageSize = 8;
+        public int PageSize
+        {
+            get => _pageSize;
+            set
+            {
+                SetProperty(ref _pageSize, value);
+            }
+        }
+
+        private int _totalCount = 0;
+        public int TotalCount
+        {
+            get => _totalCount;
+            set
+            {
+                SetProperty(ref _totalCount, value);
+            }
+        }
+
+        private List<DrugInfo> _drugInfos;
+        public List<DrugInfo> DrugInfos
+        {
+            get { return _drugInfos; }
+            set { SetProperty(ref _drugInfos, value); }
+        }
+
+        private DrugInfo _selectedDrug = new();
+        public DrugInfo SelectedDrug
+        {
+            get { return _selectedDrug; }
+            set
+            {
+
+                if (value != null)
+                {
+                    SetProperty(ref _selectedDrug, value);
+                    GetManuNos();
+                }
+                else
+                {
+                    SetProperty(ref _selectedDrug, new());
+                    Manunos = null;
+                }
+
+            }
+        }
+        public static List<OrderTakeSelect> StaticSelects = new()
+        {
+            new OrderTakeSelect
+            {
+                Code = "DrugName",
+                Name = "药品名称"
+            },
+            new OrderTakeSelect
+            {
+                Code = "PyCode",
+                Name = "拼音码"
+            },
+            new OrderTakeSelect
+            {
+                Code = "DrugBarcode",
+                Name = "药品条码"
+            },
+            new OrderTakeSelect
+            {
+                Code = "DrugId",
+                Name = "药品编码"
+            }
+        };
+
+        private List<OrderTakeSelect> _selects = StaticSelects;
+
+        public List<OrderTakeSelect> Selects
+        {
+            get { return _selects; }
+            set
+            {
+                SetProperty(ref _selects, value);
+            }
+        }
+
+        private OrderTakeSelect _selectedItem = StaticSelects[0];
+        /// <summary>
+        /// 查询条件 查询字段
+        /// </summary>
+        public OrderTakeSelect SelectedItem
+        {
+            get { return _selectedItem; }
+            set
+            {
+                SetProperty(ref _selectedItem, value);
+                RequestData();
+            }
+        }
+
+        private string? _searchValue;
+
+        /// <summary>
+        /// 查询条件 查询字段值
+        /// </summary>
+        public string? SearchValue
+        {
+            get { return _searchValue; }
+            set
+            {
+                SetProperty(ref _searchValue, value);
+                RequestData();
+            }
+        }
+
+
+        private List<DrugManuNo> _manunos;
+        public List<DrugManuNo> Manunos
+        {
+            get { return _manunos; }
+            set { SetProperty(ref _manunos, value); }
+        }
+
+        private DrugManuNo _selectedManuno = new DrugManuNo();
+        public DrugManuNo SelectedManuno
+        {
+            get { return _selectedManuno; }
+            set { SetProperty(ref _selectedManuno, value ?? new()); }
+        }
+
+        public bool KeepAlive => false;
+
+
+        public DelegateCommand Query
+        {
+            get => new DelegateCommand(() =>
+            {
+                RequestData();
+            });
+        }
+
+        public DelegateCommand AddDrugCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                try
+                {
+
+                    //SelectedDrug.DrugId = 0;
+                    SqlSugarHelper.Db.Insertable(SelectedDrug).ExecuteCommand();
+                    RequestData();
+                }
+                catch (Exception ex)
+                {
+                    ILog logger = LogManager.GetLogger(typeof(DrugListWindowViewModel));
+                    logger.Info($"添加数据异常：{ex.ToString()}");
+                    return;
+                }
+            });
+        }
+
+        public DelegateCommand EditDrugCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                SqlSugarHelper.Db.Updateable(SelectedDrug).UpdateColumns(d => new { d.DrugName, d.Manufactory, d.PyCode, d.PackUnit, d.MaxStock, d.DrugSpec }).ExecuteCommand();
+                RequestData();
+            }, () => SelectedDrug.DrugId !=null).ObservesProperty(() => SelectedDrug);
+        }
+
+        public DelegateCommand AddManuCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                if (!string.IsNullOrEmpty(SelectedManuno.EffDate) && !string.IsNullOrEmpty(SelectedManuno.ManuNo))
+                {
+                    SelectedManuno.Id = Guid.NewGuid().ToString();
+                    SelectedManuno.DrugId = SelectedDrug.DrugId.ToString();
+                    SelectedManuno.EffDate = DateTime.Parse(SelectedManuno.EffDate).ToString("yyyy-MM-dd");
+                    SqlSugarHelper.Db.Insertable(SelectedManuno).ExecuteCommand();
+                    GetManuNos();
+                }
+
+            }, () => SelectedDrug.DrugId !=null).ObservesProperty(() => SelectedDrug);
+        }
+
+        public DelegateCommand EditManuCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                SelectedManuno.EffDate = DateTime.Parse(SelectedManuno.EffDate).ToString("yyyy-MM-dd");
+                SqlSugarHelper.Db.Updateable(SelectedManuno).UpdateColumns(m => new { m.ManuNo, m.EffDate }).ExecuteCommand();
+                GetManuNos();
+            }, () => !string.IsNullOrEmpty(SelectedManuno.DrugId)).ObservesProperty(() => SelectedManuno);
+        }
+
+
+        //这个方法用于拦截请求,continuationCallback(true)就是不拦截，continuationCallback(false)拦截本次操作
+        public void ConfirmNavigationRequest(NavigationContext navigationContext, Action<bool> continuationCallback)
+        {
+            continuationCallback(true);
+        }
+
+
+        //接收导航传过来的参数
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            //查询表格数据
+            RequestData();
+        }
+
+        void GetManuNos()
+        {
+            Manunos = SqlSugarHelper.Db.Queryable<DrugManuNo>()
+                .WhereIF(SelectedDrug != null, (di) => di.DrugId.Equals(SelectedDrug.DrugId))
+                .Select(di => di)
+                .ToList();
+        }
+
+        void RequestData()
+        {
+            int totalCount = 0;
+            DrugInfos = SqlSugarHelper.Db.Queryable<DrugInfo>()
+                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugId"), (di) => di.DrugId.ToString().Contains(SearchValue))
+                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugName"), (di) => di.DrugName.Contains(SearchValue))
+                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("PyCode"), (di) => di.PyCode.Contains(SearchValue))
+                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugBarcode"), (di) => di.DrugBarcode.Contains(SearchValue))
+                .Select(di => di)
+                .ToPageList(PageNum, PageSize, ref totalCount)
+            ;
+            TotalCount = totalCount;
+            PageCount = (int)Math.Ceiling((double)TotalCount / PageSize);
+        }
+
+        //每次导航的时候，该实列用不用重新创建，true是不重新创建,false是重新创建
+        public bool IsNavigationTarget(NavigationContext navigationContext)
+        {
+            return true;
+        }
+
+        //这个方法用于拦截请求
+        public void OnNavigatedFrom(NavigationContext navigationContext)
+        {
+
+        }
+    }
+}
diff --git a/DM_Weight/ViewModels/EditUserDialogViewModel.cs b/DM_Weight/ViewModels/EditUserDialogViewModel.cs
new file mode 100644
index 0000000..55621d9
--- /dev/null
+++ b/DM_Weight/ViewModels/EditUserDialogViewModel.cs
@@ -0,0 +1,210 @@
+using Prism.Commands;
+using Prism.Events;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using DM_Weight.Finger;
+using DM_Weight.Models;
+using DM_Weight.msg;
+using DM_Weight.util;
+
+namespace DM_Weight.ViewModels
+{
+    public class EditUserDialogViewModel : BindableBase, IDialogAware, IRegionMemberLifetime
+    {
+
+        private readonly FingerprintUtil _fingerprintUtil;
+        IEventAggregator _eventAggregator;
+        public EditUserDialogViewModel(FingerprintUtil fingerprintUtil, IEventAggregator eventAggregator)
+        {
+            _fingerprintUtil = fingerprintUtil;
+            _eventAggregator = eventAggregator;
+        }
+
+        private UserList _userList = new UserList();
+
+        public UserList UserList
+        {
+            get => _userList;
+            set => SetProperty(ref _userList, value);
+        }
+
+        public List<RoleDm> Roles { get; set; }
+
+        private string _oldPass;
+        public string OldPass
+        {
+            get => _oldPass;
+            set
+            {
+                if (string.IsNullOrEmpty(value))
+                {
+                    throw new ArgumentException("请输入原密码");
+                }
+                if (!MD5.GetMD5Hash(value).ToLower().Equals(UserList.PassWord.ToLower()))
+                {
+                    throw new ArgumentException("旧密码错误");
+                }
+                SetProperty(ref _oldPass, value);
+            }
+        }
+        private string _newPass;
+        public string NewPass
+        {
+            get => _newPass; set
+            {
+                if (string.IsNullOrEmpty(value))
+                {
+                    throw new ArgumentNullException("请输入新密码");
+                }
+                SetProperty(ref _newPass, value);
+            }
+        }
+
+        private bool _onlyPassword = false;
+        private bool _editUser = true;
+        public bool OnlyPassword { get => _onlyPassword; set => SetProperty(ref _onlyPassword, value); }
+        public bool EditUser { get => _editUser; set => SetProperty(ref _editUser, value); }
+
+        public event Action<IDialogResult> RequestClose;
+
+
+
+        public bool KeepAlive => false;
+
+        private string _title = "编辑用户";
+
+        public string Title
+        {
+            get => _title;
+            set => SetProperty(ref _title, value);
+        }
+
+
+        public DelegateCommand SaveUser
+        {
+            get => new DelegateCommand(() =>
+            {
+                try
+                {
+
+                    // 修改密码
+                    if (OnlyPassword)
+                    {
+                        if (MD5.GetMD5Hash(OldPass).ToLower().Equals(UserList.PassWord.ToLower()))
+                        {
+                            // 旧密码输入正确
+                            UserList.PassWord = MD5.GetMD5Hash(NewPass);
+                            SqlSugarHelper.Db.Updateable<UserList>(UserList).UpdateColumns(u => new { u.PassWord }).ExecuteCommand();
+                            // 关闭当前窗口
+                            RequestClose?.Invoke(new DialogResult(ButtonResult.OK));
+                        }
+                        else
+                        {
+
+                        }
+                    }
+                    // 保存用户
+                    else
+                    {
+                        if (UserList.Id > 0)
+                        {
+                            // 更新
+                            // 没有写密码
+                            if (string.IsNullOrEmpty(NewPass))
+                            {
+                                SqlSugarHelper.Db.Updateable<UserList>(UserList).UpdateColumns(u => new { u.Nickname, u.UserName, u.UserBarcode, u.RoleId }).ExecuteCommand();
+                            }
+                            // 更改了密码
+                            else
+                            {
+                                UserList.PassWord = MD5.GetMD5Hash(NewPass);
+                                SqlSugarHelper.Db.Updateable<UserList>(UserList).UpdateColumns(u => new { u.Nickname, u.UserName, u.PassWord, u.UserBarcode, u.RoleId }).ExecuteCommand();
+                            }
+                        }
+                        else
+                        {
+                            UserList.PassWord = MD5.GetMD5Hash(NewPass);
+                            UserList.MachineId = ConfigurationManager.AppSettings["machineId"] ?? "DM1";
+                            // 插入
+                            SqlSugarHelper.Db.Insertable<UserList>(UserList).InsertColumns(u => new { u.Id, u.Nickname, u.UserName, u.PassWord, u.UserBarcode, u.RoleId, u.MachineId }).ExecuteCommand();
+                        }
+                        RequestClose?.Invoke(new DialogResult(ButtonResult.OK));
+                    }
+
+                }
+                catch (Exception ex)
+                {
+                    AlertMsg alertMsg = new AlertMsg
+                    {
+                        Message = $"保存用户信息异常{ex.Message}",
+                        Type = MsgType.ERROR,
+                    };
+                    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                }
+            });
+        }
+
+        void GetAllRole()
+        {
+            Roles = SqlSugarHelper.Db.Queryable<RoleDm>().Where(r => r.MachineId == (ConfigurationManager.AppSettings["machineId"] ?? "DM1")).OrderBy(r => r.Id).ToList();
+            RaisePropertyChanged("Roles");
+        }
+
+
+        public DelegateCommand CancelCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                // 关闭当前窗口
+                RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+            });
+        }
+
+
+        public bool CanCloseDialog()
+        {
+            return true;
+        }
+
+        public void OnDialogClosed()
+        {
+
+        }
+
+        public void OnDialogOpened(IDialogParameters parameters)
+        {
+
+            if (parameters.ContainsKey("EditPass"))
+            {
+
+                UserList = parameters.GetValue<UserList>("User");
+                OnlyPassword = parameters.GetValue<bool>("EditPass");
+                EditUser = false;
+                Title = "修改密码";
+            }
+            else
+            {
+                if (parameters.ContainsKey("User"))
+                {
+                    UserList = parameters.GetValue<UserList>("User");
+                }
+                if (UserList.Id == null)
+                {
+                    Title = "添加用户";
+                }
+                GetAllRole();
+            }
+
+
+        }
+
+    }
+}
diff --git a/DM_Weight/ViewModels/FingerprintDialogViewModel.cs b/DM_Weight/ViewModels/FingerprintDialogViewModel.cs
new file mode 100644
index 0000000..503f28d
--- /dev/null
+++ b/DM_Weight/ViewModels/FingerprintDialogViewModel.cs
@@ -0,0 +1,133 @@
+using log4net;
+using Prism.Commands;
+using Prism.Events;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using DM_Weight.Finger;
+using DM_Weight.Models;
+using DM_Weight.msg;
+using DM_Weight.Port;
+using DM_Weight.util;
+
+namespace DM_Weight.ViewModels
+{
+    public class FingerprintDialogViewModel : BindableBase, IDialogAware, IRegionMemberLifetime
+    {
+
+
+        private readonly ILog logger = LogManager.GetLogger(typeof(FingerprintDialogViewModel));
+
+        private FingerprintUtil _fingerprintUtil;
+        EventAggregator _eventAggregator;
+        public FingerprintDialogViewModel(FingerprintUtil fingerprintUtil, EventAggregator eventAggregator)
+        {
+            _fingerprintUtil = fingerprintUtil;
+            _eventAggregator = eventAggregator;
+        }
+
+        public UserList UserList { get; set; }
+
+        public Dictionary<string, int> FingerIndexs
+        {
+            get
+            {
+                Dictionary<string, int> l = new Dictionary<string, int>();
+                l.Add("左小拇指", 0);
+                l.Add("左无名指", 1);
+                l.Add("左中指", 2);
+                l.Add("左食指", 3);
+                l.Add("左大拇指", 4);
+                l.Add("右小拇指", 5);
+                l.Add("右无名指", 6);
+                l.Add("右中指", 7);
+                l.Add("右食指", 8);
+                l.Add("右大拇指", 9);
+                return l;
+            }
+        }
+
+        private int _fingerIndex = 0;
+
+        public event Action<IDialogResult> RequestClose;
+
+        public int FingerIndex
+        {
+            get => _fingerIndex;
+            set => SetProperty(ref _fingerIndex, value);
+        }
+
+        public bool KeepAlive => false;
+
+        private int _status = 0;
+
+        public int Status
+        {
+            get => _status;
+            set => SetProperty(ref _status, value);
+        }
+
+        public string Title => "录入指纹";
+
+
+        public DelegateCommand StartInsert
+        {
+            get => new DelegateCommand(() => {
+                Status = 1;
+                _fingerprintUtil.SaveUser(UserList);
+                _fingerprintUtil.SaveFingerprint(UserList.Id, FingerIndex);
+                RequestClose?.Invoke(new DialogResult(ButtonResult.OK));
+            }, () => Status == 0).ObservesProperty(() => Status);
+        }
+
+
+        public DelegateCommand CancelCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                // 关闭当前窗口
+                RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+            });
+        }
+
+        public bool CanCloseDialog()
+        {
+            return true;
+        }
+
+        public void OnDialogClosed()
+        {
+            _eventAggregator.GetEvent<FingerprintEvent>().Unsubscribe(RegEvent1);
+        }
+
+        public void OnDialogOpened(IDialogParameters parameters)
+        {
+            UserList = parameters.GetValue<UserList>("User");
+            _eventAggregator.GetEvent<FingerprintEvent>().Subscribe(RegEvent1);
+        }
+
+        void RegEvent1(FingerprintMsg msg)
+        {
+            logger.Info(msg.ToString()); ;
+            if (Status == 1)
+            {
+                if (msg.Message.Equals("INS_FINGER"))
+                {
+                    if (msg.Result)
+                    {
+                        Status = 0;
+                        // 关闭当前窗口
+                        RequestClose?.Invoke(new DialogResult(ButtonResult.OK));
+                    }
+                }
+            }
+            
+        }
+    }
+}
diff --git a/DM_Weight/ViewModels/HomeWindowViewModel.cs b/DM_Weight/ViewModels/HomeWindowViewModel.cs
new file mode 100644
index 0000000..6b35330
--- /dev/null
+++ b/DM_Weight/ViewModels/HomeWindowViewModel.cs
@@ -0,0 +1,316 @@
+using log4net;
+using Prism.Commands;
+using Prism.Events;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using DM_Weight.Models;
+using DM_Weight.Port;
+using DM_Weight.util;
+using DM_Weight.Views;
+using System.Timers;
+using Unity;
+using System.Windows.Threading;
+using Newtonsoft.Json.Linq;
+
+namespace DM_Weight.ViewModels
+{
+    public class HomeWindowViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime
+    {
+
+        private readonly ILog logger = LogManager.GetLogger(typeof(HomeWindowViewModel));
+        private readonly IDialogService _dialogService;
+        private UserList? _userList;
+        private UserList? _userList2;
+
+        private int loginMode = Convert.ToInt32(ConfigurationManager.AppSettings["loginMode"]?.ToString() ?? "1");
+        public bool MultiLogin
+        {
+            get => loginMode == 2;
+        }
+
+        private PremissionDm? _selectedMenu;
+
+        private PremissionDm? _selectedChildMenu;
+
+        private List<PremissionDm>? _premissionDmList;
+
+        public PremissionDm? SelectedChildMenu
+        {
+            get { return _selectedChildMenu; }
+            set
+            {
+                if (!_portUtil.Operate)
+                {
+                    if (value != null)
+                    {
+                        if (value.PremissionPath.Equals("TakeRecordWindow"))
+                        {
+                            //定义传参变量
+                            NavigationParameters keys = new NavigationParameters();
+
+                            //添加参数，键值对格式
+                            keys.Add("Type", 2);
+                            _regionManager.RequestNavigate("ContentRegion", "MachineRecordWindow", keys);
+                        }
+                        else if (value.PremissionPath.Equals("AddRecordWindow"))
+                        {
+                            //定义传参变量
+                            NavigationParameters keys = new NavigationParameters();
+
+                            //添加参数，键值对格式
+                            keys.Add("Type", 1);
+                            _regionManager.RequestNavigate("ContentRegion", "MachineRecordWindow", keys);
+                        }
+                        else if (value.PremissionPath.Equals("ReturnRecordWindow"))
+                        {
+                            //定义传参变量
+                            NavigationParameters keys = new NavigationParameters();
+
+                            //添加参数，键值对格式
+                            keys.Add("Type", 3);
+                            _regionManager.RequestNavigate("ContentRegion", "MachineRecordWindow", keys);
+                        }
+                        else if (value.PremissionPath.Equals("RetrunEmptyRecordWindow"))
+                        {
+                            //定义传参变量
+                            NavigationParameters keys = new NavigationParameters();
+
+                            //添加参数，键值对格式
+                            keys.Add("Type", 3);
+                            _regionManager.RequestNavigate("ContentRegion", value.PremissionPath, keys);
+                        }
+                        else if (value.PremissionPath.Equals("CheckRecordWindow"))
+                        {
+                            //定义传参变量
+                            NavigationParameters keys = new NavigationParameters();
+
+                            //添加参数，键值对格式
+                            keys.Add("Type", 4);
+                            _regionManager.RequestNavigate("ContentRegion", "MachineRecordWindow", keys);
+                        }
+                        else
+                        {
+                            _regionManager.RequestNavigate("ContentRegion", value.PremissionPath);
+                        }
+                    }
+                    SetProperty(ref _selectedChildMenu, value);
+                }
+            }
+        }
+
+        public PremissionDm? SelectedMenu
+        {
+            get { return _selectedMenu; }
+            set
+            {
+                if (value != null)
+                {
+                    if (value.PremissionName == "退出")
+                    {
+                        logger.Info($"用户【{Operator?.Nickname}】退出登录");
+                        Operator = null;
+                        Reviewer = null;
+                        _regionManager.RequestNavigate("MainRegion", "LoginWindow");
+                    }
+                    else
+                    {
+                        SelectedChildMenu = value.Children[0];
+                    }
+                }
+                SetProperty(ref _selectedMenu, value);
+            }
+        }
+
+        private DelegateCommand<ListBox> _selectionCommon;
+        public DelegateCommand<ListBox> SelectionCommon
+        {
+            get => _selectionCommon ?? (_selectionCommon = new DelegateCommand<ListBox>(SelectionMethod));
+        }
+        private void SelectionMethod(ListBox viewName)
+        {
+            SelectedMenu = viewName.SelectedItem as PremissionDm;
+            if (SelectedMenu.PremissionName == "退出")
+            {
+                logger.Info($"用户【{Operator?.Nickname}】退出登录");
+                Operator = null;
+                Reviewer = null;
+                _regionManager.RequestNavigate("MainRegion", "LoginWindow");
+            }
+            else
+            {
+                SelectedMenu.Children = SelectedMenu.Children;
+                SelectedChildMenu = SelectedMenu.Children[0];
+            }
+        }
+
+        public List<PremissionDm> PremissionDmList { get { return _premissionDmList; } set { SetProperty(ref _premissionDmList, value); } }
+
+        public UserList UserList { get { return _userList; } set { SetProperty(ref _userList, value); } }
+        public UserList UserList2 { get { return _userList2; } set { SetProperty(ref _userList2, value); } }
+
+        public static UserList? Operator;
+        public static UserList? Reviewer;
+
+        IRegionManager _regionManager;
+        IUnityContainer _container;
+
+        private bool _is16Drawer;
+        public bool Is16Drawer { get => _is16Drawer; set => SetProperty(ref _is16Drawer, value); }
+        public bool KeepAlive => false;
+        private PortUtil _portUtil;
+        public HomeWindowViewModel(IRegionManager iRegionManager, PortUtil portUtil, IDialogService dialogService, IUnityContainer container)
+        {
+            _portUtil = portUtil;
+            _regionManager = iRegionManager;
+            _dialogService = dialogService;
+            _container = container;
+        }
+
+        public DelegateCommand<string> OpenFingerDialog
+        {
+            get => new DelegateCommand<string>((string Type) =>
+            {
+                DialogParameters dialogParameters = new DialogParameters();
+                dialogParameters.Add("User", Type.Equals("Operator") ? Operator : Reviewer);
+                DialogServiceExtensions.ShowDialogHost(_dialogService, "FingerprintDialog", dialogParameters, DoDialogResult, "RootDialog");
+            });
+        }
+
+        public DelegateCommand OpenRecoverCommand
+        {
+            get => new DelegateCommand(async () =>
+            {
+                try
+                {
+                    _portUtil.WindowName = "HomeWindow";
+                    _portUtil.Operate = true;
+                    await _portUtil.OpenStorage();
+                    _portUtil.ResetData();
+
+                }
+                catch (Exception ex)
+                {
+                    logger.Info($"OpenRecoverCommand异常{ex.Message}");
+                }
+            });
+        }
+
+        public DelegateCommand<string> OpenEditPasswordDialog
+        {
+            get => new DelegateCommand<string>((string Type) =>
+            {
+                DialogParameters dialogParameters = new DialogParameters();
+                dialogParameters.Add("EditPass", true);
+                dialogParameters.Add("User", Type.Equals("Operator") ? Operator : Reviewer);
+                DialogServiceExtensions.ShowDialogHost(_dialogService, "EditUserDialog", dialogParameters, DoDialogResult, "RootDialog");
+            });
+        }
+        private void DoDialogResult(IDialogResult dialogResult)
+        {
+            // 委托   被动执行     被子窗口执行
+            // dialogResult  第一方面可以拿到任意参数   第二方面   可判断关闭状态
+            if (dialogResult.Result == ButtonResult.OK)
+            {
+
+            }
+        }
+        //交接班
+        public DelegateCommand ShiftsCommand
+        {
+            get => new DelegateCommand(ShiftsAction);
+
+        }
+        private void ShiftsAction()
+        {
+            _regionManager.RequestNavigate("ContentRegion", "ChangeShiftsWindow");
+        }
+
+        public void FindDrawerCount()
+        {
+            int count = SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrawerType != 3)
+                .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).GroupBy(cs => cs.DrawerNo).Select(cs => SqlFunc.AggregateCount(cs.DrawerNo)).Count();
+
+            Is16Drawer = count == 16;
+        }
+
+        //这个方法用于拦截请求,continuationCallback(true)就是不拦截，continuationCallback(false)拦截本次操作
+        public void ConfirmNavigationRequest(NavigationContext navigationContext, Action<bool> continuationCallback)
+        {
+            continuationCallback(true);
+        }
+
+        //接收导航传过来的参数
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            _portUtil.dateTime = DateTime.Now;
+
+            //取出user
+            UserList = navigationContext.Parameters.GetValue<UserList>("operator");
+            Operator = UserList;
+            logger.Info($"发药人【{Operator.Nickname}】登录");
+            if (navigationContext.Parameters.ContainsKey("reviewer"))
+            {
+                UserList2 = navigationContext.Parameters.GetValue<UserList>("reviewer");
+                Reviewer = UserList2;
+                logger.Info($"审核人【{Reviewer.Nickname}】登录");
+            }
+
+            List<PremissionDm> premissions = UserList.Role.Permissions;
+
+            //SqlSugarHelper.Db.SqlQueryable<PremissionDm>(sql)
+            //.ToTree(pd => pd.Children, pd => pd.ParentId, 0);
+            PremissionDmList = premissions;
+            SelectedMenu = premissions[0];
+            FindDrawerCount();
+
+            int autoExit = Convert.ToInt32(ConfigurationManager.AppSettings["autoExit"] ?? "0");
+            if (autoExit > 0)
+            {
+                Timer timer = new Timer();
+                timer.Interval = 1000;
+                timer.Elapsed += (sender, e) =>
+                {
+                    // 串口无人操作
+                    if (!_portUtil.Operate)
+                    {
+                        // 30秒内无人操作鼠标键盘
+                        if ((DateTime.Now - _portUtil.dateTime).TotalSeconds > autoExit && CheckComputerFreeState.GetLastInputTime() > autoExit)
+                        {
+                            logger.Info($"设备30秒内无人操作，用户【{Operator?.Nickname}】自动退出登录");
+                            Operator = null;
+                            Reviewer = null;
+                            Application.Current.Dispatcher.Invoke(() =>
+                            {
+                                _regionManager.RequestNavigate("MainRegion", "LoginWindow");
+                                timer.Stop();
+                            });
+                        }
+                    }
+                };
+                timer.Start();
+            }
+        }
+
+        //每次导航的时候，该实列用不用重新创建，true是不重新创建,false是重新创建
+        public bool IsNavigationTarget(NavigationContext navigationContext)
+        {
+            return true;
+        }
+
+        //这个方法用于拦截请求
+        public void OnNavigatedFrom(NavigationContext navigationContext)
+        {
+
+        }
+    }
+}
diff --git a/DM_Weight/ViewModels/InvoiceAddDialogViewModel.cs b/DM_Weight/ViewModels/InvoiceAddDialogViewModel.cs
new file mode 100644
index 0000000..c94b1c8
--- /dev/null
+++ b/DM_Weight/ViewModels/InvoiceAddDialogViewModel.cs
@@ -0,0 +1,355 @@
+using DM_Weight.Models;
+using DM_Weight.msg;
+using DM_Weight.Port;
+using DM_Weight.util;
+using DM_Weight.Views;
+using log4net;
+using Prism.Commands;
+using Prism.Events;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace DM_Weight.ViewModels
+{
+    public class InvoiceAddDialogViewModel : BindableBase, IDialogAware, IRegionMemberLifetime
+    {
+
+        private readonly ILog logger = LogManager.GetLogger(typeof(InvoiceAddDialogViewModel));
+        public string Title => "调拨加药";
+
+        public event Action<IDialogResult> RequestClose;
+
+        private static readonly DateTime Jan1st1970 = new DateTime
+   (1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+
+        private string WindowName = "InvoiceAddWindow";
+
+        private PortUtil _portUtil;
+        IEventAggregator _eventAggregator;
+
+        public InvoiceAddDialogViewModel(PortUtil portUtil, IEventAggregator eventAggregator)
+        {
+            _portUtil = portUtil;
+            _eventAggregator = eventAggregator;
+        }
+
+        void DoMyPrismEvent(DeviceMsg msg)
+        {
+
+            if (msg.WindowName.Equals(WindowName))
+            {
+                IGrouping<int, ChannelStock> grouping = enumerator.Current;
+                int DrawerNo = grouping.Key;
+                List<ChannelStock> channelStocks = grouping.ToList();
+
+                switch (msg.EventType)
+                {
+                    // 抽屉打开
+                    case EventType.DRAWEROPEN:
+
+
+                        if (Status == 1)
+                        {
+                            if (channelStocks[0].process == 1)
+                            {
+                                channelStocks.ForEach(it => it.process = 2);
+                            }
+                        }
+
+                        break;
+                    // 抽屉关闭
+                    case EventType.DRAWERCLOSE:
+                        if (Status == 1)
+                        {
+                            if (channelStocks[0].process == 2)
+                            {
+                                channelStocks.ForEach(it => it.process = 3);
+                            }
+                            if (enumerator.MoveNext())
+                            {
+                                OpenOneByOne();
+                            }
+                            // 已经全部取出
+                            else
+                            {
+                                Status = 3;
+                            }
+                        }
+                        break;
+                    // 数量变化
+                    case EventType.UPDATEQUANTITY:
+                        if (Status == 1)
+                        {
+
+                            logger.Info($"抽屉【{DrawerNo}】库位药品数量【{msg.Quantitys}】");
+                        }
+                        break;
+                    // 打开失败
+                    case EventType.OPENERROR:
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = msg.Message,
+                            Type = MsgType.ERROR,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        Status = 0;
+                        break;
+                }
+            }
+
+        }
+
+        private int _status = 0;
+
+        public int Status
+        {
+            get => _status; set => SetProperty(ref _status, value);
+        }
+        private Invoice? _invoic;
+
+
+        public Invoice? Invoice
+        {
+            get => _invoic;
+            set => SetProperty(ref _invoic, value);
+        }
+
+        private List<ChannelStock> _channelStocks;
+
+        public List<ChannelStock> ChannelStocks
+        {
+            get => _channelStocks;
+            set => SetProperty(ref _channelStocks, value);
+        }
+
+        private IEnumerable<IGrouping<int, ChannelStock>> enumerable;
+        private IEnumerator<IGrouping<int, ChannelStock>> enumerator;
+
+
+        public bool CanCloseDialog()
+        {
+            return Status == 0;
+        }
+
+        public void OnDialogClosed()
+        {
+            // 取消消息订阅
+            _eventAggregator.GetEvent<PortUtilEvent>().Unsubscribe(DoMyPrismEvent);
+        }
+
+        public void OnDialogOpened(IDialogParameters parameters)
+        {
+            _eventAggregator.GetEvent<PortUtilEvent>().Subscribe(DoMyPrismEvent);
+            List<ChannelStock> channelStocks = parameters.GetValue<List<ChannelStock>>("ChannelStocks");
+            Invoice o = parameters.GetValue<Invoice>("invoice");
+            Invoice = o;
+            ChannelStocks = channelStocks;
+            RequestData();
+        }
+
+        public void RequestData()
+        {
+            enumerable = ChannelStocks.GroupBy(cs => cs.DrawerNo, cs => cs);
+            enumerator = enumerable.GetEnumerator();
+        }
+
+        public DelegateCommand OpenDrawer
+        {
+            get => new DelegateCommand(() =>
+            {
+                if (Status == 0)
+                {
+                    enumerator.MoveNext();
+                    Status = 1;
+                    OpenOneByOne();
+                }
+
+            });
+        }
+
+        private async void OpenOneByOne()
+        {
+            IGrouping<int, ChannelStock> grouping = enumerator.Current;
+            int DrawerNo = grouping.Key;
+            List<ChannelStock> channelStocks = grouping.ToList();
+            channelStocks.ForEach(it => it.process = 1);
+            _portUtil.SpeakAsync("正在打开" + DrawerNo + "号抽屉");
+
+
+            if (_portUtil.DrawerNo != 0 && _portUtil.DrawerNo < 9 && DrawerNo > 8)
+            {
+                Thread.Sleep(50);
+            }
+            List<ChannelStock> singleChannels = channelStocks.FindAll(it => it.BoardType != 1);
+
+            _portUtil.WindowName = WindowName;
+            _portUtil.BoardType = singleChannels.Count > 0 ? singleChannels[0].BoardType : 1;
+            _portUtil.ColNos = singleChannels.Select(it => it.ColNo).ToArray();
+            _portUtil.Stocks = singleChannels.Select(it => it.Quantity).ToArray();
+            _portUtil.DrawerNo = DrawerNo;
+
+            if ((singleChannels.Count > 0 ? singleChannels[0].BoardType : 1) == 5)
+            {
+                // 发送加药数量
+                singleChannels.ForEach(it =>
+                {
+                    _portUtil.TakeQuantity(DrawerNo, it.ColNo, it.AddQuantity, it.Quantity + it.AddQuantity);
+                });
+            }
+
+            if ((singleChannels.Count > 0 ? singleChannels[0].BoardType : 1) == 6)
+            {
+                for (int i = 0; i < singleChannels.Count; i++)
+                {
+                    ChannelStock it = singleChannels[i];
+                    _portUtil.ClearCount(it.DrawerNo, it.ColNo);
+                    await Task.Delay(50);
+                }
+            }
+
+            _portUtil.Start();
+        }
+
+        private bool _isFinishClick = false;
+        // 完成按钮
+        public DelegateCommand TakeFinish
+        {
+            get => new DelegateCommand(async () =>
+            {
+                if (!_isFinishClick)
+                {
+                    _isFinishClick = true;
+                    List<ChannelStock> record = ChannelStocks.ToList();
+                    string InvoiceId = Invoice.InvoiceNo;
+                    var f = SqlSugarHelper.Db.UseTran(() =>
+                    {
+                        SqlSugarHelper.Db.Updateable(new InOutInvoice()
+                        {
+                            Status = 1,
+                            InvoiceNo = Invoice.InvoiceNo
+                        }).UpdateColumns(it => new { it.Status }).WhereColumns(it => new { it.InvoiceNo }).ExecuteCommand();
+
+                        for (int i = 0; i < record.Count; i++)
+                        {
+                            ChannelStock it = record[i];
+                            if (it.BoardType == 6 && it.PosNo == 0)
+                            {
+                                _portUtil.SetNumCount(it.DrawerNo, it.ColNo, it.AddQuantity);
+                            }
+                            // 更新数据 库存信息
+                            SqlSugarHelper.Db.Updateable(new ChannelStock()
+                            {
+                                Quantity = it.Quantity + it.AddQuantity,
+                                PosNo = 1,
+                                ManuNo = it.ManuNo,
+                                EffDate = it.EffDate,
+                                Id = it.Id,
+                            }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate, it.PosNo }).ExecuteCommand();
+                            // 获取更新完库存后的药品库存
+                            List<ChannelStock> nowChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                                .Where(cs => cs.MachineId.Equals(it.MachineId))
+                                .Where(cs => cs.DrugId.Equals(it.DrugId))
+                                .Where(cs => cs.DrawerType == 1)
+                                .ToList();
+
+                            // 保存数据 出/入库记录
+                            SqlSugarHelper.Db.Insertable(new MachineRecord()
+                            {
+                                MachineId = it.MachineId,
+                                DrawerNo = it.DrawerNo,
+                                ColNo = it.ColNo,
+                                DrugId = it.DrugId,
+                                ManuNo = it.ManuNo,
+                                EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
+                                Operator = HomeWindowViewModel.Operator?.Id,
+                                Reviewer = HomeWindowViewModel.Reviewer?.Id,
+                                OperationTime = DateTime.Now,
+                                Quantity = it.AddQuantity,
+                                Type = 1,
+                                InvoiceId = InvoiceId,
+                                StockQuantity = nowChannels.Sum(it => it.Quantity),
+                                ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity)
+                            }).ExecuteCommand();
+                        }
+                        return true;
+                    });
+                    if (f.Data)
+                    {
+                        // 更新屏显库存
+                        List<ChannelStock> singleChannels = record.FindAll(it => it.BoardType != 1);
+                        if ((singleChannels.Count > 0 ? singleChannels[0].BoardType : 1) == 5)
+                        {
+                            singleChannels.ForEach(it =>
+                            {
+                                _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.Quantity + it.AddQuantity);
+                            });
+                        }
+
+
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "操作完成，库存已更新",
+                            Type = MsgType.SUCCESS,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    }
+                    if (!f.IsSuccess)
+                    {
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "库存更新失败！",
+                            Type = MsgType.ERROR,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    }
+                    Status = 0;
+                    _isFinishClick = false;
+                    RequestClose?.Invoke(new DialogResult(ButtonResult.OK));
+
+                }
+
+            });
+        }
+
+        public long CurrentTimeMillis()
+        {
+            return (long)(DateTime.UtcNow - Jan1st1970).TotalMilliseconds;
+        }
+
+        // 取消按钮
+        public DelegateCommand CancleTake
+        {
+            get => new DelegateCommand(() =>
+            {
+                RequestData();
+                _portUtil.ResetData();
+                Status = 0;
+            });
+        }
+
+        public DelegateCommand BtnCloseCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                if (Status != 0)
+                {
+                    _portUtil.ResetData();
+                    Status = 0;
+                }
+                //DialogParameters parameters = new DialogParameters();
+                //parameters.Add("",);
+                // 关闭当前窗口
+                RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+            });
+        }
+
+        public bool KeepAlive => false;
+    }
+}
diff --git a/DM_Weight/ViewModels/InvoiceInWindowViewModel.cs b/DM_Weight/ViewModels/InvoiceInWindowViewModel.cs
new file mode 100644
index 0000000..277036f
--- /dev/null
+++ b/DM_Weight/ViewModels/InvoiceInWindowViewModel.cs
@@ -0,0 +1,384 @@
+using DM_Weight.Models;
+using DM_Weight.msg;
+using DM_Weight.select;
+using DM_Weight.util;
+using log4net;
+using Prism.Commands;
+using Prism.Events;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Configuration;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+using System.Windows.Markup;
+
+namespace DM_Weight.ViewModels
+{
+    public class InvoiceInWindowViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime
+    {
+
+        private readonly ILog logger = LogManager.GetLogger(typeof(InvoiceInWindowViewModel));
+        private int _pageNum = 1;
+        public int PageNum
+        {
+            get => _pageNum;
+            set
+            {
+                SetProperty(ref _pageNum, value);
+                RequestData();
+            }
+        }
+
+        private int _pageCount = 1;
+        public int PageCount
+        {
+            get => _pageCount;
+            set
+            {
+                SetProperty(ref _pageCount, value);
+            }
+        }
+
+        private int _pageSize = 8;
+        public int PageSize
+        {
+            get => _pageSize;
+            set
+            {
+                SetProperty(ref _pageSize, value);
+            }
+        }
+
+        private int _totalCount = 0;
+        public int TotalCount
+        {
+            get => _totalCount;
+            set
+            {
+                SetProperty(ref _totalCount, value);
+            }
+        }
+
+
+        IDialogService _dialogService;
+
+
+        IEventAggregator _eventAggregator;
+
+        private DelegateCommand _rowSelected;
+
+        public DelegateCommand RowSelected => _rowSelected ??= new DelegateCommand(GetChannelByInvoice);
+
+        public InvoiceInWindowViewModel(IDialogService DialogService, IEventAggregator eventAggregator)
+        {
+            _dialogService = DialogService;
+            _eventAggregator = eventAggregator;
+        }
+
+        public static List<OrderTakeSelect> StaticOrderTakeSelects = new()
+        {
+            new OrderTakeSelect
+            {
+                Code = "invoiceNo",
+                Name = "凭证单号"
+            }
+        };
+
+        private List<OrderTakeSelect> _orderTakeSelects = StaticOrderTakeSelects;
+
+        public List<OrderTakeSelect> OrderTakeSelects
+        {
+            get { return _orderTakeSelects; }
+            set
+            {
+                SetProperty(ref _orderTakeSelects, value);
+            }
+        }
+
+        private OrderTakeSelect _selectedItem = StaticOrderTakeSelects[0];
+        /// <summary>
+        /// 查询条件 查询字段
+        /// </summary>
+        public OrderTakeSelect SelectedItem
+        {
+            get { return _selectedItem; }
+            set
+            {
+                SetProperty(ref _selectedItem, value);
+                RequestData();
+            }
+        }
+
+        private Invoice? _selectedInvoice;
+
+        public Invoice? SelectedInvoice
+        {
+            get { return _selectedInvoice; }
+            set
+            {
+                SetProperty(ref _selectedInvoice, value);
+
+                //OpenOrderDialog();
+            }
+        }
+
+
+        private string _orderDate = DateTime.Now.ToString("yyyy-MM-dd");
+        /// <summary>
+        /// 查询条件  处方日期
+        /// </summary>
+        public string OrderDate
+        {
+            get { return _orderDate; }
+            set
+            {
+                if (!String.IsNullOrEmpty(value))
+                {
+                    SetProperty(ref _orderDate, DateTime.Parse(value).ToString("yyyy-MM-dd"));
+                }
+                else
+                {
+                    SetProperty(ref _orderDate, value);
+                }
+
+                RequestData();
+            }
+        }
+
+        private string? _searchValue;
+
+        /// <summary>
+        /// 查询条件 查询字段值
+        /// </summary>
+        public string? SearchValue
+        {
+            get { return _searchValue; }
+            set
+            {
+                SetProperty(ref _searchValue, value);
+                RequestData();
+            }
+        }
+
+        private List<Invoice> _invoices = new();
+
+        public List<Invoice> Invoices { get { return _invoices; } set { SetProperty(ref _invoices, value); } }
+
+
+        private List<InOutInvoice> _inOutInvoices = new();
+
+        public List<InOutInvoice> InOutInvoices { get { return _inOutInvoices; } set { SetProperty(ref _inOutInvoices, value); } }
+
+        public bool KeepAlive => false;
+
+        private List<ChannelStock> _channelStocks = new();
+
+        public List<ChannelStock> ChannelStocks { get { return _channelStocks; } set { SetProperty(ref _channelStocks, value); } }
+
+
+
+        private List<ChannelStock> _addChannels = new();
+
+        public List<ChannelStock> AddChannels { get { return _addChannels; } set { SetProperty(ref _addChannels, value); } }
+
+        public void GetChannelByInvoice()
+        {
+            ChannelStocks.Clear();
+            InOutInvoices.Clear();
+            List<ChannelStock> iChannelStockList = new List<ChannelStock>();
+            if (SelectedInvoice != null)
+            {
+                var invoices = SqlSugarHelper.Db.Queryable<InOutInvoice>()
+                                .Includes<DrugInfo>(i => i.DrugInfo)
+                                .InnerJoin(SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrawerType == 1).Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).GroupBy(cs => cs.DrugId), (i, t) => i.DrugId == t.DrugId)
+                                .Where(i => i.InvoiceNo == SelectedInvoice.InvoiceNo)
+                                .ToList();
+                foreach (var invoice in invoices)
+                {
+                    List<ChannelStock> q = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                    .Includes<DrugInfo>(cs => cs.DrugInfo)
+                    .WhereIF(!string.IsNullOrEmpty(invoice.DrugEffDate), cs => cs.EffDate.Equals(invoice.DrugEffDate))
+                    .WhereIF(!string.IsNullOrEmpty(invoice.DrugManuNo), cs => cs.ManuNo.Equals(invoice.DrugManuNo))
+                    .Where(cs => cs.DrugId == invoice.DrugId)
+                    .Where(cs => cs.DrawerType == 1)
+                    .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
+                    .OrderBy(cs => cs.DrugId)
+                    .OrderBy(cs => cs.DrawerNo)
+                    .OrderBy(cs => cs.ColNo)
+                    .ToList();
+
+
+                    
+
+                    for (int j = 0; j < q.Count;j++)
+                    {
+                        ChannelStock item = q[j];
+                        if(j == 0)
+                        {
+                            item.AddQuantity = invoice.quantity;
+                        }
+                        item.Invoice = invoice;
+                        iChannelStockList.Add(item);
+                    }
+                    InOutInvoice copy = TransExpV2<InOutInvoice, InOutInvoice>.Trans(invoice);
+                    InOutInvoices.Add(copy);
+                }
+            }
+            ICollectionView vw = CollectionViewSource.GetDefaultView(iChannelStockList);
+            vw.GroupDescriptions.Add(new PropertyGroupDescription("Invoice"));
+            ChannelStocks = iChannelStockList;
+
+        }
+
+        public DelegateCommand OpenInvoiceAdd
+        {
+            get => new DelegateCommand(() =>
+            {
+                bool flag = true;
+                for (int i = 0; i < InOutInvoices.Count; i++)
+                {
+                    InOutInvoice invoices = InOutInvoices[i];
+                    if (invoices.quantity != ChannelStocks.FindAll(it => it.DrugId == invoices.DrugId).Sum(it => it.AddQuantity))
+                    {
+                        flag = false;
+                        break;
+                    }
+                }
+                if (flag)
+                {
+                    AddChannels = ChannelStocks.FindAll(it => it.AddQuantity != 0);
+                    AddChannels.Sort((a, b) =>
+                    {
+                        if ((a.DrawerNo - b.DrawerNo) == 0)
+                        {
+                            return a.ColNo - b.ColNo;
+                        }
+                        return a.DrawerNo - b.DrawerNo;
+                    });
+                    OpenOrderDialog();
+                } else
+                {
+                    AlertMsg alertMsg = new AlertMsg
+                    {
+                        Message = "库位添加数量小于应添加数量",
+                        Type = MsgType.ERROR,
+                    };
+                    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                }
+            },() => SelectedInvoice !=null).ObservesProperty(() => SelectedInvoice);
+        }
+
+
+        public async void OpenOrderDialog()
+        {
+            if (SelectedInvoice != null && SelectedInvoice.Status == 0)
+            {
+                // 此处延时1毫秒，等待页面渲染
+                await Task.Delay(TimeSpan.FromMilliseconds(1));
+                DialogParameters dialogParameters = new DialogParameters();
+                dialogParameters.Add("invoice", SelectedInvoice);
+                dialogParameters.Add("ChannelStocks", AddChannels);
+                DialogServiceExtensions.ShowDialogHost(_dialogService, "InvoiceAddDialog", dialogParameters, DoDialogResult, "RootDialog");
+            }
+        }
+
+        public DelegateCommand QueryCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                RequestData();
+            });
+        }
+
+        private void DoDialogResult(IDialogResult dialogResult)
+        {
+            // 委托   被动执行     被子窗口执行
+            // dialogResult  第一方面可以拿到任意参数   第二方面   可判断关闭状态
+            //if (dialogResult.Result == ButtonResult.OK)
+            {
+                SelectedInvoice = null;
+                RequestData();
+            }
+            //MessageBox.Show("返回值：" + dialogResult.Result.ToString());
+        }
+
+
+        //这个方法用于拦截请求,continuationCallback(true)就是不拦截，continuationCallback(false)拦截本次操作
+        public void ConfirmNavigationRequest(NavigationContext navigationContext, Action<bool> continuationCallback)
+        {
+            continuationCallback(true);
+        }
+
+        public void RequestData()
+        {
+            Invoices.Clear();
+            int totalCount = 0;
+
+            var sb = new StringBuilder();
+            sb.Append("select i.invoice_no as InvoiceNo, i.invoice_date as InvoiceDate, COUNT(i.id) as `Count`, SUM(i.quantity) as quantity, p1.pharmacy_name as PharmacyName1, p2.pharmacy_name as PharmacyName2 from in_out_invoice i");
+            sb.Append(" inner join ( select c.drug_id as drug_id from channel_stock c where c.machine_id = '" + (ConfigurationManager.AppSettings["machineId"] ?? "DM1") + "' group by c.drug_id ) di on di.drug_id = i.drug_id");
+            sb.Append(" left join pharmacy_info p1 on p1.pharmacy_id = i.in_pharmacy_id");
+            sb.Append(" left join pharmacy_info p2 on p2.pharmacy_id = i.out_pharmacy_id");
+            sb.Append(" where i.status=@Status ");
+            sb.Append(" and i.type!=@type ");
+            sb.Append(" and i.cancel_flag=@CancelFlag ");
+            if (OrderDate != null)
+            {
+                sb.Append(" and i.invoice_date = @CreateTime ");
+            }
+            if (!String.IsNullOrEmpty(SearchValue))
+            {
+                sb.Append(" and i.invoice_no = @InvoiceNo ");
+            }
+            if (!String.IsNullOrEmpty(ConfigurationManager.AppSettings["storage"]))
+            {
+                sb.Append(" and i.in_pharmacy_id = @OutPharmacyId ");
+            }
+            sb.Append(" group by i.invoice_no");
+            sb.Append(" order by i.invoice_date ");
+            Invoices = SqlSugarHelper.Db.SqlQueryable<dynamic>(sb.ToString())
+                .AddParameters(new
+                {
+                    Status = 0,
+                    type = 2,
+                    CancelFlag = 0,
+                    CreateTime = OrderDate,
+                    InvoiceNo = SearchValue,
+                    OutPharmacyId = ConfigurationManager.AppSettings["storage"]
+                })
+                .Select(it => new Invoice())
+                .Select("*")
+                .ToPageList(PageNum, PageSize, ref totalCount);
+
+            TotalCount = totalCount;
+            PageCount = (int)Math.Ceiling((double)TotalCount / PageSize);
+        }
+
+
+        //接收导航传过来的参数  现在是在此处初始化了表格数据
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            RequestData();
+        }
+
+        //每次导航的时候，该实列用不用重新创建，true是不重新创建,false是重新创建
+        public bool IsNavigationTarget(NavigationContext navigationContext)
+        {
+            return true;
+        }
+
+        //这个方法用于拦截请求
+        public void OnNavigatedFrom(NavigationContext navigationContext)
+        {
+
+        }
+    }
+}
diff --git a/DM_Weight/ViewModels/InvoiceOutWindowViewModel.cs b/DM_Weight/ViewModels/InvoiceOutWindowViewModel.cs
new file mode 100644
index 0000000..5a8ad09
--- /dev/null
+++ b/DM_Weight/ViewModels/InvoiceOutWindowViewModel.cs
@@ -0,0 +1,270 @@
+using DM_Weight.Models;
+using DM_Weight.select;
+using DM_Weight.util;
+using Newtonsoft.Json;
+using Prism.Commands;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.ViewModels
+{
+    public class InvoiceOutWindowViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime
+    {
+
+        private int _pageNum = 1;
+        public int PageNum
+        {
+            get => _pageNum;
+            set
+            {
+                SetProperty(ref _pageNum, value);
+                RequestData();
+            }
+        }
+
+        private int _pageCount = 1;
+        public int PageCount
+        {
+            get => _pageCount;
+            set
+            {
+                SetProperty(ref _pageCount, value);
+            }
+        }
+
+        private int _pageSize = 8;
+        public int PageSize
+        {
+            get => _pageSize;
+            set
+            {
+                SetProperty(ref _pageSize, value);
+            }
+        }
+
+        private int _totalCount = 0;
+        public int TotalCount
+        {
+            get => _totalCount;
+            set
+            {
+                SetProperty(ref _totalCount, value);
+            }
+        }
+
+
+        IDialogService _dialogService;
+
+        private DelegateCommand _rowSelected;
+
+        public DelegateCommand RowSelected => _rowSelected ??= new DelegateCommand(OpenOrderDialog);
+
+        public InvoiceOutWindowViewModel(IDialogService DialogService)
+        {
+            _dialogService = DialogService;
+        }
+
+        public static List<OrderTakeSelect> StaticOrderTakeSelects = new()
+        {
+            new OrderTakeSelect
+            {
+                Code = "invoiceNo",
+                Name = "凭证单号"
+            }
+        };
+
+        private List<OrderTakeSelect> _orderTakeSelects = StaticOrderTakeSelects;
+
+        public List<OrderTakeSelect> OrderTakeSelects
+        {
+            get { return _orderTakeSelects; }
+            set
+            {
+                SetProperty(ref _orderTakeSelects, value);
+            }
+        }
+
+        private OrderTakeSelect _selectedItem = StaticOrderTakeSelects[0];
+        /// <summary>
+        /// 查询条件 查询字段
+        /// </summary>
+        public OrderTakeSelect SelectedItem
+        {
+            get { return _selectedItem; }
+            set
+            {
+                SetProperty(ref _selectedItem, value);
+                RequestData();
+            }
+        }
+
+        private Invoice? _selectedInvoice;
+
+        public Invoice? SelectedInvoice
+        {
+            get { return _selectedInvoice; }
+            set
+            {
+                SetProperty(ref _selectedInvoice, value);
+
+                //OpenOrderDialog();
+            }
+        }
+
+
+        private string _orderDate = DateTime.Now.ToString("yyyy-MM-dd");
+        /// <summary>
+        /// 查询条件  处方日期
+        /// </summary>
+        public string OrderDate
+        {
+            get { return _orderDate; }
+            set
+            {
+                if (!String.IsNullOrEmpty(value))
+                {
+                    SetProperty(ref _orderDate, DateTime.Parse(value).ToString("yyyy-MM-dd"));
+                }
+                else
+                {
+                    SetProperty(ref _orderDate, value);
+                }
+
+                RequestData();
+            }
+        }
+
+        private string? _searchValue;
+
+        /// <summary>
+        /// 查询条件 查询字段值
+        /// </summary>
+        public string? SearchValue
+        {
+            get { return _searchValue; }
+            set
+            {
+                SetProperty(ref _searchValue, value);
+                RequestData();
+            }
+        }
+
+        private List<Invoice> _invoices = new();
+
+        public List<Invoice> Invoices { get { return _invoices; } set { SetProperty(ref _invoices, value); } }
+
+        public bool KeepAlive => false;
+
+        public async void OpenOrderDialog()
+        {
+            if (SelectedInvoice != null && SelectedInvoice.Status == 0)
+            {
+                // 此处延时1毫秒，等待页面渲染
+                await Task.Delay(TimeSpan.FromMilliseconds(1));
+                DialogParameters dialogParameters = new DialogParameters();
+                dialogParameters.Add("invoice", SelectedInvoice);
+                DialogServiceExtensions.ShowDialogHost(_dialogService, "InvoiceTakeDialog", dialogParameters, DoDialogResult, "RootDialog");
+                RequestData();
+            }
+        }
+
+        public DelegateCommand QueryCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                RequestData();
+            });
+        }
+
+        private void DoDialogResult(IDialogResult dialogResult)
+        {
+            // 委托   被动执行     被子窗口执行
+            // dialogResult  第一方面可以拿到任意参数   第二方面   可判断关闭状态
+            //if (dialogResult.Result == ButtonResult.OK)
+            {
+                SelectedInvoice = null;
+                RequestData();
+            }
+            //MessageBox.Show("返回值：" + dialogResult.Result.ToString());
+        }
+
+
+        //这个方法用于拦截请求,continuationCallback(true)就是不拦截，continuationCallback(false)拦截本次操作
+        public void ConfirmNavigationRequest(NavigationContext navigationContext, Action<bool> continuationCallback)
+        {
+            continuationCallback(true);
+        }
+
+        public void RequestData()
+        {
+            Invoices.Clear();
+            int totalCount = 0;
+
+            var sb = new StringBuilder();
+            sb.Append("select i.invoice_no as InvoiceNo, i.invoice_date as InvoiceDate, COUNT(i.id) as `Count`, SUM(i.quantity) as quantity, p1.pharmacy_name as PharmacyName1, p2.pharmacy_name as PharmacyName2 from in_out_invoice i");
+            sb.Append(" inner join ( select c.drug_id as drug_id from channel_stock c where c.machine_id = '" + (ConfigurationManager.AppSettings["machineId"] ?? "DM1") + "' group by c.drug_id ) di on di.drug_id = i.drug_id");
+            sb.Append(" left join pharmacy_info p1 on p1.pharmacy_id = i.in_pharmacy_id");
+            sb.Append(" left join pharmacy_info p2 on p2.pharmacy_id = i.out_pharmacy_id");
+            sb.Append(" where i.status=@Status ");
+            sb.Append(" and i.type!=@type ");
+            sb.Append(" and i.cancel_flag=@CancelFlag ");
+            if (OrderDate != null)
+            {
+                sb.Append(" and i.invoice_date = @CreateTime ");
+            }
+            if (!String.IsNullOrEmpty(SearchValue))
+            {
+                sb.Append(" and i.invoice_no = @InvoiceNo ");
+            }
+            if (!String.IsNullOrEmpty(ConfigurationManager.AppSettings["storage"]))
+            {
+                sb.Append(" and i.out_pharmacy_id = @OutPharmacyId ");
+            }
+            sb.Append(" group by i.invoice_no");
+            sb.Append(" order by i.invoice_date ");
+            Invoices = SqlSugarHelper.Db.SqlQueryable<dynamic>(sb.ToString())
+                .AddParameters(new
+                {
+                    Status = 0,
+                    type = 1,
+                    CancelFlag = 0,
+                    CreateTime = OrderDate,
+                    InvoiceNo = SearchValue,
+                    OutPharmacyId = ConfigurationManager.AppSettings["storage"]
+                })
+                .Select(it => new Invoice())
+                .Select("*")
+                .ToPageList(PageNum, PageSize, ref totalCount);
+            
+            TotalCount = totalCount;
+            PageCount = (int)Math.Ceiling((double)TotalCount / PageSize);
+        }
+
+
+        //接收导航传过来的参数  现在是在此处初始化了表格数据
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            RequestData();
+        }
+
+        //每次导航的时候，该实列用不用重新创建，true是不重新创建,false是重新创建
+        public bool IsNavigationTarget(NavigationContext navigationContext)
+        {
+            return true;
+        }
+
+        //这个方法用于拦截请求
+        public void OnNavigatedFrom(NavigationContext navigationContext)
+        {
+
+        }
+    }
+}
diff --git a/DM_Weight/ViewModels/InvoiceTakeDialogViewModel.cs b/DM_Weight/ViewModels/InvoiceTakeDialogViewModel.cs
new file mode 100644
index 0000000..696ecfd
--- /dev/null
+++ b/DM_Weight/ViewModels/InvoiceTakeDialogViewModel.cs
@@ -0,0 +1,424 @@
+using log4net;
+using Microsoft.Xaml.Behaviors;
+using NetTaste;
+using Prism.Commands;
+using Prism.Events;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Speech.Synthesis;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using DM_Weight.Models;
+using DM_Weight.msg;
+using DM_Weight.Port;
+using DM_Weight.select;
+using DM_Weight.util;
+using System.Threading;
+
+namespace DM_Weight.ViewModels
+{
+    public class InvoiceTakeDialogViewModel : BindableBase, IDialogAware, IRegionMemberLifetime
+    {
+        private readonly ILog logger = LogManager.GetLogger(typeof(InvoiceTakeDialogViewModel));
+        public string Title => "调拨出库";
+
+
+        public event Action<IDialogResult> RequestClose;
+
+        private static readonly DateTime Jan1st1970 = new DateTime
+   (1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+
+        private PortUtil _portUtil;
+        IEventAggregator _eventAggregator;
+        IDialogService _dialogService;
+
+        public InvoiceTakeDialogViewModel(PortUtil portUtil, IEventAggregator eventAggregator, IDialogService DialogService)
+        {
+            _dialogService = DialogService;
+            _portUtil = portUtil;
+            _eventAggregator = eventAggregator;
+        }
+
+        void DoMyPrismEvent(DeviceMsg msg)
+        {
+
+            if (msg.WindowName == "InvoiceTakeDrugWindow")
+            {
+                IGrouping<int, ChannelStock> grouping = enumerator.Current;
+                int DrawerNo = grouping.Key;
+                List<ChannelStock> channelStocks = grouping.ToList();
+
+                switch (msg.EventType)
+                {
+                    // 抽屉打开
+                    case EventType.DRAWEROPEN:
+
+                        
+                        if (Status == 1)
+                        {
+                            if (channelStocks[0].process == 1)
+                            {
+                                channelStocks.ForEach(it => it.process = 2);
+                            }
+                        }
+
+                        break;
+                    // 抽屉关闭
+                    case EventType.DRAWERCLOSE:
+                        if (Status == 1)
+                        {
+                            if (channelStocks[0].process == 2)
+                            {
+                                channelStocks.ForEach(it => it.process = 3);
+                            }
+                            if (enumerator.MoveNext())
+                            {
+                                OpenOneByOne();
+                            }
+                            // 已经全部取出
+                            else
+                            {
+                                Status = 3;
+                            }
+                        }
+                        break;
+                    // 数量变化
+                    case EventType.UPDATEQUANTITY:
+                        if (Status == 1)
+                        {
+                            logger.Info($"抽屉【{DrawerNo}】库位取药数量【{msg.Quantitys}】");
+                        }
+                        break;
+                    // 打开失败
+                    case EventType.OPENERROR:
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = msg.Message,
+                            Type = MsgType.ERROR,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        Status = 0;
+                        break;
+                }
+            }
+
+        }
+
+        private int _status = 0;
+
+        public int Status
+        {
+            get => _status; set => SetProperty(ref _status, value);
+        }
+
+        private Invoice? _invoic;
+
+
+        public Invoice? Invoice
+        {
+            get => _invoic;
+            set => SetProperty(ref _invoic, value);
+        }
+
+        private List<InOutInvoice> invoices { get; set; }
+
+        private List<ChannelStock> _channelStocks;
+
+        public List<ChannelStock> ChannelStocks
+        {
+            get => _channelStocks;
+            set => SetProperty(ref _channelStocks, value);
+        }
+        
+        private IEnumerable<IGrouping<int, ChannelStock>> enumerable;
+        private IEnumerator<IGrouping<int, ChannelStock>> enumerator;
+
+
+        public bool CanCloseDialog()
+        {
+            return Status == 0;
+        }
+
+        public void OnDialogClosed()
+        {
+            // 取消消息订阅
+            _eventAggregator.GetEvent<PortUtilEvent>().Unsubscribe(DoMyPrismEvent);
+        }
+
+        public void OnDialogOpened(IDialogParameters parameters)
+        {
+            _eventAggregator.GetEvent<PortUtilEvent>().Subscribe(DoMyPrismEvent);
+            Invoice o = parameters.GetValue<Invoice>("invoice");
+            Invoice = o;
+            RequestData();
+        }
+
+        public void RequestData()
+        {
+            invoices = SqlSugarHelper.Db.Queryable<InOutInvoice>()
+                .Includes<DrugInfo>(i => i.DrugInfo)
+                .InnerJoin(SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrawerType == 1).Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).GroupBy(cs =>cs.DrugId),(i,t) => i.DrugId == t.DrugId)
+                .Where(i => i.InvoiceNo == Invoice.InvoiceNo)
+                .ToList();
+
+            List<ChannelStock> channelStocks = new List<ChannelStock>();
+            List<string> msg = new List<string>();
+            for (int i = 0; i < invoices.Count; i++)
+            {
+                InOutInvoice invoice = invoices[i];
+
+                List<ChannelStock> HasQChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                    .Includes<DrugInfo>(cs => cs.DrugInfo)
+                    .Where(cs => cs.Quantity > 0)
+                    .Where(cs => cs.DrawerType == 1)
+                    .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
+                    .WhereIF(!string.IsNullOrEmpty(invoice.DrugEffDate), cs => cs.EffDate.Equals(invoice.DrugEffDate))
+                    .WhereIF(!string.IsNullOrEmpty(invoice.DrugManuNo), cs => cs.ManuNo.Equals(invoice.DrugManuNo))
+                    .Where(cs => cs.DrugId == invoice.DrugId)
+                    .OrderBy(cs => cs.EffDate)
+                    .ToList();
+                int total = HasQChannels.Sum(it => it.Quantity);
+                int TakeQ = invoice.quantity;
+                // 说明数量足够
+                if (total >= TakeQ)
+                {
+                    for (int j = 0; TakeQ > 0; j++)
+                    {
+                        ChannelStock stock = HasQChannels[j];
+                        if (TakeQ > stock.Quantity)
+                        {
+                            stock.TakeQuantity = stock.Quantity;
+                            channelStocks.Add(stock);
+                            TakeQ -= stock.Quantity;
+                        }
+                        else
+                        {
+                            stock.TakeQuantity = TakeQ;
+                            channelStocks.Add(stock);
+                            TakeQ = 0;
+                        }
+                    }
+                }
+                else
+                {
+                    msg.Add($"药品【{invoice.DrugInfo.DrugName}】库存不足，应取【{TakeQ}】库存【{total}】");
+                }
+            }
+            if(msg.Count > 0)
+            {
+                RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+                //MessageBox.Show(string.Join("\n", msg));
+                DialogParameters dialogParameters = new DialogParameters();
+                dialogParameters.Add("msgInfo", msg);
+                DialogServiceExtensions.ShowDialogHost(_dialogService, "ShowMessageDialog", dialogParameters, "RootDialog");
+
+            }
+            else
+            {
+                channelStocks.Sort((a, b) =>
+                {
+                    if ((a.DrawerNo - b.DrawerNo) == 0)
+                    {
+                        return a.ColNo - b.ColNo;
+                    }
+                    return a.DrawerNo - b.DrawerNo;
+                });
+                ChannelStocks = channelStocks;
+
+
+            }
+        }
+
+        public DelegateCommand OpenDrawer
+        {
+            get => new DelegateCommand(async () =>
+            {
+                if (Status == 0)
+                {
+                    enumerable = ChannelStocks.GroupBy(cs => cs.DrawerNo, cs => cs);
+                    enumerator = enumerable.GetEnumerator();
+                    enumerator.MoveNext();
+                    Status = 1;
+                    OpenOneByOne();
+                }
+                
+            });
+        }
+
+        private void OpenOneByOne()
+        {
+            IGrouping<int, ChannelStock> grouping = enumerator.Current;
+            int DrawerNo = grouping.Key;
+            List<ChannelStock> channelStocks = grouping.ToList();
+            channelStocks.ForEach(it => it.process = 1);
+            _portUtil.SpeakAsync("正在打开" + DrawerNo + "号抽屉");
+
+
+            List<ChannelStock> singleChannels = channelStocks.FindAll(it => it.BoardType != 1);
+
+            // 发送取药数量
+            singleChannels.ForEach(it =>
+            {
+                _portUtil.TakeQuantity(DrawerNo, it.ColNo, it.TakeQuantity, it.Quantity - it.TakeQuantity);
+            });
+
+            if (_portUtil.DrawerNo != 0 && _portUtil.DrawerNo < 9 && DrawerNo > 8)
+            {
+                Thread.Sleep(50);
+            }
+            _portUtil.WindowName = "InvoiceTakeDrugWindow";
+            _portUtil.BoardType = singleChannels.Count > 0 ? singleChannels[0].BoardType : 1;
+            _portUtil.ColNos = singleChannels.Select(it => it.ColNo).ToArray();
+            _portUtil.Stocks = singleChannels.Select(it => it.Quantity).ToArray();
+            _portUtil.DrawerNo = DrawerNo;
+            _portUtil.Start();
+        }
+
+        private bool _isFinishClick = false;
+        // 完成按钮
+        public DelegateCommand TakeFinish
+        {
+            get => new DelegateCommand(() =>
+            {
+                if (!_isFinishClick)
+                {
+                    _isFinishClick = true;
+                    List<ChannelStock> record = ChannelStocks.FindAll(it => it.TakeQuantity > 0).ToList();
+                    if (record.Count > 0)
+                    {
+                        string InvoiceId = Invoice.InvoiceNo;
+                        var f = SqlSugarHelper.Db.UseTran(() =>
+                        {
+                            SqlSugarHelper.Db.Updateable(new InOutInvoice()
+                            {
+                                Status = 1,
+                                InvoiceNo = Invoice.InvoiceNo
+                            }).UpdateColumns(it => new { it.Status }).WhereColumns(it => new { it.InvoiceNo }).ExecuteCommand();
+
+                            for (int i = 0; i < record.Count; i++)
+                            {
+                                ChannelStock it = record[i];
+                                // 更新数据 库存信息
+                                SqlSugarHelper.Db.Updateable(new ChannelStock()
+                                {
+                                    Quantity = it.Quantity - it.TakeQuantity,
+                                    ManuNo = it.ManuNo,
+                                    EffDate = it.EffDate,
+                                    Id = it.Id,
+                                }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate }).ExecuteCommand();
+                                // 获取更新完库存后的药品库存
+                                List<ChannelStock> nowChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                                    .Where(cs => cs.MachineId.Equals(it.MachineId))
+                                    .Where(cs => cs.DrugId.Equals(it.DrugId))
+                                    .Where(cs => cs.DrawerType == 1)
+                                    .ToList();
+
+                                // 保存数据 出库记录
+                                SqlSugarHelper.Db.Insertable(new MachineRecord()
+                                {
+                                    MachineId = it.MachineId,
+                                    DrawerNo = it.DrawerNo,
+                                    ColNo = it.ColNo,
+                                    DrugId = it.DrugId,
+                                    ManuNo = it.ManuNo,
+                                    EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
+                                    Operator = HomeWindowViewModel.Operator?.Id,
+                                    Reviewer = HomeWindowViewModel.Reviewer?.Id,
+                                    OperationTime = DateTime.Now,
+                                    Quantity = it.TakeQuantity,
+                                    Type = 2,
+                                    InvoiceId = InvoiceId,
+                                    StockQuantity = nowChannels.Sum(it => it.Quantity),
+                                    ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity)
+                                }).ExecuteCommand();
+                            }
+                            return true;
+                        });
+                        if (f.Data)
+                        {
+                            // 更新屏显库存
+                            List<ChannelStock> singleChannels = record.FindAll(it => it.BoardType != 1);
+                            if ((singleChannels.Count > 0 ? singleChannels[0].BoardType : 1) == 5)
+                            {
+                                singleChannels.ForEach(it =>
+                                {
+                                    _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.Quantity - it.TakeQuantity);
+                                });
+                            }
+                            AlertMsg alertMsg = new AlertMsg
+                            {
+                                Message = "调拨取药完成，库存已更新",
+                                Type = MsgType.SUCCESS,
+                            };
+                            _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        }
+                        if (!f.IsSuccess)
+                        {
+                            AlertMsg alertMsg = new AlertMsg
+                            {
+                                Message = "调拨取药完成，库存更新失败！",
+                                Type = MsgType.ERROR,
+                            };
+                            _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        }
+                        Status = 0;
+                        _isFinishClick = false;
+                        RequestClose?.Invoke(new DialogResult(ButtonResult.OK));
+                    }
+                    else
+                    {
+                        _isFinishClick = false;
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "没有填写取药数量",
+                            Type = MsgType.ERROR
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    }
+
+                }
+
+            });
+        }
+
+        public long CurrentTimeMillis()
+        {
+            return (long)(DateTime.UtcNow - Jan1st1970).TotalMilliseconds;
+        }
+
+        // 取消按钮
+        public DelegateCommand CancleTake
+        {
+            get => new DelegateCommand(() =>
+            {
+                _portUtil.ResetData();
+                Status = 0;
+            });
+        }
+
+        public DelegateCommand BtnCloseCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                if (Status != 0)
+                {
+                    _portUtil.ResetData();
+                    Status = 0;
+                }
+                //DialogParameters parameters = new DialogParameters();
+                //parameters.Add("",);
+                // 关闭当前窗口
+                RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+            });
+        }
+
+        public bool KeepAlive => false;
+    }
+}
diff --git a/DM_Weight/ViewModels/LoginWindowViewModel.cs b/DM_Weight/ViewModels/LoginWindowViewModel.cs
new file mode 100644
index 0000000..7c40d56
--- /dev/null
+++ b/DM_Weight/ViewModels/LoginWindowViewModel.cs
@@ -0,0 +1,396 @@
+using log4net;
+using log4net.Core;
+using log4net.Repository.Hierarchy;
+using Prism.Commands;
+using Prism.Events;
+using Prism.Ioc;
+using Prism.Mvvm;
+using Prism.Regions;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using DM_Weight.Finger;
+using DM_Weight.Models;
+using DM_Weight.msg;
+using DM_Weight.Port;
+using DM_Weight.util;
+using DM_Weight.Views;
+using System.Collections.ObjectModel;
+using Microsoft.Win32;
+using System.Xml;
+using System.Diagnostics;
+using System.Threading;
+using SQLitePCL;
+
+namespace DM_Weight.ViewModels
+{
+    public class LoginWindowViewModel : BindableBase, IRegionMemberLifetime, IConfirmNavigationRequest
+    {
+        private readonly ILog logger = LogManager.GetLogger(typeof(LoginWindowViewModel));
+
+        private string username;
+        private string password;
+
+        private Boolean _loginBtnEnable = true;
+
+        IRegionManager _regionManager;
+        IEventAggregator _eventAggregator;
+
+        private int loginMode = Convert.ToInt32(ConfigurationManager.AppSettings["loginMode"]?.ToString() ?? "1");
+        private string firstLogin = ConfigurationManager.AppSettings["firstLogin"]?.ToString() ?? "operator";
+
+        public bool SingleLogin
+        {
+            get => ReadAppSetting("loginMode") == "1";
+            //get => loginMode == 1;
+        }
+        public bool MultiLogin
+        {
+            //get => loginMode == 2;
+            get => ReadAppSetting("loginMode") == "2";
+        }
+        private FingerprintUtil _fingerprintUtil;
+
+        private PortUtil _portUtil;
+
+        public Boolean LoginBtnEnable { get { return _loginBtnEnable; } set { SetProperty(ref _loginBtnEnable, value); } }
+        public string Password { get { return password; } set { SetProperty(ref password, value); } }
+
+        public string Username { get { return username; } set { SetProperty(ref username, value); } }
+
+        private UserList _operator;
+        public UserList Operator { get => _operator; set { SetProperty(ref _operator, value); } }
+
+        private UserList _reviewer;
+        public UserList Reviewer { get => _reviewer; set { SetProperty(ref _reviewer, value); } }
+
+        public bool DrawerPortMsg
+        {
+            get => !_portUtil.drawerSerial.IsOpen;
+        }
+        public bool CanBusPortMsg
+        {
+            get => _portUtil._canBusExsit && !_portUtil.canBusSerial.IsOpen;
+        }
+
+        private bool _fingerMsg;
+
+        public bool FingerMsg
+        {
+            get => _fingerMsg;
+            set => SetProperty(ref _fingerMsg, value);
+        }
+        //public LoginWindowViewModel(IRegionManager regionManager, IEventAggregator eventAggregator, PortUtil portUtil, FingerprintUtil fingerprintUtil)
+        //{
+        //    _fingerprintUtil = fingerprintUtil;
+        //    _portUtil = portUtil;
+        //    _regionManager = regionManager;
+        //    _eventAggregator = eventAggregator;
+        //}
+        public LoginWindowViewModel(IRegionManager regionManager, IEventAggregator eventAggregator, PortUtil portUtil)
+        {
+            //_fingerprintUtil = fingerprintUtil;
+            _portUtil = portUtil;
+            _regionManager = regionManager;
+            _eventAggregator = eventAggregator;
+        }
+        private DelegateCommand? _loginCommand;
+
+        private DelegateCommand? _exitCommand;
+
+        public DelegateCommand LoginCommand =>
+_loginCommand ??= new DelegateCommand(Login);
+
+        public DelegateCommand ExitCommand =>
+_exitCommand ??= new DelegateCommand(Exit);
+
+        public bool KeepAlive => false;
+
+        void Login()
+        {
+            LoginBtnEnable = false;
+            if (!string.IsNullOrEmpty(Username) && !string.IsNullOrEmpty(Password))
+            {
+                if (Username.Equals("hkcadmin") && Password.Equals("hkc123"))
+                {
+                    ObservableCollection<PremissionDm> defaultAll = RoleManagerWindowViewModel.defaultAll;
+                    PremissionDm[] a = new PremissionDm[defaultAll.Count];
+                    Array.Copy(defaultAll.ToArray(), 0, a, 0, defaultAll.Count);
+                    a[4].Children.Add(new PremissionDm()
+                    {
+                        Id = 54,
+                        PremissionName = "调试页面",
+                        PremissionPath = "DebugWindow",
+                    });
+                    //添加参数，键值对格式
+                    keys.Add("operator", new UserList()
+                    {
+                        UserName = Username,
+                        Nickname = "华康测试账号",
+                        Id = 9999,
+                        Role = new RoleDm()
+                        {
+                            Id = 9999,
+                            RoleName = "hkcadmin",
+                            Permissions = a.ToList()
+                        },
+                    });
+                    _regionManager.RequestNavigate("MainRegion", "HomeWindow", keys);
+                }
+                else
+                {
+                    //UserList userList = SqlSugarHelper.Db.Queryable<UserList>()
+
+                    //                    .Includes<RoleDm>(u => u.Role)
+                    //                    .First(u => u.UserName == username && ConfigurationManager.AppSettings["machineId"].ToString().Equals(u.MachineId));
+
+                    UserList userList = SqlSugarHelper.Db.Queryable<UserList>()
+                                        .Includes<RoleDm>(u => u.Role)
+                                       .InnerJoin<RoleDm>((u, r) => u.RoleId == r.Id)
+                                       .First(u => u.UserName == username && ConfigurationManager.AppSettings["machineId"].ToString().Equals(u.MachineId));
+
+                    if (userList == null)
+                    {
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "无此用户",
+                            Type = MsgType.ERROR
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        Username = "";
+                        Password = "";
+                    }
+                    else if (userList.Role == null)
+                    {
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "用户还未设置权限，请联系管理员",
+                            Type = MsgType.ERROR
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        Username = "";
+                        Password = "";
+                    }
+                    else
+                    {
+                        if (userList.PassWord == MD5.GetMD5Hash(Password))
+                        {
+                            SetUser(userList);
+                        }
+                        else
+                        {
+                            AlertMsg alertMsg = new AlertMsg
+                            {
+                                Message = "密码错误",
+                                Type = MsgType.ERROR
+                            };
+                            _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                            Password = "";
+                        }
+                    }
+                }
+            }
+            else
+            {
+                AlertMsg alertMsg = new AlertMsg
+                {
+                    Message = "请输入账号或密码",
+                    Type = MsgType.ERROR
+                };
+                _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+            }
+            LoginBtnEnable = true;
+        }
+
+        private NavigationParameters keys = new NavigationParameters();
+
+        async void SetUser(UserList user)
+        {
+            // 单人登录模式
+            if (SingleLogin)
+            {
+                App.CurrentFaUserList = user;
+                //添加参数，键值对格式
+                keys.Add("operator", user);
+                //_regionManager.RequestNavigate("MainRegion", "HomeWindow", keys);
+                await System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() =>
+                {
+                    _regionManager.RequestNavigate("MainRegion", "HomeWindow", keys);
+                }));
+            }
+            // 双人登录模式
+            else
+            {
+                // 如果已经录入了发药人，已经有一个用户登录
+                if (keys.ContainsKey("operator"))
+                {
+                    if (keys.GetValue<UserList>("operator").Id != user.Id)
+                    {
+                        keys.Add("reviewer", user);
+                        Reviewer = user;
+                        //RaisePropertyChanged("Reviewer");
+                        App.CurrentShenUserList = user;
+                        //_regionManager.RequestNavigate("MainRegion", "HomeWindow", keys);
+                        await System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() =>
+                        {
+                            _regionManager.RequestNavigate("MainRegion", "HomeWindow", keys);
+                        }));
+                    }
+                    else
+                    {
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "该发药人账号已登录，请输入不同账号",
+                            Type = MsgType.ERROR
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    }
+                }
+                // 如果已经录入了审核人， 已经有一个用户登录
+                else if (keys.ContainsKey("reviewer"))
+                {
+                    if (keys.GetValue<UserList>("reviewer").Id != user.Id)
+                    {
+                        keys.Add("operator", user);
+                        Operator = user;
+                        //RaisePropertyChanged("Operator");
+                        App.CurrentFaUserList = user;
+                        _regionManager.RequestNavigate("MainRegion", "HomeWindow", keys);
+                        await System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() =>
+                          {
+                              _regionManager.RequestNavigate("MainRegion", "HomeWindow", keys);
+                          }));
+
+                    }
+                    else
+                    {
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "该审核人账号已登录，请输入不同账号",
+                            Type = MsgType.ERROR
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    }
+                }
+                // 第一个用户登录
+                else
+                {
+                    if (firstLogin.Equals("operator"))
+                    {
+                        keys.Add("operator", user);
+                        Operator = user;
+                        //RaisePropertyChanged("Operator");
+                        App.CurrentFaUserList = user;
+                    }
+                    else
+                    {
+                        keys.Add("reviewer", user);
+                        Reviewer = user;
+                        //RaisePropertyChanged("Reviewer");
+                        App.CurrentShenUserList = user;
+                    }
+                    Username = string.Empty;
+                    Password = string.Empty;
+                }
+            }
+        }
+
+        void Exit()
+        {
+            Process.GetCurrentProcess().Kill();
+            //System.Diagnostics.Process tt = System.Diagnostics.Process.GetProcessById(System.Diagnostics.Process.GetCurrentProcess().Id); 
+            //tt.Kill();
+            Environment.Exit(0);
+        }
+
+        void LoginEvent(FingerprintMsg msg)
+        {
+            logger.Info(msg.ToString());
+            if (msg.Message.Equals("CONNECT"))
+            {
+                FingerMsg = !msg.Result;
+            }
+            if (LoginBtnEnable)
+            {
+                if (msg.Message.Equals("LOGIN"))
+                {
+                    UserList userList = SqlSugarHelper.Db.Queryable<UserList>()
+
+                    .Includes<RoleDm>(u => u.Role)
+                    .First(u => u.Id == msg.Id);
+
+                    if (userList == null)
+                    {
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "无此用户",
+                            Type = MsgType.ERROR
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        Username = "";
+                        Password = "";
+                    }
+                    else if (userList.Role == null)
+                    {
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "用户还未设置权限，请联系管理员",
+                            Type = MsgType.ERROR
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        Username = "";
+                        Password = "";
+                    }
+                    else
+                    {
+                        SetUser(userList);
+                    }
+                }
+            }
+
+        }
+
+        //这个方法用于拦截请求,continuationCallback(true)就是不拦截，continuationCallback(false)拦截本次操作
+        public void ConfirmNavigationRequest(NavigationContext navigationContext, Action<bool> continuationCallback)
+        {
+
+            continuationCallback(true);
+        }
+
+
+        //接收导航传过来的参数  现在是在此处初始化了表格数据
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            FingerMsg = false;// !_fingerprintUtil.bIsConnected;
+            _eventAggregator.GetEvent<FingerprintEvent>().Subscribe(LoginEvent);
+        }
+
+
+        //每次导航的时候，该实列用不用重新创建，true是不重新创建,false是重新创建
+        public bool IsNavigationTarget(NavigationContext navigationContext)
+        {
+            return true;
+        }
+
+        //这个方法用于拦截请求
+        public void OnNavigatedFrom(NavigationContext navigationContext)
+        {
+            _eventAggregator.GetEvent<FingerprintEvent>().Unsubscribe(LoginEvent);
+        }
+        //手动实现调用配置的逻辑 规避修改配置文件后不起作用的问题
+        public string ReadAppSetting(string key)
+        {
+            string xPath = $"/configuration/appSettings//add[@key='{key}']";
+            XmlDocument doc = new XmlDocument();
+            string exeFileName = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
+            doc.Load(exeFileName + ".dll.config");
+            XmlNode node = doc.SelectSingleNode(xPath);
+            return node.Attributes["value"].Value.ToString();
+        }
+    }
+}
diff --git a/DM_Weight/ViewModels/MachineRecordWindowViewModel.cs b/DM_Weight/ViewModels/MachineRecordWindowViewModel.cs
new file mode 100644
index 0000000..90ae0fe
--- /dev/null
+++ b/DM_Weight/ViewModels/MachineRecordWindowViewModel.cs
@@ -0,0 +1,302 @@
+using Prism.Commands;
+using Prism.Mvvm;
+using Prism.Regions;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using DM_Weight.Models;
+using DM_Weight.Port;
+using DM_Weight.Report;
+using DM_Weight.util;
+using gregn6Lib;
+using Newtonsoft.Json;
+using System.IO;
+using System.Configuration;
+using System.Reflection.PortableExecutable;
+using DM_Weight.msg;
+using Prism.Events;
+
+namespace DM_Weight.ViewModels
+{
+    public class MachineRecordWindowViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime
+    {
+        public static MachineRecordWindowViewModel vm;
+        IEventAggregator _eventAggregator;
+        private int _pageNum = 1;
+        public int PageNum
+        {
+            get => _pageNum;
+            set
+            {
+                SetProperty(ref _pageNum, value);
+                RequestData();
+            }
+        }
+
+        private int _pageCount = 1;
+        public int PageCount
+        {
+            get => _pageCount;
+            set
+            {
+                SetProperty(ref _pageCount, value);
+            }
+        }
+
+        private int _pageSize = 8;
+        public int PageSize
+        {
+            get => _pageSize;
+            set
+            {
+                SetProperty(ref _pageSize, value);
+            }
+        }
+
+        private int _totalCount = 0;
+        public int TotalCount
+        {
+            get => _totalCount;
+            set
+            {
+                SetProperty(ref _totalCount, value);
+            }
+        }
+        private DateTime? _startDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);
+
+        public DateTime? StartDate
+        {
+            get => _startDate;
+            set
+            {
+                if (value != null)
+                {
+                    SetProperty(ref _startDate, new DateTime(value?.Year ?? 0, value?.Month ?? 0, value?.Day ?? 0));
+                }
+                else
+                {
+                    SetProperty(ref _startDate, value);
+                }
+                RequestData();
+            }
+        }
+
+        private DateTime? _endDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59);
+
+        public DateTime? EndDate
+        {
+            get => _endDate;
+            set
+            {
+                if (value != null)
+                {
+                    TimeSpan ershisi = new TimeSpan(23, 59, 59);
+                    SetProperty(ref _endDate, new DateTime(value?.Year ?? 0, value?.Month ?? 0, value?.Day ?? 0, 23, 59, 59));
+                }
+                else
+                {
+                    SetProperty(ref _endDate, value);
+                }
+
+                RequestData();
+            }
+        }
+
+        private int _type;
+
+        public int Type
+        {
+            get { return _type; }
+            set
+            {
+                SetProperty(ref _type, value);
+            }
+        }
+        private DrugInfo? _drugInfo;
+
+        public DrugInfo? DrugInfo
+        {
+            get => _drugInfo;
+            set
+            {
+                SetProperty(ref _drugInfo, value);
+                RequestData();
+            }
+        }
+
+        private List<DrugInfo>? _drugInfos;
+
+        public List<DrugInfo>? DrugInfos
+        {
+            get => _drugInfos;
+            set => SetProperty(ref _drugInfos, value);
+        }
+        private List<MachineRecord>? machineRecords;
+
+        public List<MachineRecord>? MachineRecords
+        {
+            get { return machineRecords; }
+            set { SetProperty(ref machineRecords, value); }
+        }
+        public MachineRecordWindowViewModel(IEventAggregator eventAggregator)
+        {
+            vm = this;
+            _eventAggregator = eventAggregator;
+        }
+
+        public bool KeepAlive => false;
+
+
+        public DelegateCommand Query
+        {
+            get => new DelegateCommand(() =>
+            {
+                RequestData();
+            });
+        }
+
+        public DelegateCommand Download
+        {
+            get => new DelegateCommand(() =>
+            {
+                GridReportUtil.PrintReportMechineRecord(Type, StartDate, EndDate);
+
+            });
+        }
+        public DelegateCommand DownloadAccountBook
+        {
+            get => new DelegateCommand(() =>
+            {
+                GridReportUtil.PrintReportAccountBook(StartDate, EndDate);
+
+            });
+        }
+
+        public DelegateCommand SaveCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                //保存修改的凭证号
+                UpdatPZHSave();
+            });
+        }
+        private void UpdatPZHSave()
+        {
+            var f = SqlSugarHelper.Db.UseTran(() =>
+            {
+                for (int i = 0; i < MachineRecords.Count; i++)
+                {
+                    // 更新数据 库存信息
+                    SqlSugarHelper.Db.Updateable(new MachineRecord()
+                    {
+                        Id = MachineRecords[i].Id,
+                        InvoiceId = MachineRecords[i].InvoiceId
+                    }).UpdateColumns(it => new { it.InvoiceId }).WhereColumns(it => new { it.Id }).ExecuteCommand();
+                }
+                return true;
+            });
+            if (f.Data)
+            {
+                AlertMsg alertMsg = new AlertMsg
+                {
+                    Message = "保存成功",
+                    Type = MsgType.SUCCESS
+                };
+            _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+            }
+            if (!f.IsSuccess)
+            {
+                AlertMsg alertMsg = new AlertMsg
+                {
+                    Message = "操作失败！",
+                    Type = MsgType.ERROR,
+                };
+                _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+            }
+        }
+        void ReportInitialize()
+        {
+
+        }
+
+        //这个方法用于拦截请求,continuationCallback(true)就是不拦截，continuationCallback(false)拦截本次操作
+        public void ConfirmNavigationRequest(NavigationContext navigationContext, Action<bool> continuationCallback)
+        {
+            continuationCallback(true);
+        }
+
+
+        //接收导航传过来的参数
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            //取出Type决定页面显示内容
+            Type = navigationContext.Parameters.GetValue<int>("Type");
+
+            //查询表格数据
+            RequestData();
+            GetAllDrugInfos();
+        }
+
+
+
+        void RequestData()
+        {
+            int totalCount = 0;
+            string machineId = ConfigurationManager.AppSettings["machineId"] ?? "DM1";
+            MachineRecords = SqlSugarHelper.Db.Queryable<MachineRecord>()
+                .Includes<DrugInfo>(mr => mr.DrugInfo)
+                .Includes<UserList>(mr => mr.User)
+                .Where(mr => mr.MachineId == machineId)
+                .WhereIF(Type == 3, (mr) => new int[] { 31, 32 }.Contains(mr.Type))
+                .WhereIF(Type != 3, (mr) => mr.Type == Type)
+                .WhereIF(StartDate != null, (mr) => mr.OperationTime > StartDate)
+                .WhereIF(EndDate != null, (mr) => mr.OperationTime < EndDate)
+                .WhereIF(DrugInfo != null, (mr) => mr.DrugId == DrugInfo.DrugId)
+                //.Select(mr => mr)
+                .ToPageList(PageNum, PageSize, ref totalCount);
+            //.ToList();
+            TotalCount = totalCount;
+        }
+
+        //每次导航的时候，该实列用不用重新创建，true是不重新创建,false是重新创建
+        public bool IsNavigationTarget(NavigationContext navigationContext)
+        {
+            return true;
+        }
+
+        //这个方法用于拦截请求
+        public void OnNavigatedFrom(NavigationContext navigationContext)
+        {
+
+        }
+
+        private void GetAllDrugInfos()
+        {
+            string str = "SELECT d.drug_id,d.py_code,d.drug_barcode,d.drug_name,d.drug_brand_name,d.drug_spec,d.dosage,d.pack_unit,d.manufactory,d.max_stock,CONCAT(drug_name,'  ',drug_spec)as drug_name_spec FROM `drug_info` d";
+            DrugInfos = SqlSugarHelper.Db.SqlQueryable<DrugInfo>(str).OrderBy(di => di.DrugName).OrderBy(di => di.DrugId).ToList();
+        }
+
+        public void UpdateComboBoxItems(string text)
+        {
+            string str = @"SELECT d.drug_id,d.py_code,d.drug_barcode,d.drug_name,d.drug_brand_name,d.drug_spec,d.dosage,d.pack_unit,
+                        d.manufactory,d.max_stock,CONCAT(drug_name,'  ',drug_spec)as drug_name_spec FROM `drug_info` d";
+            if (string.IsNullOrEmpty(text))
+            {
+                DrugInfos = SqlSugarHelper.Db.SqlQueryable<DrugInfo>(str).OrderBy(di => di.DrugName).OrderBy(di => di.DrugId).ToList();
+                return;
+            }
+            if (DrugInfos != null)
+            {
+                DrugInfos.Clear();
+            }
+
+            DrugInfos = SqlSugarHelper.Db.SqlQueryable<DrugInfo>(str).Where(di => di.DrugName.Contains(text) || di.PyCode.Contains(text) || di.DrugId.Contains(text)).OrderBy(di => di.DrugName).OrderBy(di => di.DrugId).ToList();
+
+        }
+    }
+}
diff --git a/DM_Weight/ViewModels/MainWindowViewModel.cs b/DM_Weight/ViewModels/MainWindowViewModel.cs
new file mode 100644
index 0000000..a706190
--- /dev/null
+++ b/DM_Weight/ViewModels/MainWindowViewModel.cs
@@ -0,0 +1,119 @@
+using MaterialDesignThemes.Wpf;
+using Prism.Commands;
+using Prism.Events;
+using Prism.Mvvm;
+using Prism.Regions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media;
+using DM_Weight.msg;
+using DM_Weight.Port;
+using DM_Weight.util;
+using DM_Weight.Finger;
+using DM_Weight.Views;
+using Unity;
+using DM_Weight.Models;
+using System.Runtime.CompilerServices;
+
+namespace DM_Weight.ViewModels
+{
+    internal class MainWindowViewModel : BindableBase
+    {
+        private string _title = "Prism App";   //标题
+
+        private ISnackbarMessageQueue _snackbarMessageQueue = new SnackbarMessageQueue(TimeSpan.FromSeconds(3));
+
+        private SolidColorBrush _colorBrush;
+
+
+        //private PortUtil _portUtil;
+
+        private ScreenUtil _screenUtil;
+
+        public SolidColorBrush Background
+        {
+            get => _colorBrush;
+            set => SetProperty(ref _colorBrush, value);
+        }
+
+        public ISnackbarMessageQueue SnackbarMessageQueue
+        {
+            get => _snackbarMessageQueue;
+            set => SetProperty(ref _snackbarMessageQueue, value);
+        }
+        public string Title
+        {
+            get { return _title; }
+            set { SetProperty(ref _title, value); }
+        }
+
+
+        IEventAggregator eventAggregator;
+
+
+        //public MainWindowViewModel(IEventAggregator eventAggregator, PortUtil portUtil, ScreenUtil screenUtil)
+        //{
+        //    _portUtil = portUtil;
+        //    this.eventAggregator = eventAggregator;
+        //    this.eventAggregator.GetEvent<SnackbarEvent>().Subscribe(doMyPrismEvent2);
+        //    _screenUtil = screenUtil;
+        //}
+        private FingerprintUtil _fingerprintUtil;
+        IRegionManager _regionManager;
+        IUnityContainer _container;
+        PortUtil _portUtil;
+        private List<ChannelStock> _channelStocks = new List<ChannelStock>();
+        public MainWindowViewModel(IRegionManager regionManager, IUnityContainer container, IEventAggregator eventAggregator, FingerprintUtil fingerprintUtil, ScreenUtil screenUtil, PortUtil portUtil)
+        {
+            //_portUtil = portUtil;
+            this.eventAggregator = eventAggregator;
+            this.eventAggregator.GetEvent<SnackbarEvent>().Subscribe(doMyPrismEvent2);
+            _screenUtil = screenUtil;
+            _fingerprintUtil = fingerprintUtil;
+            _regionManager = regionManager;
+            _container = container;
+            _portUtil = portUtil;   
+
+            Task.Factory.StartNew(()=>BindStock()); ;       
+
+            System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() =>
+            {
+
+                _container.RegisterType<object, LoginWindow>("LoginWindow");
+                _regionManager.RequestNavigate("MainRegion", "LoginWindow");
+
+            }));
+        }
+
+        void doMyPrismEvent2(AlertMsg msg)
+        {
+            switch (msg.Type)
+            {
+                case MsgType.INFO:
+                    this.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#00e676"));
+                    break;
+                case MsgType.ERROR:
+                    this.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
+                    break;
+                default:
+                    this.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#00e676"));
+                    break;
+            }
+            SnackbarMessageQueue.Enqueue(msg.Message);
+        }
+        //写标签数量
+        async Task BindStock()
+        {
+            List<ChannelStock> singleChannels = SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.BoardType == 5).Where(cs => cs.DrugId !=null).ToList();
+            
+            for (int i = 0; i < singleChannels.Count; i++)
+            {
+                _portUtil.WriteQuantity(singleChannels[i].DrawerNo, singleChannels[i].ColNo, singleChannels[i].Quantity);
+                await Task.Delay(TimeSpan.FromMilliseconds(20));
+            }
+        }
+    }
+}
diff --git a/DM_Weight/ViewModels/OrderReturnDialogViewModel.cs b/DM_Weight/ViewModels/OrderReturnDialogViewModel.cs
new file mode 100644
index 0000000..3c02360
--- /dev/null
+++ b/DM_Weight/ViewModels/OrderReturnDialogViewModel.cs
@@ -0,0 +1,406 @@
+using log4net;
+using log4net.Repository.Hierarchy;
+using Microsoft.Xaml.Behaviors;
+using NetTaste;
+using Prism.Commands;
+using Prism.Events;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Speech.Synthesis;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using DM_Weight.Models;
+using DM_Weight.msg;
+using DM_Weight.Port;
+using DM_Weight.select;
+using DM_Weight.util;
+
+namespace DM_Weight.ViewModels
+{
+    public class OrderReturnDialogViewModel : BindableBase, IDialogAware, IRegionMemberLifetime
+    {
+        private readonly ILog logger = LogManager.GetLogger(typeof(OrderReturnDialogViewModel));
+        public string Title => "处方退药";
+
+        public event Action<IDialogResult> RequestClose;
+
+        private static readonly DateTime Jan1st1970 = new DateTime
+   (1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+
+        private PortUtil _portUtil;
+        IEventAggregator _eventAggregator;
+        IDialogService _dialogService;
+        public OrderReturnDialogViewModel(PortUtil portUtil, IEventAggregator eventAggregator, IDialogService DialogService)
+        {
+            _dialogService = DialogService;
+            _portUtil = portUtil;
+            _eventAggregator = eventAggregator;
+        }
+
+        void DoMyPrismEvent(DeviceMsg msg)
+        {
+
+            if (msg.WindowName == "ReturnDrug1Window")
+            {
+                IGrouping<int, ChannelStock> grouping = enumerator.Current;
+                int DrawerNo = grouping.Key;
+                List<ChannelStock> channelStocks = grouping.ToList();
+
+                switch (msg.EventType)
+                {
+                    // 抽屉打开
+                    case EventType.DRAWEROPEN:
+
+
+                        if (Status == 1)
+                        {
+                            if (channelStocks[0].process == 1)
+                            {
+                                channelStocks.ForEach(it => it.process = 2);
+                            }
+                        }
+
+                        break;
+                    // 抽屉关闭
+                    case EventType.DRAWERCLOSE:
+                        if (Status == 1)
+                        {
+                            if (channelStocks[0].process == 2)
+                            {
+                                channelStocks.ForEach(it => it.process = 3);
+                            }
+                            if (enumerator.MoveNext())
+                            {
+                                OpenOneByOne();
+                            }
+                            // 已经全部取出
+                            else
+                            {
+                                Status = 3;
+                            }
+                        }
+                        break;
+                    // 数量变化
+                    case EventType.UPDATEQUANTITY:
+                        if (Status == 1)
+                        {
+                            logger.Info($"抽屉【{DrawerNo}】库位取药数量【{msg.Quantitys}】");
+                            //channelStocks.ForEach(it => it.ReturnQuantity = msg.Quantitys[it.ColNo - 1]);
+                        }
+                        break;
+                    // 打开失败
+                    case EventType.OPENERROR:
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = msg.Message,
+                            Type = MsgType.ERROR,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        Status = 0;
+                        break;
+                }
+            }
+
+        }
+
+        private int _status = 0;
+
+        public int Status
+        {
+            get => _status; set => SetProperty(ref _status, value);
+        }
+
+        private OrderInfo? _orderInfo;
+
+
+        public OrderInfo? OrderInfo
+        {
+            get => _orderInfo;
+            set => SetProperty(ref _orderInfo, value);
+        }
+
+        private List<OrderDetail> orderDetails { get; set; }
+
+        private List<ChannelStock> _channelStocks;
+
+        public List<ChannelStock> ChannelStocks
+        {
+            get => _channelStocks;
+            set => SetProperty(ref _channelStocks, value);
+        }
+
+        private IEnumerable<IGrouping<int, ChannelStock>> enumerable;
+        private IEnumerator<IGrouping<int, ChannelStock>> enumerator;
+
+
+        public bool CanCloseDialog()
+        {
+            return Status == 0;
+        }
+
+        public void OnDialogClosed()
+        {
+            // 取消消息订阅
+            _eventAggregator.GetEvent<PortUtilEvent>().Unsubscribe(DoMyPrismEvent);
+        }
+
+        public void OnDialogOpened(IDialogParameters parameters)
+        {
+            _eventAggregator.GetEvent<PortUtilEvent>().Subscribe(DoMyPrismEvent);
+            OrderInfo o = parameters.GetValue<OrderInfo>("orderInfo");
+            OrderInfo = o;
+            RequestData();
+        }
+
+        public void RequestData()
+        {
+            orderDetails = SqlSugarHelper.Db.Queryable<OrderDetail>()
+                .Includes<DrugInfo>(od => od.DrugInfo)
+                .InnerJoin(SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrawerType == 1).Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).GroupBy(cs => cs.DrugId), (od, t) => od.DrugId == t.DrugId)
+                .Where(od => od.OrderNo == OrderInfo.OrderNo)
+                .ToList();
+
+            List<ChannelStock> channelStocks = new List<ChannelStock>();
+            List<string> msg = new List<string>();
+            for (int i = 0; i < orderDetails.Count; i++)
+            {
+                OrderDetail orderDetail = orderDetails[i];
+
+                List<ChannelStock> HasQChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                    .Includes<DrugInfo>(cs => cs.DrugInfo)
+                    .Where(cs => cs.DrawerType == 1)
+                    .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
+                    .WhereIF(!string.IsNullOrEmpty(orderDetail.SetEffDate), cs => cs.EffDate.Equals(orderDetail.SetEffDate))
+                    .WhereIF(!string.IsNullOrEmpty(orderDetail.SetManuNo), cs => cs.ManuNo.Equals(orderDetail.SetManuNo))
+                    .Where(cs => cs.DrugId == orderDetail.DrugId)
+                    .OrderBy(cs => cs.EffDate)
+                    .ToList();
+
+                // 有库位
+                if (HasQChannels.Count > 0)
+                {
+                    ChannelStock singleChannel = HasQChannels.Find(it => (it.BoardType == 2 && (25 - it.Quantity >= orderDetail.Quantity)));
+                    ChannelStock otherChannel = HasQChannels.Find(it => it.BoardType != 2);
+                    if ((singleChannel ?? otherChannel) != null)
+                    {
+                        //(singleChannel ?? otherChannel).TakeQuantity = orderDetail.Quantity;
+                        (singleChannel ?? otherChannel).ReturnQuantity = orderDetail.Quantity;
+                        channelStocks.Add(singleChannel ?? otherChannel);
+                    }
+                    else
+                    {
+                        msg.Add($"药品【{orderDetail.DrugInfo.DrugName}】现有库位不足以放置药品");
+                    }
+
+                }
+                else
+                {
+                    msg.Add($"药品【{orderDetail.DrugInfo.DrugName}】无库位");
+                }
+            }
+            if (msg.Count > 0)
+            {
+                RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+                //MessageBox.Show(string.Join("\n", msg));
+                DialogParameters dialogParameters = new DialogParameters();
+                dialogParameters.Add("msgInfo", msg);
+                DialogServiceExtensions.ShowDialogHost(_dialogService, "ShowMessageDialog", dialogParameters, "RootDialog");
+
+            }
+            else
+            {
+                channelStocks.Sort((a, b) =>
+                {
+                    if ((a.DrawerNo - b.DrawerNo) == 0)
+                    {
+                        return a.ColNo - b.ColNo;
+                    }
+                    return a.DrawerNo - b.DrawerNo;
+                });
+                ChannelStocks = channelStocks;
+
+
+            }
+        }
+
+        public DelegateCommand OpenDrawer
+        {
+            get => new DelegateCommand(async () =>
+            {
+                if (Status == 0)
+                {
+                    enumerable = ChannelStocks.GroupBy(cs => cs.DrawerNo, cs => cs);
+                    enumerator = enumerable.GetEnumerator();
+                    enumerator.MoveNext();
+                    Status = 1;
+                    OpenOneByOne();
+                }
+
+            });
+        }
+
+        private void OpenOneByOne()
+        {
+            IGrouping<int, ChannelStock> grouping = enumerator.Current;
+            int DrawerNo = grouping.Key;
+            List<ChannelStock> channelStocks = grouping.ToList();
+            channelStocks.ForEach(it => it.process = 1);
+            _portUtil.SpeakAsync("正在打开" + DrawerNo + "号抽屉");
+
+
+            List<ChannelStock> singleChannels = channelStocks.FindAll(it => it.BoardType != 1);
+
+            // 发送还药数量
+            singleChannels.ForEach(it =>
+            {
+                _portUtil.TakeQuantity(DrawerNo, it.ColNo, it.TakeQuantity, it.Quantity + it.TakeQuantity);
+            });
+
+            _portUtil.WindowName = "ReturnDrug1Window";
+            _portUtil.BoardType = singleChannels.Count > 0 ? singleChannels[0].BoardType : 1;
+            _portUtil.ColNos = singleChannels.Select(it => it.ColNo).ToArray();
+            _portUtil.DrawerNo = DrawerNo;
+            _portUtil.Start();
+        }
+
+        private bool _isFinishClick = false;
+        // 完成按钮
+        public DelegateCommand TakeFinish
+        {
+            get => new DelegateCommand(() =>
+            {
+                if (!_isFinishClick)
+                {
+                    _isFinishClick = true;
+                    //List<ChannelStock> record = ChannelStocks.FindAll(it => it.TakeQuantity > 0).ToList
+                    List<ChannelStock> record = ChannelStocks.ToList();
+                    //if (record.Count > 0)
+                    //{
+                    string InvoiceId = OrderInfo.OrderNo;
+                    var f = SqlSugarHelper.Db.UseTran(() =>
+                    {
+                        SqlSugarHelper.Db.Updateable(new OrderInfo()
+                        {
+                            DmStatus = 2,
+                            OrderNo = OrderInfo.OrderNo
+                        }).UpdateColumns(it => new { it.DmStatus }).WhereColumns(it => new { it.OrderNo }).ExecuteCommand();
+                        for (int i = 0; i < record.Count; i++)
+                        {
+                            ChannelStock it = record[i];
+                            // 更新数据 库存信息
+                            SqlSugarHelper.Db.Updateable(new ChannelStock()
+                            {
+                                //Quantity = it.Quantity + it.TakeQuantity,
+                                Quantity = it.Quantity + it.ReturnQuantity,
+                                ManuNo = it.ManuNo,
+                                EffDate = it.EffDate,
+                                Id = it.Id,
+                            }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate }).ExecuteCommand();
+                            // 获取更新完库存后的药品库存
+                            List<ChannelStock> nowChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                                .Where(cs => cs.MachineId.Equals(it.MachineId))
+                                .Where(cs => cs.DrugId.Equals(it.DrugId))
+                                .Where(cs => cs.DrawerType == 1)
+                                .ToList();
+
+                            // 保存数据 还药记录
+                            SqlSugarHelper.Db.Insertable(new MachineRecord()
+                            {
+                                MachineId = it.MachineId,
+                                DrawerNo = it.DrawerNo,
+                                ColNo = it.ColNo,
+                                DrugId = it.DrugId,
+                                ManuNo = it.ManuNo,
+                                EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
+                                Operator = HomeWindowViewModel.Operator?.Id,
+                                Reviewer = HomeWindowViewModel.Reviewer?.Id,
+                                OperationTime = DateTime.Now,
+                                //Quantity = it.TakeQuantity,
+                                Quantity = it.ReturnQuantity,
+                                Type = 31,
+                                InvoiceId = InvoiceId,
+                                StockQuantity = nowChannels.Sum(it => it.Quantity),
+                                ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity)
+                            }).ExecuteCommand();
+                        }
+                        return true;
+                    });
+                    if (f.Data)
+                    {
+                        // 更新屏显库存
+                        List<ChannelStock> singleChannels = record.FindAll(it => it.BoardType != 1);
+                        if ((singleChannels.Count > 0 ? singleChannels[0].BoardType : 1) == 5)
+                        {
+                            singleChannels.ForEach(it =>
+                            {
+                                _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.Quantity + it.TakeQuantity);
+                            });
+                        }
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "处方退药完成，库存已更新",
+                            Type = MsgType.SUCCESS,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    }
+                    Status = 0;
+                    _isFinishClick = false;
+                    RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+                    //}
+                    //else
+                    //{
+                    //    _isFinishClick = false;
+                    //    AlertMsg alertMsg = new AlertMsg
+                    //    {
+                    //        Message = "没有填写取药数量",
+                    //        Type = MsgType.ERROR
+                    //    };
+                    //    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    //}
+
+                }
+
+            });
+        }
+
+        public long CurrentTimeMillis()
+        {
+            return (long)(DateTime.UtcNow - Jan1st1970).TotalMilliseconds;
+        }
+
+        // 取消按钮
+        public DelegateCommand CancleTake
+        {
+            get => new DelegateCommand(() =>
+            {
+                _portUtil.ResetData();
+                Status = 0;
+            });
+        }
+
+        public DelegateCommand BtnCloseCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                if (Status != 0)
+                {
+                    _portUtil.ResetData();
+                    Status = 0;
+                }
+                //DialogParameters parameters = new DialogParameters();
+                //parameters.Add("",);
+                // 关闭当前窗口
+                RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+            });
+        }
+
+        public bool KeepAlive => false;
+    }
+}
diff --git a/DM_Weight/ViewModels/OrderTakeDialogViewModel.cs b/DM_Weight/ViewModels/OrderTakeDialogViewModel.cs
new file mode 100644
index 0000000..1bdf797
--- /dev/null
+++ b/DM_Weight/ViewModels/OrderTakeDialogViewModel.cs
@@ -0,0 +1,444 @@
+using log4net;
+using Microsoft.Xaml.Behaviors;
+using NetTaste;
+using Prism.Commands;
+using Prism.Events;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Speech.Synthesis;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using DM_Weight.Models;
+using DM_Weight.msg;
+using DM_Weight.Port;
+using DM_Weight.select;
+using DM_Weight.util;
+using System.Threading;
+
+namespace DM_Weight.ViewModels
+{
+    public class OrderTakeDialogViewModel : BindableBase, IDialogAware, IRegionMemberLifetime
+    {
+        private readonly ILog logger = LogManager.GetLogger(typeof(OrderTakeDialogViewModel));
+        public string Title => "处方取药";
+
+
+        public event Action<IDialogResult> RequestClose;
+
+        private static readonly DateTime Jan1st1970 = new DateTime
+   (1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+
+        private PortUtil _portUtil;
+        IEventAggregator _eventAggregator;
+        IDialogService _dialogService;
+        public OrderTakeDialogViewModel(PortUtil portUtil, IEventAggregator eventAggregator, IDialogService DialogService)
+        {
+            _dialogService = DialogService;
+            _portUtil = portUtil;
+            _eventAggregator = eventAggregator;
+        }
+
+        void DoMyPrismEvent(DeviceMsg msg)
+        {
+
+            if (msg.WindowName == "OrderTakeDrugWindow")
+            {
+                IGrouping<int, ChannelStock> grouping = enumerator.Current;
+                int DrawerNo = grouping.Key;
+                List<ChannelStock> channelStocks = grouping.ToList();
+
+                switch (msg.EventType)
+                {
+                    // 抽屉打开
+                    case EventType.DRAWEROPEN:
+
+
+                        if (Status == 1)
+                        {
+                            if (channelStocks[0].process == 1)
+                            {
+                                channelStocks.ForEach(it => it.process = 2);
+                            }
+                        }
+
+                        break;
+                    // 抽屉关闭
+                    case EventType.DRAWERCLOSE:
+                        if (Status == 1)
+                        {
+                            if (channelStocks[0].process == 2)
+                            {
+                                channelStocks.ForEach(it => it.process = 3);
+                            }
+                            if (enumerator.MoveNext())
+                            {
+                                OpenOneByOne();
+                            }
+                            // 已经全部取出
+                            else
+                            {
+                                Status = 3;
+                            }
+                        }
+                        break;
+                    // 数量变化
+                    case EventType.UPDATEQUANTITY:
+                        if (Status == 1)
+                        {
+                            logger.Info($"抽屉【{DrawerNo}】库位取药数量【{msg.Quantitys}】");
+                        }
+                        break;
+                    // 打开失败
+                    case EventType.OPENERROR:
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = msg.Message,
+                            Type = MsgType.ERROR,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        Status = 0;
+                        break;
+                }
+            }
+
+        }
+
+        private int _status = 0;
+
+        public int Status
+        {
+            get => _status; set => SetProperty(ref _status, value);
+        }
+
+        private OrderInfo? _orderInfo;
+
+
+        public OrderInfo? OrderInfo
+        {
+            get => _orderInfo;
+            set => SetProperty(ref _orderInfo, value);
+        }
+
+        private List<OrderDetail> orderDetails { get; set; }
+
+        private List<ChannelStock> _channelStocks;
+
+        public List<ChannelStock> ChannelStocks
+        {
+            get => _channelStocks;
+            set => SetProperty(ref _channelStocks, value);
+        }
+
+        private IEnumerable<IGrouping<int, ChannelStock>> enumerable;
+        private IEnumerator<IGrouping<int, ChannelStock>> enumerator;
+
+
+        public bool CanCloseDialog()
+        {
+            return Status == 0;
+        }
+
+        public void OnDialogClosed()
+        {
+            // 取消消息订阅
+            _eventAggregator.GetEvent<PortUtilEvent>().Unsubscribe(DoMyPrismEvent);
+        }
+
+        public void OnDialogOpened(IDialogParameters parameters)
+        {
+            _eventAggregator.GetEvent<PortUtilEvent>().Subscribe(DoMyPrismEvent);
+            OrderInfo o = parameters.GetValue<OrderInfo>("orderInfo");
+            OrderInfo = o;
+            RequestData();
+        }
+
+        public async void RequestData()
+        {
+            orderDetails = SqlSugarHelper.Db.Queryable<OrderDetail>()
+                .Includes<DrugInfo>(od => od.DrugInfo)
+                .InnerJoin(SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrawerType == 1).Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).GroupBy(cs => cs.DrugId), (od, t) => od.DrugId == t.DrugId)
+                .Where(od => od.OrderNo == OrderInfo.OrderNo)
+                .ToList();
+
+            List<ChannelStock> channelStocks = new List<ChannelStock>();
+            List<string> msg = new List<string>();
+            for (int i = 0; i < orderDetails.Count; i++)
+            {
+                OrderDetail orderDetail = orderDetails[i];
+
+                List<ChannelStock> HasQChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                    .Includes<DrugInfo>(cs => cs.DrugInfo)
+                    .Where(cs => cs.Quantity > 0)
+                    .Where(cs => cs.DrawerType == 1)
+                    .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
+                    .WhereIF(!string.IsNullOrEmpty(orderDetail.SetEffDate), cs => cs.EffDate.Equals(orderDetail.SetEffDate))
+                    .WhereIF(!string.IsNullOrEmpty(orderDetail.SetManuNo), cs => cs.ManuNo.Equals(orderDetail.SetManuNo))
+                    .Where(cs => cs.DrugId == orderDetail.DrugId)
+                    .OrderBy(cs => cs.EffDate)
+                    .OrderBy(cs => cs.DrawerNo)
+                    .ToList();
+                int total = HasQChannels.Sum(it => it.Quantity);
+                int TakeQ = orderDetail.Quantity;
+                // 说明数量足够
+                if (total >= TakeQ)
+                {
+                    for (int j = 0; TakeQ > 0; j++)
+                    {
+                        ChannelStock stock = HasQChannels[j];
+                        if (TakeQ > stock.Quantity)
+                        {
+                            stock.TakeQuantity = stock.Quantity;
+                            channelStocks.Add(stock);
+                            TakeQ -= stock.Quantity;
+                        }
+                        else
+                        {
+                            stock.TakeQuantity = TakeQ;
+                            channelStocks.Add(stock);
+                            TakeQ = 0;
+                        }
+                    }
+                }
+                else
+                {
+                    msg.Add($"药品【{orderDetail.DrugInfo.DrugName}】库存不足，应取【{TakeQ}】库存【{total}】");
+                }
+            }
+            if (msg.Count > 0)
+            {
+                RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+                //MessageBox.Show(string.Join("\n", msg));
+                DialogParameters dialogParameters = new DialogParameters();
+                dialogParameters.Add("msgInfo", msg);
+                DialogServiceExtensions.ShowDialogHost(_dialogService, "ShowMessageDialog", dialogParameters, "RootDialog");
+                
+            }
+            else
+            {
+                channelStocks.Sort((a, b) =>
+                {
+                    if ((a.DrawerNo - b.DrawerNo) == 0)
+                    {
+                        return a.ColNo - b.ColNo;
+                    }
+                    return a.DrawerNo - b.DrawerNo;
+                });
+                ChannelStocks = channelStocks;
+
+
+            }
+        }
+        public DelegateCommand OpenDrawer
+        {
+            get => new DelegateCommand(async () =>
+            {
+                if (Status == 0)
+                {
+                    enumerable = ChannelStocks.GroupBy(cs => cs.DrawerNo, cs => cs);
+                    enumerator = enumerable.GetEnumerator();
+                    enumerator.MoveNext();
+                    Status = 1;
+                    OpenOneByOne();
+                }
+
+            });
+        }
+
+        private void OpenOneByOne()
+        {
+            IGrouping<int, ChannelStock> grouping = enumerator.Current;
+            int DrawerNo = grouping.Key;
+            List<ChannelStock> channelStocks = grouping.ToList();
+            channelStocks.ForEach(it => it.process = 1);
+            _portUtil.SpeakAsync("正在打开" + DrawerNo + "号抽屉");
+
+            List<ChannelStock> singleChannels = channelStocks.FindAll(it => it.BoardType != 1);
+
+            // 发送取药数量
+            singleChannels.ForEach(it =>
+            {
+                try
+                {
+
+                    _portUtil.TakeQuantity(DrawerNo, it.ColNo, it.TakeQuantity, it.Quantity - it.TakeQuantity);
+                }
+                catch (Exception ex)
+                {
+                    AlertMsg alertMsg = new AlertMsg
+                    {
+                        Message = $"打开抽屉异常{ex.Message}",
+                        Type = MsgType.ERROR,
+                    };
+                    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                }
+            });
+            if(_portUtil.DrawerNo!=0&& _portUtil.DrawerNo<9&& DrawerNo>8)
+            {
+                Thread.Sleep(50);
+            }
+            _portUtil.WindowName = "OrderTakeDrugWindow";
+            _portUtil.BoardType = singleChannels.Count > 0 ? singleChannels[0].BoardType : 1;
+            _portUtil.ColNos = singleChannels.Select(it => it.ColNo).ToArray();
+            _portUtil.Stocks = singleChannels.Select(it => it.Quantity).ToArray();
+            _portUtil.DrawerNo = DrawerNo;
+            _portUtil.Start();
+        }
+
+        private bool _isFinishClick = false;
+        // 完成按钮
+        public DelegateCommand TakeFinish
+        {
+            get => new DelegateCommand(() =>
+            {
+                if (!_isFinishClick)
+                {
+                    _isFinishClick = true;
+                    List<ChannelStock> record = ChannelStocks.FindAll(it => it.TakeQuantity > 0).ToList();
+                    if (record.Count > 0)
+                    {
+                        string InvoiceId = OrderInfo.OrderNo;
+                        var f = SqlSugarHelper.Db.UseTran(() =>
+                        {
+                            SqlSugarHelper.Db.Updateable(new OrderInfo()
+                            {
+                                DmStatus = 1,
+                                OrderNo = OrderInfo.OrderNo
+                            }).UpdateColumns(it => new { it.DmStatus }).WhereColumns(it => new { it.OrderNo }).ExecuteCommand();
+
+                            SqlSugarHelper.Db.Insertable(new OrderFinish()
+                            {
+                                OrderNo = OrderInfo.OrderNo,
+                                PatientId = OrderInfo.PatientId,
+                                Pharmacy = OrderInfo.Pharmacy,
+                                State = 1,
+                                Operator = HomeWindowViewModel.Operator?.Nickname,
+                            });
+
+                            for (int i = 0; i < record.Count; i++)
+                            {
+                                ChannelStock it = record[i];
+                                // 更新数据 库存信息
+                                SqlSugarHelper.Db.Updateable(new ChannelStock()
+                                {
+                                    Quantity = it.Quantity - it.TakeQuantity,
+                                    ManuNo = it.ManuNo,
+                                    EffDate = it.EffDate,
+                                    Id = it.Id,
+                                }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate }).ExecuteCommand();
+                                // 获取更新完库存后的药品库存
+                                List<ChannelStock> nowChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                                    .Where(cs => cs.MachineId.Equals(it.MachineId))
+                                    .Where(cs => cs.DrugId.Equals(it.DrugId))
+                                    .Where(cs => cs.DrawerType == 1)
+                                    .ToList();
+
+                                // 保存数据 出库记录
+                                SqlSugarHelper.Db.Insertable(new MachineRecord()
+                                {
+                                    MachineId = it.MachineId,
+                                    DrawerNo = it.DrawerNo,
+                                    ColNo = it.ColNo,
+                                    DrugId = it.DrugId,
+                                    ManuNo = it.ManuNo,
+                                    EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
+                                    Operator = HomeWindowViewModel.Operator?.Id,
+                                    Reviewer = HomeWindowViewModel.Reviewer?.Id,
+                                    OperationTime = DateTime.Now,
+                                    Quantity = it.TakeQuantity,
+                                    Type = 2,
+                                    InvoiceId = InvoiceId,
+                                    StockQuantity = nowChannels.Sum(it => it.Quantity),
+                                    ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity)
+                                }).ExecuteCommand();
+                            }
+                            return true;
+                        });
+                        if (f.Data)
+                        {
+                            // 更新屏显库存
+                            List<ChannelStock> singleChannels = record.FindAll(it => it.BoardType != 1);
+                            if ((singleChannels.Count > 0 ? singleChannels[0].BoardType : 1) == 5)
+                            {
+                                singleChannels.ForEach(it =>
+                                {
+                                    _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.Quantity - it.TakeQuantity);
+                                });
+                            }
+                            AlertMsg alertMsg = new AlertMsg
+                            {
+                                Message = "抽屉取药完成，库存已更新",
+                                Type = MsgType.SUCCESS,
+                            };
+                            _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        }
+                        if(!f.IsSuccess)
+                        {
+                            AlertMsg alertMsg = new AlertMsg
+                            {
+                                Message = "抽屉取药完成，库存更新失败！",
+                                Type = MsgType.ERROR,
+                            };
+                            _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        }
+                        Status = 0;
+                        _isFinishClick = false;
+                        //RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+                        RequestClose?.Invoke(new DialogResult(ButtonResult.OK));
+                    }
+                    else
+                    {
+                        _isFinishClick = false;
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "没有填写取药数量",
+                            Type = MsgType.ERROR
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    }
+
+                }
+
+            });
+        }
+
+        public long CurrentTimeMillis()
+        {
+            return (long)(DateTime.UtcNow - Jan1st1970).TotalMilliseconds;
+        }
+
+        // 取消按钮
+        public DelegateCommand CancleTake
+        {
+            get => new DelegateCommand(() =>
+            {
+                _portUtil.ResetData();
+                Status = 0;
+            });
+        }
+
+        public DelegateCommand BtnCloseCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                if (Status != 0)
+                {
+                    _portUtil.ResetData();
+                    Status = 0;
+                }
+                //DialogParameters parameters = new DialogParameters();
+                //parameters.Add("",);
+                // 关闭当前窗口
+                RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+            });
+        }
+
+        public bool KeepAlive => false;
+    }
+}
diff --git a/DM_Weight/ViewModels/OrderTakeDrugWindowViewModel.cs b/DM_Weight/ViewModels/OrderTakeDrugWindowViewModel.cs
new file mode 100644
index 0000000..eb31f60
--- /dev/null
+++ b/DM_Weight/ViewModels/OrderTakeDrugWindowViewModel.cs
@@ -0,0 +1,265 @@
+using Prism.Commands;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Drawing.Printing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using DM_Weight.Models;
+using DM_Weight.select;
+using DM_Weight.util;
+using DM_Weight.msg;
+using Prism.Events;
+
+namespace DM_Weight.ViewModels
+{
+    public class OrderTakeDrugWindowViewModel: BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime
+    {
+
+        private int _pageNum = 1;
+        public int PageNum
+        {
+            get => _pageNum;
+            set
+            {
+                SetProperty(ref _pageNum, value);
+                RequestData();
+            }
+        }
+
+        private int _pageCount = 1;
+        public int PageCount
+        {
+            get => _pageCount;
+            set
+            {
+                SetProperty(ref _pageCount, value);
+            }
+        }
+
+        private int _pageSize = 8;
+        public int PageSize
+        {
+            get => _pageSize;
+            set
+            {
+                SetProperty(ref _pageSize, value);
+            }
+        }
+
+        private int _totalCount = 0;
+        public int TotalCount
+        {
+            get => _totalCount;
+            set
+            {
+                SetProperty(ref _totalCount, value);
+            }
+        }
+
+
+        IDialogService _dialogService;
+        IEventAggregator _eventAggregator;
+
+        private DelegateCommand _rowSelected;
+
+        public DelegateCommand RowSelected => _rowSelected ??= new DelegateCommand(OpenOrderDialog);
+
+        public OrderTakeDrugWindowViewModel(IDialogService DialogService, IEventAggregator eventAggregator)
+        {
+            _dialogService = DialogService;
+            _eventAggregator = eventAggregator;
+        }
+
+        public static List<OrderTakeSelect> StaticOrderTakeSelects = new()
+        {
+            new OrderTakeSelect
+            {
+                Code = "OrderNo",
+                Name = "处方号"
+            },
+            new OrderTakeSelect
+            {
+                Code = "PatientId",
+                Name = "患者编号"
+            }
+        };
+
+        private List<OrderTakeSelect> _orderTakeSelects = StaticOrderTakeSelects;
+
+        public List<OrderTakeSelect> OrderTakeSelects
+        {
+            get { return _orderTakeSelects; }
+            set
+            {
+                SetProperty(ref _orderTakeSelects, value);
+            }
+        }
+
+        private OrderTakeSelect _selectedItem = StaticOrderTakeSelects[0];
+        /// <summary>
+        /// 查询条件 查询字段
+        /// </summary>
+        public OrderTakeSelect SelectedItem
+        {
+            get { return _selectedItem; }
+            set
+            {
+                SetProperty(ref _selectedItem, value);
+                RequestData();
+            }
+        }
+
+        private OrderInfo? _selectedOrder;
+
+        public OrderInfo? SelectedOrder
+        {
+            get { return _selectedOrder; }
+            set
+            {
+                SetProperty(ref _selectedOrder, value);
+
+                //OpenOrderDialog();
+            }
+        }
+
+
+        private string _orderDate = DateTime.Now.ToString("yyyy-MM-dd");
+        /// <summary>
+        /// 查询条件  处方日期
+        /// </summary>
+        public string OrderDate { get { return _orderDate; } set
+            {
+                if (!String.IsNullOrEmpty(value))
+                {
+                    SetProperty(ref _orderDate, DateTime.Parse(value).ToString("yyyy-MM-dd"));
+                }
+                else
+                {
+                    SetProperty(ref _orderDate, value);
+                }
+                
+                RequestData();
+            }
+        }
+
+        private string? _searchValue;
+
+        /// <summary>
+        /// 查询条件 查询字段值
+        /// </summary>
+        public string? SearchValue {
+            get { return _searchValue; }
+            set
+            {
+                SetProperty(ref _searchValue, value);
+                RequestData();
+            }
+        }
+
+        private List<OrderInfo> _orderInfos = new();
+
+        public List<OrderInfo> OrderInfos { get { return _orderInfos; } set { SetProperty(ref _orderInfos, value); } }
+
+        public bool KeepAlive => false;
+
+        public async void OpenOrderDialog()
+        {
+            if (SelectedOrder != null && SelectedOrder.DmStatus == 0 && SelectedOrder.CancelFlag == 0 && SelectedOrder.HisDispFlag == 0)
+            {
+                // 此处延时1毫秒，等待页面渲染
+                await Task.Delay(TimeSpan.FromMilliseconds(1));
+                DialogParameters dialogParameters = new DialogParameters();
+                dialogParameters.Add("orderInfo", SelectedOrder);
+                DialogServiceExtensions.ShowDialogHost(_dialogService, "OrderTakeDialog", dialogParameters, DoDialogResult, "RootDialog");
+               
+            }
+            
+        }
+
+        private void DoDialogResult(IDialogResult dialogResult)
+        {
+            // 委托   被动执行     被子窗口执行
+            // dialogResult  第一方面可以拿到任意参数   第二方面   可判断关闭状态
+            //if(dialogResult.Result == ButtonResult.OK)
+            //{
+                SelectedOrder = null;
+                RequestData();
+            //}
+            //MessageBox.Show("返回值：" + dialogResult.Result.ToString());
+        }
+
+
+        //这个方法用于拦截请求,continuationCallback(true)就是不拦截，continuationCallback(false)拦截本次操作
+        public void ConfirmNavigationRequest(NavigationContext navigationContext, Action<bool> continuationCallback)
+        {
+            continuationCallback(true);
+        }
+
+        public DelegateCommand QueryCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                RequestData();
+            });
+        }
+
+        public void RequestData()
+        {
+            OrderInfos.Clear();
+            int totalCount = 0;
+            List<OrderInfo> queryData = SqlSugarHelper.Db.Queryable<OrderInfo>()
+                .InnerJoin<OrderDetail>((oi, od) => oi.OrderNo == od.OrderNo)
+                .InnerJoin(SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrawerType == 1).Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).GroupBy(cs => cs.DrugId), (oi, od, t) => od.DrugId == t.DrugId)
+                .WhereIF(OrderDate != null, oi => oi.RecvDate.ToString("yyyy-MM-dd") == OrderDate)
+                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("OrderNo"), oi => oi.OrderNo == SearchValue)
+                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("PatientId"), oi => oi.PatientId == SearchValue)
+                .WhereIF(!String.IsNullOrEmpty(ConfigurationManager.AppSettings["storage"]), oi => oi.Pharmacy == ConfigurationManager.AppSettings["storage"])
+                .Where(oi => oi.DmStatus == 0)
+                .Where(oi => oi.HisDispFlag == 0)
+                .Where(oi => oi.CancelFlag == 0)
+                .GroupBy(oi => oi.OrderNo)
+                .Select(oi => oi)
+                .ToPageList(PageNum, PageSize, ref totalCount);
+                //.ToList();
+            OrderInfos = queryData;
+            TotalCount = totalCount;
+            PageCount = (int)Math.Ceiling((double)TotalCount / PageSize);
+        }
+
+        //接收导航传过来的参数  现在是在此处初始化了表格数据
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            _eventAggregator.GetEvent<PortUtilEvent>().Subscribe(DoMyPrismEvent);
+            RequestData();
+        }
+
+        //每次导航的时候，该实列用不用重新创建，true是不重新创建,false是重新创建
+        public bool IsNavigationTarget(NavigationContext navigationContext)
+        {
+            return true;
+        }
+
+        //这个方法用于拦截请求
+        public void OnNavigatedFrom(NavigationContext navigationContext)
+        {
+
+            // 取消消息订阅
+            _eventAggregator.GetEvent<PortUtilEvent>().Unsubscribe(DoMyPrismEvent);
+        }
+
+        void DoMyPrismEvent(DeviceMsg msg)
+        {
+            if (msg.EventType == EventType.CODESCAN)
+            {
+                SearchValue = msg.Code;
+            }
+
+        }
+    }
+}
diff --git a/DM_Weight/ViewModels/PremissionViewModel.cs b/DM_Weight/ViewModels/PremissionViewModel.cs
new file mode 100644
index 0000000..96db7ee
--- /dev/null
+++ b/DM_Weight/ViewModels/PremissionViewModel.cs
@@ -0,0 +1,36 @@
+using Prism.Mvvm;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DM_Weight.Models;
+
+namespace DM_Weight.ViewModels
+{
+    [Serializable]
+    public class PremissionViewModel: BindableBase
+    {
+        private int _id;
+        private string _premissionName;
+        private string _premissionPath;
+        private string _premissionImage;
+        private List<PremissionViewModel> _children = new List<PremissionViewModel>();
+
+        public int Id { get => _id; set => SetProperty(ref _id, value); }
+        public string PremissionName { get => _premissionName; set => SetProperty(ref _premissionName, value); }
+        /// <summary>
+        /// 菜单路径 
+        /// <summary>
+        public string PremissionPath { get => _premissionPath; set => SetProperty(ref _premissionPath, value); }
+        /// <summary>
+        /// 图片source 
+        ///</summary>
+        public string PremissionImage { get => _premissionImage; set => SetProperty(ref _premissionImage, value); }
+
+
+        public List<PremissionViewModel> Children { get => _children; set => SetProperty(ref _children, value); }
+    }
+}
diff --git a/DM_Weight/ViewModels/ReturnDrugDialogViewModel.cs b/DM_Weight/ViewModels/ReturnDrugDialogViewModel.cs
new file mode 100644
index 0000000..b9c59b7
--- /dev/null
+++ b/DM_Weight/ViewModels/ReturnDrugDialogViewModel.cs
@@ -0,0 +1,333 @@
+using log4net;
+using log4net.Repository.Hierarchy;
+using Prism.Commands;
+using Prism.Events;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Speech.Synthesis;
+using System.Text;
+using System.Threading.Tasks;
+using DM_Weight.Models;
+using DM_Weight.msg;
+using DM_Weight.Port;
+using DM_Weight.util;
+
+namespace DM_Weight.ViewModels
+{
+    public class ReturnDrugDialogViewModel : BindableBase, IDialogAware, IRegionMemberLifetime
+    {
+
+        private readonly ILog logger = LogManager.GetLogger(typeof(ReturnDrugDialogViewModel));
+        public string Title => "归还药品(记录)";
+
+        public event Action<IDialogResult> RequestClose;
+
+        private static readonly DateTime Jan1st1970 = new DateTime
+   (1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+
+        private string WindowName = "ReturnDrug1Window";
+
+        private PortUtil _portUtil;
+        IEventAggregator _eventAggregator;
+
+        private MachineRecord _machineRecord;
+        public MachineRecord MachineRecord
+        {
+            get { return _machineRecord; }
+            set { SetProperty(ref _machineRecord, value); }
+        }
+
+        public ReturnDrugDialogViewModel(PortUtil portUtil, IEventAggregator eventAggregator)
+        {
+            _portUtil = portUtil;
+            _eventAggregator = eventAggregator;
+        }
+
+        void DoMyPrismEvent(DeviceMsg msg)
+        {
+
+            if (msg.WindowName.Equals(WindowName))
+            {
+
+                switch (msg.EventType)
+                {
+                    // 抽屉打开
+                    case EventType.DRAWEROPEN:
+
+
+                        if (Status == 1)
+                        {
+                            Status = 2;
+                        }
+
+                        break;
+                    // 抽屉关闭
+                    case EventType.DRAWERCLOSE:
+                        if (Status == 2)
+                        {
+                            Status = 3;
+                        }
+                        break;
+                    // 数量变化
+                    case EventType.UPDATEQUANTITY:
+                        try
+                        {
+                            if (Status == 2)
+                            {
+                                ReturnQuantity = msg.Quantitys[ChannelStock.ColNo - 1];
+
+                                logger.Info($"抽屉【{ChannelStock.DrawerNo}】库位药品数量【{msg.Quantitys}】");
+                            }
+                        }
+                        catch (Exception e)
+                        {
+                            logger.Error(e);
+                        }
+                        
+                        break;
+                    // 打开失败
+                    case EventType.OPENERROR:
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = msg.Message,
+                            Type = MsgType.ERROR,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        Status = 0;
+                        break;
+                }
+            }
+
+        }
+
+        private int _status = 0;
+
+        public int Status
+        {
+            get => _status; set => SetProperty(ref _status, value);
+        }
+
+
+        private List<ChannelStock> _channelStocks;
+
+        public List<ChannelStock> ChannelStocks
+        {
+            get => _channelStocks;
+            set => SetProperty(ref _channelStocks, value);
+        }
+
+        private ChannelStock _channelStock;
+
+        public ChannelStock ChannelStock
+        {
+            get => _channelStock;
+            set => SetProperty(ref _channelStock, value);
+        }
+
+        private int _returnQuantity;
+
+        public int ReturnQuantity
+        {
+            get => _returnQuantity;
+            set
+            {
+                if (value < 0)
+                {
+                    throw new ArgumentException("还药数量不能是负数");
+                }
+                if (value > MachineRecord.CanReturnQuantity)
+                {
+                    throw new ArgumentException("还药数量超出");
+                }
+                SetProperty(ref _returnQuantity, value);
+            }
+        }
+
+
+        public bool CanCloseDialog()
+        {
+            return Status == 0;
+        }
+
+        public void OnDialogClosed()
+        {
+            // 取消消息订阅
+            _eventAggregator.GetEvent<PortUtilEvent>().Unsubscribe(DoMyPrismEvent);
+        }
+
+        public void OnDialogOpened(IDialogParameters parameters)
+        {
+            _eventAggregator.GetEvent<PortUtilEvent>().Subscribe(DoMyPrismEvent);
+
+            MachineRecord _record = parameters.GetValue<MachineRecord>("record");
+            MachineRecord = _record;
+            ReturnQuantity = MachineRecord.CanReturnQuantity;
+
+            RequestData();
+        }
+
+        public void RequestData()
+        {
+            List<ChannelStock> queryData = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                .Where(cs => cs.DrugId == MachineRecord.DrugId)
+                .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
+                .WhereIF(MachineRecord.ManuNo != null,cs => cs.ManuNo == MachineRecord.ManuNo)
+                .OrderBy(cs => cs.DrawerNo)
+                .OrderBy(cs => cs.ColNo)
+                .ToList();
+            ChannelStocks = queryData;
+            if(ChannelStocks.Count > 0)
+            {
+                ChannelStock = ChannelStocks[0];
+            }
+        }
+
+        public DelegateCommand OpenDrawer
+        {
+            get => new DelegateCommand(() =>
+            {
+                if (ChannelStock != null)
+                {
+                    Status = 1;
+
+                    _portUtil.SpeakAsync("正在打开" + ChannelStock.DrawerNo + "号抽屉");
+
+                    _portUtil.WindowName = WindowName;
+                    _portUtil.BoardType = ChannelStock.BoardType;
+                    _portUtil.ColNos = new int[] { ChannelStock.ColNo };
+                    _portUtil.Stocks = new int[] { ChannelStock.Quantity };
+                    _portUtil.DrawerNo = ChannelStock.DrawerNo;
+                    _portUtil.Start();
+                } else
+                {
+                    AlertMsg alertMsg = new AlertMsg
+                    {
+                        Message = "请选择退还药品要放入的库位！",
+                        Type = MsgType.ERROR,
+                    };
+                    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                }
+
+            }, () => Status == 0);
+        }
+
+
+        private bool _isFinishClick = false;
+
+        public bool IsFinishClick { get => _isFinishClick; set => SetProperty(ref _isFinishClick, value); }
+        // 完成按钮
+        public DelegateCommand TakeFinish
+        {
+            get => new DelegateCommand(() =>
+            {
+                IsFinishClick = true;
+                string InvoiceId = "RETURN_" + CurrentTimeMillis();
+                var f = SqlSugarHelper.Db.UseTran(() =>
+                {
+                        
+                    // 更新数据 库存信息
+                    SqlSugarHelper.Db.Updateable(new ChannelStock()
+                    {
+                        Quantity = ChannelStock.Quantity + ReturnQuantity,
+                        Id = ChannelStock.Id,
+                    }).UpdateColumns(it => new { it.Quantity }).ExecuteCommand();
+
+                    // 获取更新完库存后的药品库存
+                    List<ChannelStock> nowChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                        .Where(cs => cs.MachineId.Equals(ChannelStock.MachineId))
+                        .Where(cs => cs.DrugId.Equals(ChannelStock.DrugId))
+                        .Where(cs => cs.DrawerType == 1)
+                        .ToList();
+                    // 更新数据 取药记录 设置还药数量、状态
+                    SqlSugarHelper.Db.Updateable(new MachineRecord()
+                    {
+                        ReturnQuantity1 = MachineRecord.ReturnQuantity1 + ReturnQuantity,
+                        Id = MachineRecord.Id,
+                        Status = (MachineRecord.CanReturnQuantity - ReturnQuantity) == 0 ? 2 : 1,
+                    }).UpdateColumns(it => new { it.ReturnQuantity1, it.Status }).ExecuteCommand();
+
+                    // 保存数据 还药记录
+                    SqlSugarHelper.Db.Insertable(new MachineRecord()
+                        {
+                            MachineId = ChannelStock.MachineId,
+                            DrawerNo = ChannelStock.DrawerNo,
+                            ColNo = ChannelStock.ColNo,
+                            DrugId = ChannelStock.DrugId,
+                            ManuNo = ChannelStock.ManuNo,
+                            EffDate = !String.IsNullOrEmpty(ChannelStock.EffDate) ? DateTime.ParseExact(ChannelStock.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
+                            Operator = HomeWindowViewModel.Operator?.Id,
+                            OperationTime = DateTime.Now,
+                            Quantity = ReturnQuantity,
+                            Type = 31,
+                            InvoiceId = InvoiceId,
+                            GetId = MachineRecord.Id,
+                            StockQuantity = nowChannels.Sum(it => it.Quantity),
+                            ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == ChannelStock.ManuNo).Sum(it => it.Quantity)
+                    }).ExecuteCommand();
+                    return true;
+                });
+                if (f.Data)
+                {
+                    // 更新屏显库存
+                    if (ChannelStock.BoardType == 5)
+                    {
+                        _portUtil.WriteQuantity(ChannelStock.DrawerNo, ChannelStock.ColNo, ChannelStock.Quantity + ReturnQuantity);
+                    }
+
+                    AlertMsg alertMsg = new AlertMsg
+                    {
+                        Message = "操作完成，库存已更新",
+                        Type = MsgType.SUCCESS,
+                    };
+                    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                }
+                if (!f.IsSuccess)
+                {
+                    AlertMsg alertMsg = new AlertMsg
+                    {
+                        Message = "库存更新失败！",
+                        Type = MsgType.ERROR,
+                    };
+                    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                }
+                Status = 0;
+                IsFinishClick = false;
+                RequestClose?.Invoke(new DialogResult(ButtonResult.OK));
+
+            }, () => !IsFinishClick && ReturnQuantity > 0).ObservesProperty(() => IsFinishClick).ObservesProperty(() => ReturnQuantity);
+        }
+
+        public long CurrentTimeMillis()
+        {
+            return (long)(DateTime.UtcNow - Jan1st1970).TotalMilliseconds;
+        }
+
+        // 取消按钮
+        public DelegateCommand CancleTake
+        {
+            get => new DelegateCommand(() =>
+            {
+                IsFinishClick = false;
+                _portUtil.ResetData();
+                Status = 0;
+            });
+        }
+
+        public DelegateCommand BtnCloseCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                // 关闭当前窗口
+                RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+            }, () => Status == 0).ObservesProperty(() => Status);
+        }
+
+        public bool KeepAlive => false;
+    }
+}
+
diff --git a/DM_Weight/ViewModels/ReturnDrugWindow2ViewModel.cs b/DM_Weight/ViewModels/ReturnDrugWindow2ViewModel.cs
new file mode 100644
index 0000000..207c0bb
--- /dev/null
+++ b/DM_Weight/ViewModels/ReturnDrugWindow2ViewModel.cs
@@ -0,0 +1,254 @@
+using Prism.Commands;
+using Prism.Events;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Speech.Synthesis;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using DM_Weight.Models;
+using DM_Weight.msg;
+using DM_Weight.Port;
+using DM_Weight.select;
+using DM_Weight.util;
+
+namespace DM_Weight.ViewModels
+{
+    public class ReturnDrugWindow2ViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime
+    {
+
+        private int _pageNum = 1;
+        public int PageNum
+        {
+            get => _pageNum;
+            set
+            {
+                SetProperty(ref _pageNum, value);
+                RequestData();
+            }
+        }
+
+        private int _pageCount = 1;
+        public int PageCount
+        {
+            get => _pageCount;
+            set
+            {
+                SetProperty(ref _pageCount, value);
+            }
+        }
+
+        private int _pageSize = 8;
+        public int PageSize
+        {
+            get => _pageSize;
+            set
+            {
+                SetProperty(ref _pageSize, value);
+            }
+        }
+
+        private int _totalCount = 0;
+        public int TotalCount
+        {
+            get => _totalCount;
+            set
+            {
+                SetProperty(ref _totalCount, value);
+            }
+        }
+        //刷新
+        public DelegateCommand Query
+        {
+            get => new DelegateCommand(() =>
+            {
+                RequestData();
+            });
+        }
+        IDialogService _dialogService;
+
+        private DelegateCommand _rowSelected;
+
+        public DelegateCommand RowSelected => _rowSelected ??= new DelegateCommand(OpenOrderDialog);
+
+        public ReturnDrugWindow2ViewModel(IDialogService DialogService)
+        {
+            _dialogService = DialogService;
+        }
+
+        public static List<OrderTakeSelect> StaticOrderTakeSelects = new()
+        {
+            new OrderTakeSelect
+            {
+                Code = "OrderNo",
+                Name = "处方号"
+            },
+            new OrderTakeSelect
+            {
+                Code = "PatientId",
+                Name = "患者编号"
+            }
+        };
+
+        private List<OrderTakeSelect> _orderTakeSelects = StaticOrderTakeSelects;
+
+        public List<OrderTakeSelect> OrderTakeSelects
+        {
+            get { return _orderTakeSelects; }
+            set
+            {
+                SetProperty(ref _orderTakeSelects, value);
+            }
+        }
+
+        private OrderTakeSelect _selectedItem = StaticOrderTakeSelects[0];
+        /// <summary>
+        /// 查询条件 查询字段
+        /// </summary>
+        public OrderTakeSelect SelectedItem
+        {
+            get { return _selectedItem; }
+            set
+            {
+                SetProperty(ref _selectedItem, value);
+                RequestData();
+            }
+        }
+
+        private OrderInfo? _selectedOrder;
+
+        public OrderInfo? SelectedOrder
+        {
+            get { return _selectedOrder; }
+            set
+            {
+                SetProperty(ref _selectedOrder, value);
+
+                //OpenOrderDialog();
+            }
+        }
+
+
+        private string _orderDate = DateTime.Now.ToString("yyyy-MM-dd");
+        /// <summary>
+        /// 查询条件  处方日期
+        /// </summary>
+        public string OrderDate
+        {
+            get { return _orderDate; }
+            set
+            {
+                if (!String.IsNullOrEmpty(value))
+                {
+                    SetProperty(ref _orderDate, DateTime.Parse(value).ToString("yyyy-MM-dd"));
+                }
+                else
+                {
+                    SetProperty(ref _orderDate, value);
+                }
+
+                RequestData();
+            }
+        }
+
+        private string? _searchValue;
+
+        /// <summary>
+        /// 查询条件 查询字段值
+        /// </summary>
+        public string? SearchValue
+        {
+            get { return _searchValue; }
+            set
+            {
+                SetProperty(ref _searchValue, value);
+                RequestData();
+            }
+        }
+
+        private List<OrderInfo> _orderInfos = new();
+
+        public List<OrderInfo> OrderInfos { get { return _orderInfos; } set { SetProperty(ref _orderInfos, value); } }
+
+        public bool KeepAlive => false;
+
+        public async void OpenOrderDialog()
+        {
+            //if (SelectedOrder != null && SelectedOrder.DmStatus == 0 && SelectedOrder.CancelFlag == 0 && SelectedOrder.HisDispFlag == 0)
+            if (SelectedOrder != null && SelectedOrder.DmStatus == 1 && SelectedOrder.CancelFlag == 1 && SelectedOrder.HisDispFlag == 1)
+            {
+                // 此处延时1毫秒，等待页面渲染
+                await Task.Delay(TimeSpan.FromMilliseconds(1));
+                DialogParameters dialogParameters = new DialogParameters();
+                dialogParameters.Add("orderInfo", SelectedOrder);
+                DialogServiceExtensions.ShowDialogHost(_dialogService, "OrderReturnDialog", dialogParameters, DoDialogResult, "RootDialog");
+            }
+
+        }
+
+        private void DoDialogResult(IDialogResult dialogResult)
+        {
+            // 委托   被动执行     被子窗口执行
+            // dialogResult  第一方面可以拿到任意参数   第二方面   可判断关闭状态
+            if (dialogResult.Result == ButtonResult.OK)
+            {
+                SelectedOrder = null;
+                RequestData();
+            }
+            //MessageBox.Show("返回值：" + dialogResult.Result.ToString());
+        }
+
+
+        //这个方法用于拦截请求,continuationCallback(true)就是不拦截，continuationCallback(false)拦截本次操作
+        public void ConfirmNavigationRequest(NavigationContext navigationContext, Action<bool> continuationCallback)
+        {
+            continuationCallback(true);
+        }
+
+        public void RequestData()
+        {
+            OrderInfos.Clear();
+            int totalCount = 0;
+            List<OrderInfo> queryData = SqlSugarHelper.Db.Queryable<OrderInfo>()
+                .InnerJoin<OrderDetail>((oi, od) => oi.OrderNo == od.OrderNo)
+                .InnerJoin(SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrawerType == 1).Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).GroupBy(cs => cs.DrugId), (oi, od, t) => od.DrugId == t.DrugId)
+                .WhereIF(OrderDate != null, oi => oi.OrderDate.ToString("yyyy-MM-dd") == OrderDate)
+                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("OrderNo"), oi => oi.OrderNo == SearchValue)
+                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("PatientId"), oi => oi.PatientId == SearchValue)
+                .WhereIF(!String.IsNullOrEmpty(ConfigurationManager.AppSettings["storage"]), oi => oi.Pharmacy == ConfigurationManager.AppSettings["storage"])
+                .Where(oi => oi.DmStatus == 1)
+                .Where(oi => oi.HisDispFlag == 1)
+                .Where(oi => oi.CancelFlag == 1)
+                .GroupBy(oi => oi.OrderDate)
+                .Select(oi => oi)
+                .ToPageList(PageNum, PageSize, ref totalCount);
+            //.ToList();
+            OrderInfos = queryData;
+            TotalCount = totalCount;
+            PageCount = (int)Math.Ceiling((double)TotalCount / PageSize);
+        }
+
+        //接收导航传过来的参数  现在是在此处初始化了表格数据
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            RequestData();
+        }
+
+        //每次导航的时候，该实列用不用重新创建，true是不重新创建,false是重新创建
+        public bool IsNavigationTarget(NavigationContext navigationContext)
+        {
+            return true;
+        }
+
+        //这个方法用于拦截请求
+        public void OnNavigatedFrom(NavigationContext navigationContext)
+        {
+
+        }
+    }
+}
diff --git a/DM_Weight/ViewModels/ReturnDrugWindowViewModel.cs b/DM_Weight/ViewModels/ReturnDrugWindowViewModel.cs
new file mode 100644
index 0000000..8b13d36
--- /dev/null
+++ b/DM_Weight/ViewModels/ReturnDrugWindowViewModel.cs
@@ -0,0 +1,208 @@
+using Prism.Commands;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DM_Weight.Models;
+using DM_Weight.select;
+using DM_Weight.util;
+
+namespace DM_Weight.ViewModels
+{
+    public class ReturnDrugWindowViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime
+    {
+
+        IDialogService _dialogService;
+
+        private DelegateCommand _rowSelected;
+
+        public DelegateCommand RowSelected => _rowSelected ??= new DelegateCommand(OpenOrderDialog);
+
+        public ReturnDrugWindowViewModel(IDialogService DialogService)
+        {
+            _dialogService = DialogService;
+        }
+
+        public static List<OrderTakeSelect> StaticSelects = new()
+        {
+            new OrderTakeSelect
+            {
+                Code = "DrugName",
+                Name = "药品名称"
+            },
+            new OrderTakeSelect
+            {
+                Code = "PyCode",
+                Name = "拼音码"
+            },
+            new OrderTakeSelect
+            {
+                Code = "DrugBarcode",
+                Name = "药品条码"
+            },
+            new OrderTakeSelect
+            {
+                Code = "DrugId",
+                Name = "药品编码"
+            }
+        };
+
+        private List<OrderTakeSelect> _selects = StaticSelects;
+
+        public List<OrderTakeSelect> Selects
+        {
+            get { return _selects; }
+            set
+            {
+                SetProperty(ref _selects, value);
+            }
+        }
+
+        private OrderTakeSelect _selectedItem = StaticSelects[0];
+        /// <summary>
+        /// 查询条件 查询字段
+        /// </summary>
+        public OrderTakeSelect SelectedItem
+        {
+            get { return _selectedItem; }
+            set
+            {
+                SetProperty(ref _selectedItem, value);
+                RequestData();
+            }
+        }
+
+        private MachineRecord? _selectedRecord;
+
+        public MachineRecord? SelectedRecord
+        {
+            get { return _selectedRecord; }
+            set
+            {
+                SetProperty(ref _selectedRecord, value);
+
+                //OpenOrderDialog();
+            }
+        }
+
+
+        private string _queryDate = DateTime.Now.ToString("yyyy-MM-dd");
+        /// <summary>
+        /// 查询条件  处方日期
+        /// </summary>
+        public string QueryDate
+        {
+            get { return _queryDate; }
+            set
+            {
+                if (!String.IsNullOrEmpty(value))
+                {
+                    SetProperty(ref _queryDate, DateTime.Parse(value).ToString("yyyy-MM-dd"));
+                }
+                else
+                {
+                    SetProperty(ref _queryDate, value);
+                }
+
+                RequestData();
+            }
+        }
+
+        private string? _searchValue;
+
+        /// <summary>
+        /// 查询条件 查询字段值
+        /// </summary>
+        public string? SearchValue
+        {
+            get { return _searchValue; }
+            set
+            {
+                SetProperty(ref _searchValue, value);
+                RequestData();
+            }
+        }
+
+        private List<MachineRecord> _machineRecords = new();
+
+        public List<MachineRecord> MachineRecords { get { return _machineRecords; } set { SetProperty(ref _machineRecords, value); } }
+
+
+        public async void OpenOrderDialog()
+        {
+            if (SelectedRecord != null)
+            {
+                // 此处延时1毫秒，等待页面渲染
+                await Task.Delay(TimeSpan.FromMilliseconds(1));
+
+                DialogParameters dialogParameters = new DialogParameters();
+                dialogParameters.Add("record", SelectedRecord);
+                DialogServiceExtensions.ShowDialogHost(_dialogService, "ReturnDrugDialog", dialogParameters, DoDialogResult, "RootDialog");
+
+            }
+
+        }
+
+        private void DoDialogResult(IDialogResult dialogResult)
+        {
+            // 委托   被动执行     被子窗口执行
+            // dialogResult  第一方面可以拿到任意参数   第二方面   可判断关闭状态
+            //if (dialogResult.Result == ButtonResult.OK)
+            {
+                SelectedRecord = null;
+                RequestData();
+            }
+            //MessageBox.Show("返回值：" + dialogResult.Result.ToString());
+        }
+
+        public bool KeepAlive => false;
+
+        //这个方法用于拦截请求,continuationCallback(true)就是不拦截，continuationCallback(false)拦截本次操作
+        public void ConfirmNavigationRequest(NavigationContext navigationContext, Action<bool> continuationCallback)
+        {
+            continuationCallback(true);
+        }
+
+
+        public void RequestData()
+        {
+            List<MachineRecord> queryData = SqlSugarHelper.Db.Queryable<MachineRecord>()
+                .Includes<DrugInfo>(mr => mr.DrugInfo)
+                .Includes<UserList>(mr => mr.User)
+                .Where(mr => mr.Type == 2)
+                .Where(mr => mr.Status < 2)
+                .Where(mr => mr.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
+                //.WhereIF(QueryDate != null, mr => mr.OperationTime.ToString("yyyy-MM-dd") == QueryDate)
+                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugId"), (mr) => mr.DrugInfo.DrugId.ToString().Contains(SearchValue))
+                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugName"), (mr) => mr.DrugInfo.DrugName.Contains(SearchValue))
+                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("PyCode"), (mr) => mr.DrugInfo.PyCode.Contains(SearchValue))
+                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugBarcode"), (mr) => mr.DrugInfo.DrugBarcode.Contains(SearchValue))
+                .OrderBy(mr => mr.OperationTime)
+                .ToList();
+            MachineRecords = queryData;
+        }
+
+        //接收导航传过来的参数  现在是在此处初始化了表格数据
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            RequestData();
+        }
+
+        //每次导航的时候，该实列用不用重新创建，true是不重新创建,false是重新创建
+        public bool IsNavigationTarget(NavigationContext navigationContext)
+        {
+            return true;
+        }
+
+        //这个方法用于拦截请求
+        public void OnNavigatedFrom(NavigationContext navigationContext)
+        {
+
+        }
+    }
+}
diff --git a/DM_Weight/ViewModels/ReturnEmptyDialogViewModel.cs b/DM_Weight/ViewModels/ReturnEmptyDialogViewModel.cs
new file mode 100644
index 0000000..5700519
--- /dev/null
+++ b/DM_Weight/ViewModels/ReturnEmptyDialogViewModel.cs
@@ -0,0 +1,358 @@
+using log4net;
+using log4net.Repository.Hierarchy;
+using Newtonsoft.Json.Linq;
+using Prism.Commands;
+using Prism.Events;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Speech.Synthesis;
+using System.Text;
+using System.Threading.Tasks;
+using DM_Weight.Models;
+using DM_Weight.msg;
+using DM_Weight.Port;
+using DM_Weight.util;
+using DM_Weight.Views;
+
+namespace DM_Weight.ViewModels
+{
+    public class ReturnEmptyDialogViewModel : BindableBase, IDialogAware, IRegionMemberLifetime
+    {
+
+        private readonly ILog logger = LogManager.GetLogger(typeof(ReturnEmptyDialogViewModel));
+        public string Title => "归还空瓶(记录)";
+
+        public event Action<IDialogResult> RequestClose;
+
+        private static readonly DateTime Jan1st1970 = new DateTime
+   (1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+
+        private string WindowName = "ReturnEmpty1Window";
+
+        private PortUtil _portUtil;
+        IEventAggregator _eventAggregator;
+
+
+        public ReturnEmptyDialogViewModel(PortUtil portUtil, IEventAggregator eventAggregator)
+        {
+            _portUtil = portUtil;
+            _eventAggregator = eventAggregator;
+        }
+
+        void DoMyPrismEvent(DeviceMsg msg)
+        {
+
+            if (msg.WindowName.Equals(WindowName))
+            {
+
+                switch (msg.EventType)
+                {
+                    // 抽屉打开
+                    case EventType.DRAWEROPEN:
+                        if (Status == 1)
+                        {
+                            Status = 2;
+                        }
+
+                        break;
+                    // 抽屉关闭
+                    case EventType.DRAWERCLOSE:
+                        if (Status == 2)
+                        {
+                            Status = 3;
+                            if(ChannelStock.DrawerType == 3)
+                            {
+                                ReturnQuantity = msg.Quantitys[0];
+                                logger.Info($"抽屉【{ChannelStock.DrawerNo}】回收库位药品数量增加【{msg.Quantitys[0]}】");
+                            }
+                        }
+                        break;
+                    // 数量变化
+                    case EventType.UPDATEQUANTITY:
+                        if (Status == 2)
+                        {
+                            ReturnQuantity = msg.Quantitys[0];
+                            logger.Info($"抽屉【{ChannelStock.DrawerNo}】回收库位药品数量增加【{msg.Quantitys[0]}】");
+                        }
+                        break;
+                    // 打开失败
+                    case EventType.OPENERROR:
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = msg.Message,
+                            Type = MsgType.ERROR,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        Status = 0;
+                        break;
+                }
+            }
+
+        }
+
+        private int _returnQuantity;
+
+        public int ReturnQuantity
+        {
+            get => _returnQuantity;
+            set
+            {
+                if (value < 0)
+                {
+                    throw new ArgumentException("还药数量不能是负数");
+                }
+                //if (value > MachineRecord.CanReturnQuantity)
+                //{
+                //    throw new ArgumentException("还药数量超出");
+                //}
+                SetProperty(ref _returnQuantity, value);
+            }
+        }
+
+        private int _status = 0;
+
+        public int Status
+        {
+            get => _status; set => SetProperty(ref _status, value);
+        }
+
+
+        private List<MachineRecord> _machineRecords = new();
+
+        public List<MachineRecord> MachineRecords
+        {
+            get => _machineRecords;
+            set
+            {
+                SetProperty(ref _machineRecords, value);
+            }
+        }
+
+        private ChannelStock _channelStock;
+
+        public ChannelStock ChannelStock
+        {
+            get => _channelStock;
+            set => SetProperty(ref _channelStock, value);
+        }
+
+       
+
+        public bool CanCloseDialog()
+        {
+            return Status == 0;
+        }
+
+        public void OnDialogClosed()
+        {
+            // 取消消息订阅
+            _eventAggregator.GetEvent<PortUtilEvent>().Unsubscribe(DoMyPrismEvent);
+        }
+
+        public void OnDialogOpened(IDialogParameters parameters)
+        {
+            _eventAggregator.GetEvent<PortUtilEvent>().Subscribe(DoMyPrismEvent);
+
+            ChannelStock _record = parameters.GetValue<ChannelStock>("channel");
+            ChannelStock = _record;
+
+            RequestData();
+        }
+
+        public void RequestData()
+        {
+            List<MachineRecord> queryData = SqlSugarHelper.Db.Queryable<MachineRecord>()
+                .Includes<UserList>(mr => mr.User)
+                .Where(mr => mr.DrugId == ChannelStock.DrugId)
+                .Where(mr => mr.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
+                .Where(mr => mr.Type == 2)
+                .Where(mr => mr.Status != 2)
+                .OrderBy(mr => mr.OperationTime)
+                .OrderBy(mr => mr.Id)
+                .ToList();
+            MachineRecords = queryData;
+        }
+
+        public DelegateCommand OpenDrawer
+        {
+            get => new DelegateCommand(() =>
+            {
+                if (ChannelStock != null)
+                {
+                    if (Status == 0)
+                    {
+                        if (ChannelStock.DrawerType == 3 && ChannelStock.BoardType == 1)
+                        {
+                            Status = 3 ;
+                        }
+                        else
+                        {
+                            Status = 1;
+                            _portUtil.SpeakAsync("正在打开" + ChannelStock.DrawerNo + "号抽屉");
+                            _portUtil.WindowName = WindowName;
+                            _portUtil.ColNos = new int[] { ChannelStock.ColNo };
+                            _portUtil.Stocks = new int[] { ChannelStock.Quantity }; 
+                            _portUtil.DrawerNo = ChannelStock.DrawerNo;
+                            _portUtil.DrawerType = ChannelStock.DrawerType;
+                            _portUtil.BoardType = ChannelStock.BoardType;
+                            _portUtil.Start();
+                        }
+                    }
+                }
+                else
+                {
+                    AlertMsg alertMsg = new AlertMsg
+                    {
+                        Message = "请选择退还药品要放入的库位！",
+                        Type = MsgType.ERROR,
+                    };
+                    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                }
+            });
+        }
+
+
+        private bool _isFinishClick = false;
+
+        public bool IsFinishClick { get => _isFinishClick; set => SetProperty(ref _isFinishClick, value); }
+        // 完成按钮
+        public DelegateCommand TakeFinish
+        {
+            get => new DelegateCommand(() =>
+            {
+                IsFinishClick = true;
+                List<MachineRecord> records = MachineRecords.FindAll(it => it.IsSelected).ToList();
+                if (records.Count > 0 && records.Sum(it => it.Quantity - it.ReturnQuantity1)  == ReturnQuantity)
+                {
+                    string InvoiceId = "RETURN_" + CurrentTimeMillis();
+                    var f = SqlSugarHelper.Db.UseTran(() =>
+                    {
+
+                        // 更新数据 库存信息
+                        SqlSugarHelper.Db.Updateable(new ChannelStock()
+                        {
+                            Quantity = ChannelStock.Quantity + ReturnQuantity,
+                            Id = ChannelStock.Id,
+                        }).UpdateColumns(it => new { it.Quantity }).ExecuteCommand();
+
+                        // 获取更新完库存后的药品库存
+                        List<ChannelStock> nowChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                            .Where(cs => cs.MachineId.Equals(ChannelStock.MachineId))
+                            .Where(cs => cs.DrugId.Equals(ChannelStock.DrugId))
+                            .Where(cs => cs.DrawerType == 1)
+                            .ToList();
+
+                        for (int i = 0; i < records.Count; i++)
+                        {
+                            MachineRecord _MachineRecord = records[i];
+                            // 更新数据 取药记录 设置还药数量、状态
+                            SqlSugarHelper.Db.Updateable(new MachineRecord()
+                            {
+                                ReturnQuantity2 = _MachineRecord.Quantity - _MachineRecord.ReturnQuantity1,
+                                Id = _MachineRecord.Id,
+                                Status = 2,
+                            }).UpdateColumns(it => new { it.ReturnQuantity1, it.Status }).ExecuteCommand();
+
+                            // 保存数据 还药空瓶记录
+                            SqlSugarHelper.Db.Insertable(new MachineRecord()
+                            {
+                                MachineId = ChannelStock.MachineId,
+                                DrawerNo = ChannelStock.DrawerNo,
+                                ColNo = ChannelStock.ColNo,
+                                DrugId = ChannelStock.DrugId,
+                                ManuNo = ChannelStock.ManuNo,
+                                EffDate = !String.IsNullOrEmpty(ChannelStock.EffDate) ? DateTime.ParseExact(ChannelStock.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
+                                Operator = HomeWindowViewModel.Operator?.Id,
+                                Reviewer = HomeWindowViewModel.Reviewer?.Id,
+                                OperationTime = DateTime.Now,
+                                Quantity = ReturnQuantity,
+                                Type = 32,
+                                InvoiceId = InvoiceId,
+                                GetId = _MachineRecord.Id,
+                                StockQuantity = nowChannels.Sum(it => it.Quantity),
+                                ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == ChannelStock.ManuNo).Sum(it => it.Quantity)
+                            }).ExecuteCommand();
+                        }
+
+                        return true;
+                    });
+                    if (f.Data)
+                    {
+                        // 更新屏显库存
+                        if (ChannelStock.BoardType == 5)
+                        {
+                            _portUtil.WriteQuantity(ChannelStock.DrawerNo, ChannelStock.ColNo, ChannelStock.Quantity + ReturnQuantity);
+                        }
+
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "操作完成，库存已更新",
+                            Type = MsgType.SUCCESS,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    }
+                    if (!f.IsSuccess)
+                    {
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "库存更新失败！",
+                            Type = MsgType.ERROR,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    }
+                    Status = 0;
+                    IsFinishClick = false;
+                    RequestClose?.Invoke(new DialogResult(ButtonResult.OK));
+                } else
+                {
+                    AlertMsg alertMsg = new AlertMsg
+                    {
+                        Message = "选择的归还数目与实际数目不符",
+                        Type = MsgType.ERROR,
+                    };
+                    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    IsFinishClick = false;
+                }
+            }, () => !IsFinishClick && ReturnQuantity > 0).ObservesProperty(() => IsFinishClick).ObservesProperty(() => ReturnQuantity);
+        }
+
+        public long CurrentTimeMillis()
+        {
+            return (long)(DateTime.UtcNow - Jan1st1970).TotalMilliseconds;
+        }
+
+        // 取消按钮
+        public DelegateCommand CancleTake
+        {
+            get => new DelegateCommand(() =>
+            {
+                IsFinishClick = false;
+                _portUtil.ResetData();
+                Status = 0;
+            });
+        }
+
+        public DelegateCommand BtnCloseCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                if (Status != 0)
+                {
+                    _portUtil.ResetData();
+                    Status = 0;
+                }
+                //DialogParameters parameters = new DialogParameters();
+                //parameters.Add("",);
+                // 关闭当前窗口
+                RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+            });
+        }
+
+        public bool KeepAlive => false;
+    }
+}
diff --git a/DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs b/DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs
new file mode 100644
index 0000000..9ca3e7f
--- /dev/null
+++ b/DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs
@@ -0,0 +1,134 @@
+using Prism.Commands;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DM_Weight.Models;
+using DM_Weight.util;
+
+namespace DM_Weight.ViewModels
+{
+    public class ReturnEmptyWindowViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime
+    {
+
+       
+
+        private List<ChannelStock>? _channelStocks;
+
+        public List<ChannelStock>? Channels
+        {
+            get { return _channelStocks; }
+            set { SetProperty(ref _channelStocks, value); }
+        }
+
+        private ChannelStock _channelStock;
+
+        public ChannelStock Channel
+        {
+            get { return _channelStock; }
+            set { SetProperty(ref _channelStock, value); }
+        }
+
+        IDialogService _dialogService;
+        public ReturnEmptyWindowViewModel(IDialogService dialogService)
+        {
+            _dialogService = dialogService;
+        }
+
+        public DelegateCommand RowSelected
+        {
+            get => new DelegateCommand(() =>
+            {
+                
+                if (Channel != null && Channel.DrugId == null)
+                {
+                    DialogParameters dialogParameters = new DialogParameters();
+                    dialogParameters.Add("DrawerNo", Channel.DrawerNo);
+                    DialogServiceExtensions.ShowDialogHost(_dialogService, "BindingChannelDialog", dialogParameters, DoDialogResult, "RootDialog");
+                }
+                else if(Channel != null && Channel.CanReturnQuantity > 0)
+                {
+                    DialogParameters dialogParameters = new DialogParameters();
+                    dialogParameters.Add("channel", Channel);
+                    DialogServiceExtensions.ShowDialogHost(_dialogService, "ReturnEmptyDialog", dialogParameters, DoDialogResult, "RootDialog");
+                }
+            });
+        }
+
+
+        private void DoDialogResult(IDialogResult dialogResult)
+        {
+            // 委托   被动执行     被子窗口执行
+            // dialogResult  第一方面可以拿到任意参数   第二方面   可判断关闭状态
+            RequestData();
+            //MessageBox.Show("返回值：" + dialogResult.Result.ToString());
+        }
+
+        public bool KeepAlive => false;
+
+
+        public DelegateCommand Query
+        {
+            get => new DelegateCommand(() =>
+            {
+                RequestData();
+            });
+        }
+
+        //这个方法用于拦截请求,continuationCallback(true)就是不拦截，continuationCallback(false)拦截本次操作
+        public void ConfirmNavigationRequest(NavigationContext navigationContext, Action<bool> continuationCallback)
+        {
+            continuationCallback(true);
+        }
+
+
+        //接收导航传过来的参数
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            //查询表格数据
+            RequestData();
+        }
+
+        void RequestData()
+        {
+
+            Channels = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                .LeftJoin<DrugInfo>((cs,di) => cs.DrugId == di.DrugId.ToString())
+                .Where((cs) => cs.DrawerType != 1)
+                .Select((cs, di) => new ChannelStock{
+                    CanReturnQuantity = SqlFunc.Subqueryable<MachineRecord>().Where(mr => mr.DrugId == cs.DrugId).Where(mr => mr.Type == 2).Where(mr => mr.Status != 2).Select(mr => SqlFunc.IsNull(SqlFunc.AggregateSumNoNull(mr.Quantity - mr.ReturnQuantity1 - mr.ReturnQuantity2), 0)) ,
+                    DrugInfo = new DrugInfo
+                    {
+                        DrugId = di.DrugId,
+                        DrugName = di.DrugName,
+                        DrugSpec = di.DrugSpec,
+                        Manufactory = di.Manufactory,
+                        PackUnit = di.PackUnit,
+                    },
+                    Quantity = cs.Quantity
+                }, true)
+                .OrderBy(cs => cs.DrawerNo)
+                .OrderBy(cs => cs.ColNo)
+                .ToList()
+                ;
+            _ = Channels.Count;
+        }
+
+        //每次导航的时候，该实列用不用重新创建，true是不重新创建,false是重新创建
+        public bool IsNavigationTarget(NavigationContext navigationContext)
+        {
+            return true;
+        }
+
+        //这个方法用于拦截请求
+        public void OnNavigatedFrom(NavigationContext navigationContext)
+        {
+
+        }
+    }
+}
diff --git a/DM_Weight/ViewModels/RoleManagerWindowViewModel.cs b/DM_Weight/ViewModels/RoleManagerWindowViewModel.cs
new file mode 100644
index 0000000..d0753e5
--- /dev/null
+++ b/DM_Weight/ViewModels/RoleManagerWindowViewModel.cs
@@ -0,0 +1,665 @@
+using Prism.Commands;
+using Prism.Mvvm;
+using Prism.Regions;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.Serialization.Formatters.Binary;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using DM_Weight.Models;
+using DM_Weight.util;
+using System.Data;
+using System.Configuration;
+
+namespace DM_Weight.ViewModels
+{
+    public class RoleManagerWindowViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime
+    {
+        private List<RoleDm>? _roleList;
+        public List<RoleDm>? RoleList
+        {
+            get { return _roleList; }
+            set { SetProperty(ref _roleList, value); }
+        }
+
+        //public RoleManagerWindowViewModel()
+        //{
+        //    _allPremissions = Clone<PremissionDm>(defaultAll);
+        //}
+       
+        public static ObservableCollection<T> Clone<T>(object List)
+        {
+            using (Stream objectStream = new MemoryStream())
+            {
+                IFormatter formatter = new BinaryFormatter();
+                formatter.Serialize(objectStream, List);
+                objectStream.Seek(0, SeekOrigin.Begin);
+                return formatter.Deserialize(objectStream) as ObservableCollection<T>;
+            }
+        }
+
+        private RoleDm _role = new RoleDm();
+        public RoleDm Role
+        {
+            get { return _role; }
+            set
+            {
+                CompareList(value);
+                SetProperty(ref _role, value);
+            }
+        }
+
+
+        private void CompareList(RoleDm Role)
+        {
+
+            AllPremissions = Clone<PremissionDm>(defaultAll);
+            RightPremissions.Clear();
+            if (Role != null && Role.Permissions != null)
+            {
+                List<PremissionDm> Permissions = Role.Permissions;
+                Permissions.ForEach(it =>
+                {
+                    // 父菜单
+                    PremissionDm p = AllPremissions.ToList().Find(it2 => it2.Id == it.Id);
+                    int index = AllPremissions.ToList().FindIndex(it2 => it2.Id == it.Id);
+                    if (p.Id != 6)
+                    {
+                        it.Children.ToList().ForEach(it3 =>
+                        {
+                            int i =p.Children.ToList().FindIndex(it4 => it4.Id == it3.Id);
+                            if (i > 0 && AllPremissions.ElementAt(index).Children.Count > i) 
+                            {
+                                AllPremissions.ElementAt(index).Children.RemoveAt(i);
+                            }
+                        });
+                        if (p.Children.Count == 0)
+                        {
+                            AllPremissions.RemoveAt(index);
+                        }
+                    } else
+                    {
+                        AllPremissions.RemoveAt(index);
+                    }
+                    
+                });
+                RightPremissions = new ObservableCollection<PremissionDm>(Permissions);
+            }
+        }
+
+        private string? _searchValue;
+
+        /// <summary>
+        /// 查询条件 查询字段值
+        /// </summary>
+        public string? SearchValue
+        {
+            get { return _searchValue; }
+            set
+            {
+                SetProperty(ref _searchValue, value);
+                RequestData();
+            }
+        }
+
+        public static ObservableCollection<PremissionDm> defaultAll = new ObservableCollection<PremissionDm>();
+
+        static RoleManagerWindowViewModel()
+        {
+            #region 取药菜单
+            PremissionDm quyao = new PremissionDm{
+                Id = 1,
+                PremissionName = "取药",
+                PremissionImage = "/Images/TbQyao.png",
+            };
+            ObservableCollection<PremissionDm> quyaoChild = new ObservableCollection<PremissionDm>();
+            PremissionDm quyao1 = new PremissionDm
+            {
+                Id = 11,
+                PremissionName = "处方取药",
+                PremissionPath = "OrderTakeDrugWindow",
+            };
+            PremissionDm quyao2 = new PremissionDm
+            {
+                Id = 12,
+                PremissionName = "调拨出库",
+                PremissionPath = "InvoiceOutWindow",
+            };
+            PremissionDm quyao3 = new PremissionDm
+            {
+                Id = 13,
+                PremissionName = "抽屉取药",
+                PremissionPath = "DrawerTakeDrugWindow",
+            };
+            PremissionDm quyao4 = new PremissionDm
+            {
+                Id = 14,
+                PremissionName = "自选取药",
+                PremissionPath = "SelfTakeDrugWindow",
+            };
+            PremissionDm quyao5 = new PremissionDm
+            {
+                Id = 15,
+                PremissionName = "取药记录",
+                PremissionPath = "TakeRecordWindow",
+            };
+            quyaoChild.Add(quyao1);
+            quyaoChild.Add(quyao2);
+            quyaoChild.Add(quyao3);
+            quyaoChild.Add(quyao4);
+            quyaoChild.Add(quyao5);
+            quyao.Children = quyaoChild;
+            defaultAll.Add(quyao);
+            #endregion
+            #region 加药菜单
+            PremissionDm jiayao = new PremissionDm
+            {
+                Id = 2,
+                PremissionName = "加药",
+                PremissionImage = "/Images/TbJiay.png",
+            };
+            ObservableCollection<PremissionDm> jiayaoChild = new ObservableCollection<PremissionDm>();
+            PremissionDm jiayao1 = new PremissionDm
+            {
+                Id = 21,
+                PremissionName = "自选加药",
+                PremissionPath = "SelfAddWindow",
+            };
+            PremissionDm jiayao2 = new PremissionDm
+            {
+                Id = 22,
+                PremissionName = "调拨入库",
+                PremissionPath = "InvoiceInWindow",
+            };
+            PremissionDm jiayao3 = new PremissionDm
+            {
+                Id = 23,
+                PremissionName = "抽屉加药",
+                PremissionPath = "DrawerAddDrugWindow",
+            };
+            PremissionDm jiayao4 = new PremissionDm
+            {
+                Id = 25,
+                PremissionName = "加药记录",
+                PremissionPath = "AddRecordWindow",
+            };
+            PremissionDm jiayao5 = new PremissionDm
+            {
+                Id = 24,
+                PremissionName = "多批次抽屉加药",
+                PremissionPath = "AddDrugControl",
+            };
+            jiayaoChild.Add(jiayao1);
+            jiayaoChild.Add(jiayao2);
+            jiayaoChild.Add(jiayao3);
+            jiayaoChild.Add(jiayao5);
+            jiayaoChild.Add(jiayao4);
+            jiayao.Children = jiayaoChild;
+            defaultAll.Add(jiayao);
+            #endregion
+            #region 还药菜单
+            PremissionDm huanyao = new PremissionDm
+            {
+                Id = 3,
+                PremissionName = "还药",
+                PremissionImage = "/Images/TbTuiy.png",
+            };
+            ObservableCollection<PremissionDm> huanyaoChild = new ObservableCollection<PremissionDm>();
+            PremissionDm huanyao1 = new PremissionDm
+            {
+                Id = 31,
+                PremissionName = "归还药品",
+                PremissionPath = "ReturnDrugWindow",
+            };
+            PremissionDm huanyao11 = new PremissionDm
+            {
+                Id = 31,
+                PremissionName = "归还药品",
+                PremissionPath = "ReturnDrugWindow2",
+            };
+            PremissionDm huanyao2 = new PremissionDm
+            {
+                Id = 32,
+                PremissionName = "归还空瓶",
+                PremissionPath = "ReturnEmptyWindow",
+            };
+            PremissionDm huanyao3 = new PremissionDm
+            {
+                Id = 33,
+                PremissionName = "归还记录",
+                PremissionPath = "ReturnRecordWindow",
+            };
+            huanyaoChild.Add(Convert.ToInt32(ConfigurationManager.AppSettings["returnDrugMode"]) == 1? huanyao11:huanyao1);
+            huanyaoChild.Add(huanyao2);
+            huanyaoChild.Add(huanyao3);
+            huanyao.Children = huanyaoChild;
+            defaultAll.Add(huanyao);
+            #endregion
+            #region 库存管理菜单 
+            PremissionDm kuguan = new PremissionDm
+            {
+                Id = 4,
+                PremissionName = "库存管理",
+                PremissionImage = "/Images/TbKuc.png",
+            };
+            ObservableCollection<PremissionDm> kuguanChild = new ObservableCollection<PremissionDm>();
+            PremissionDm kuguan1 = new PremissionDm
+            {
+                Id = 41,
+                PremissionName = "库存列表",
+                PremissionPath = "StockListWindow",
+            };
+            PremissionDm kuguan2 = new PremissionDm
+            {
+                Id = 42,
+                PremissionName = "库存盘点",
+                PremissionPath = "CheckStockWindow",
+            };
+            PremissionDm kuguan3 = new PremissionDm
+            {
+                Id = 43,
+                PremissionName = "盘点记录",
+                PremissionPath = "CheckRecordWindow",
+            };
+            PremissionDm kuguan4 = new PremissionDm
+            {
+                Id = 44,
+                PremissionName = "药品列表",
+                PremissionPath = "DrugListWindow",
+            };
+            PremissionDm kuguan5 = new PremissionDm
+            {
+                Id = 45,
+                PremissionName = "交接班记录",
+                PremissionPath = "ChangeShiftsListWindow",
+            };
+            kuguanChild.Add(kuguan1);
+            kuguanChild.Add(kuguan2);
+            kuguanChild.Add(kuguan3);
+            kuguanChild.Add(kuguan4);
+            kuguanChild.Add(kuguan5);
+            kuguan.Children = kuguanChild;
+            defaultAll.Add(kuguan);
+            #endregion
+            #region 系统设置菜单
+            PremissionDm sysset = new PremissionDm
+            {
+                Id = 5,
+                PremissionName = "系统设置",
+                PremissionImage = "/Images/TbSet.png",
+            };
+            ObservableCollection<PremissionDm> syssetChild = new ObservableCollection<PremissionDm>();
+            PremissionDm sysset1 = new PremissionDm
+            {
+                Id = 51,
+                PremissionName = "用户管理",
+                PremissionPath = "UserManagerWindow",
+            };
+            PremissionDm sysset2 = new PremissionDm
+            {
+                Id = 52,
+                PremissionName = "角色管理",
+                PremissionPath = "RoleManagerWindow",
+            };
+            PremissionDm sysset3 = new PremissionDm
+            {
+                Id = 53,
+                PremissionName = "设置",
+                PremissionPath = "SettingWindow",
+            };
+            syssetChild.Add(sysset1);
+            syssetChild.Add(sysset2);
+            syssetChild.Add(sysset3);
+            sysset.Children = syssetChild;
+            defaultAll.Add(sysset);
+            #endregion
+            #region 退出菜单
+            PremissionDm logout = new PremissionDm
+            {
+                Id = 6,
+                PremissionName = "退出",
+                PremissionImage = "/Images/TbExit.png",
+            };
+            defaultAll.Add(logout);
+            #endregion
+        }
+
+        private ObservableCollection<PremissionDm> _allPremissions = Clone<PremissionDm>(defaultAll);
+        public ObservableCollection<PremissionDm> AllPremissions
+        {
+            get => _allPremissions;
+            set => SetProperty(ref _allPremissions, value);
+        }
+
+        private PremissionDm? _leftPremission ;
+        public PremissionDm? LeftPremission
+        {
+            get => _leftPremission;
+            set => SetProperty(ref _leftPremission, value);
+        }
+        private ObservableCollection<PremissionDm> _rightPremissions = new ObservableCollection<PremissionDm>();
+
+        public ObservableCollection<PremissionDm> RightPremissions
+        {
+            get => _rightPremissions;
+            set => SetProperty(ref _rightPremissions, value);
+        }
+
+        private PremissionDm? _rightPremission;
+        public PremissionDm? RightPremission
+        {
+            get => _rightPremission;
+            set => SetProperty(ref _rightPremission, value);
+        }
+
+        public bool KeepAlive => false;
+
+        public T DeepCopyByReflect<T>(T obj)
+        {
+            //如果是字符串或值类型则直接返回
+            if (obj == null || (obj is string) || (obj.GetType().IsValueType)) return obj;
+
+            object retval = Activator.CreateInstance(obj.GetType());
+            FieldInfo[] fields = obj.GetType().GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static);
+            foreach (FieldInfo field in fields)
+            {
+                try { field.SetValue(retval, DeepCopyByReflect(field.GetValue(obj))); }
+                catch { }
+            }
+            return (T)retval;
+        }
+        public DelegateCommand Query
+        {
+            get => new DelegateCommand(() =>
+            {
+                RequestData();
+            });
+        }
+
+        public DelegateCommand ToRight => new DelegateCommand(() =>
+        {
+            // 说明是父菜单
+            if (LeftPremission.Children != null || LeftPremission.Id == 6)
+            {
+                // 右侧有没有此菜单
+                int index = RightPremissions.ToList().FindIndex((it) => it.Id == LeftPremission.Id);
+                // 已经存在
+                if (index > -1)
+                {
+                    // 获取右侧中的菜单
+                    PremissionDm item = RightPremissions.ElementAt(index);
+                    // 向其中添加子菜单
+                    LeftPremission.Children.ToList().ForEach(it =>
+                    {
+                        int v = it.Id % 10;
+                        if (v > item.Children.Count)
+                        {
+                            item.Children.Add(it);
+                        } else
+                        {
+                            item.Children.Insert(v-1, it);
+                        }
+                    });
+                }
+                else
+                {
+                    int v = LeftPremission.Id % 10;
+                    if (v > RightPremissions.Count)
+                    {
+                        RightPremissions.Add(LeftPremission);
+                    }
+                    else
+                    {
+                        RightPremissions.Insert(v - 1, LeftPremission);
+                    }
+                   
+                }
+
+                AllPremissions.RemoveAt(AllPremissions.ToList().FindIndex(it => it.Id == LeftPremission.Id));
+            }
+            // 子菜单
+            else
+            {
+                // 查找所选子菜单的父菜单
+                PremissionDm item = AllPremissions.ToList().Find(it => (int)(LeftPremission.Id / 10) == it.Id);
+                // 查找父菜单是否在右侧
+                int index = RightPremissions.ToList().FindIndex(it => it.Id == item.Id);
+                // 存在
+                if (index > -1)
+                {
+                    ObservableCollection<PremissionDm>  a= RightPremissions.ElementAt(index).Children;
+                    int v = LeftPremission.Id % 10;
+                    if (v > a.Count)
+                    {
+                        a.Add(LeftPremission);
+                    }
+                    else
+                    {
+                        a.Insert(v - 1, LeftPremission);
+                    }
+                    item.Children.RemoveAt(item.Children.ToList().FindIndex(it => it.Id == LeftPremission.Id));
+                    if (item.Children.Count == 0)
+                    {
+                        AllPremissions.RemoveAt(AllPremissions.ToList().FindIndex(it => it.Id == LeftPremission.Id));
+                    }
+                }
+                // 不存在
+                else
+                {
+                    // 拷贝
+                    PremissionDm item2 = DeepCopyByReflect<PremissionDm>(item);
+                    ObservableCollection<PremissionDm> child = new ObservableCollection<PremissionDm>();
+                    child.Add(LeftPremission);
+                    item2.Children = child;
+                    int v = item2.Id % 10;
+                    if (v > RightPremissions.Count)
+                    {
+                        RightPremissions.Add(item2);
+                    }
+                    else
+                    {
+                        RightPremissions.Insert(v - 1, item2);
+                    }
+                    
+
+                    item.Children.RemoveAt(item.Children.ToList().FindIndex(it => it.Id == LeftPremission.Id));
+                }
+
+            }
+        });
+        public DelegateCommand<PremissionDm> LeftSelectedItemChangedCommand
+        {
+            get => new DelegateCommand<PremissionDm>((PremissionDm _selected) =>
+            {
+                LeftPremission = _selected;
+            });
+        }
+        public DelegateCommand<PremissionDm> RightSelectedItemChangedCommand
+        {
+            get => new DelegateCommand<PremissionDm>((PremissionDm _selected) =>
+            {
+                RightPremission = _selected;
+            });
+        }
+        
+
+        public DelegateCommand ToLeft
+        {
+            get => new DelegateCommand(() =>
+            {
+                // 说明是父菜单
+                if (RightPremission.Children != null || RightPremission.Id == 6)
+                {
+                    // 左侧有没有此菜单
+                    int index = AllPremissions.ToList().FindIndex((it) => it.Id == RightPremission.Id);
+                    // 已经存在
+                    if (index > -1)
+                    {
+                        // 获取左侧中的菜单
+                        PremissionDm item = AllPremissions.ElementAt(index);
+                        // 向其中添加子菜单
+                        RightPremission.Children.ToList().ForEach(it =>
+                        {
+                            int v = it.Id % 10;
+                            if (v > item.Children.Count)
+                            {
+                                item.Children.Add(it);
+                            }
+                            else
+                            {
+                                item.Children.Insert(v - 1, it);
+                            }
+                        });
+                    }
+                    else
+                    {
+                        int v = RightPremission.Id % 10;
+                        if (v > AllPremissions.Count)
+                        {
+                            AllPremissions.Add(RightPremission);
+                        }
+                        else
+                        {
+                            AllPremissions.Insert(v - 1, RightPremission);
+                        }
+
+                    }
+
+                    RightPremissions.RemoveAt(RightPremissions.ToList().FindIndex(it => it.Id == RightPremission.Id));
+                }
+                // 子菜单
+                else
+                {
+                    // 查找所选子菜单的父菜单
+                    PremissionDm item = RightPremissions.ToList().Find(it => (int)(RightPremission.Id / 10) == it.Id);
+                    // 查找父菜单是否在左侧
+                    int index = AllPremissions.ToList().FindIndex(it => it.Id == item.Id);
+                    // 存在
+                    if (index > -1)
+                    {
+                        ObservableCollection<PremissionDm> a = AllPremissions.ElementAt(index).Children;
+                        int v = RightPremission.Id % 10;
+                        if (v > a.Count)
+                        {
+                            a.Add(RightPremission);
+                        }
+                        else
+                        {
+                            a.Insert(v - 1, RightPremission);
+                        }
+                        item.Children.RemoveAt(item.Children.ToList().FindIndex(it => it.Id == RightPremission.Id));
+
+                        if (item.Children.Count == 0)
+                        {
+                            RightPremissions.RemoveAt(RightPremissions.ToList().FindIndex(it => it.Id == RightPremission.Id));
+                        }
+                    }
+                    // 不存在
+                    else
+                    {
+                        // 拷贝
+                        PremissionDm item2 = DeepCopyByReflect<PremissionDm>(item);
+                        ObservableCollection<PremissionDm> child = new ObservableCollection<PremissionDm>();
+                        child.Add(RightPremission);
+                        item2.Children = child;
+                        int v = item2.Id % 10;
+                        if (v > AllPremissions.Count)
+                        {
+                            AllPremissions.Add(item2);
+                        }
+                        else
+                        {
+                            AllPremissions.Insert(v - 1, item2);
+                        }
+                        item.Children.RemoveAt(item.Children.ToList().FindIndex(it => it.Id == RightPremission.Id));
+                    }
+
+                }
+            });
+        }
+
+        public DelegateCommand AllToRight
+        {
+            get => new DelegateCommand(() =>
+            {
+                RightPremissions = Clone<PremissionDm>(defaultAll);
+                AllPremissions.Clear();
+            });
+        }
+
+        public DelegateCommand AllToLeft
+        {
+            get => new DelegateCommand(() =>
+            {
+                AllPremissions = Clone<PremissionDm>(defaultAll);
+                RightPremissions.Clear();
+            });
+        }
+
+        public DelegateCommand AddRole
+        {
+            get => new DelegateCommand(() =>
+            {
+                Role.Id = 0;
+                Role.MachineId = ConfigurationManager.AppSettings["machineId"] ?? "DM1";
+                Role.Permissions = RightPremissions.ToList();
+                SqlSugarHelper.Db.Insertable<RoleDm>(Role).ExecuteCommand();
+                RequestData();
+            });
+        }
+
+        public DelegateCommand EditRole
+        {
+            get => new DelegateCommand(() =>
+            {
+                Role.Permissions = RightPremissions.ToList();
+                SqlSugarHelper.Db.Updateable<RoleDm>(Role).ExecuteCommand();
+                RequestData();
+            });
+        }
+
+        //这个方法用于拦截请求,continuationCallback(true)就是不拦截，continuationCallback(false)拦截本次操作
+        public void ConfirmNavigationRequest(NavigationContext navigationContext, Action<bool> continuationCallback)
+        {
+            continuationCallback(true);
+        }
+
+
+        //接收导航传过来的参数
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            //查询表格数据
+            RequestData();
+        }
+
+
+
+        void RequestData()
+        {
+            RoleList = SqlSugarHelper.Db.Queryable<RoleDm>()
+                .Where(di => di.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
+                .WhereIF(!String.IsNullOrEmpty(SearchValue), (di) => di.RoleName.Contains(SearchValue??""))
+                .Select(r => r)
+                .ToList()
+                ;
+        }
+
+        //每次导航的时候，该实列用不用重新创建，true是不重新创建,false是重新创建
+        public bool IsNavigationTarget(NavigationContext navigationContext)
+        {
+            return true;
+        }
+
+        //这个方法用于拦截请求
+        public void OnNavigatedFrom(NavigationContext navigationContext)
+        {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/DM_Weight/ViewModels/SelfAddDialogViewModel.cs b/DM_Weight/ViewModels/SelfAddDialogViewModel.cs
new file mode 100644
index 0000000..938c2ba
--- /dev/null
+++ b/DM_Weight/ViewModels/SelfAddDialogViewModel.cs
@@ -0,0 +1,348 @@
+using log4net;
+using log4net.Repository.Hierarchy;
+using Prism.Commands;
+using Prism.Events;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Speech.Synthesis;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using DM_Weight.Models;
+using DM_Weight.msg;
+using DM_Weight.Port;
+using DM_Weight.util;
+using DM_Weight.Views;
+using System.Threading;
+
+namespace DM_Weight.ViewModels
+{
+    public class SelfAddDialogViewModel : BindableBase, IDialogAware, IRegionMemberLifetime
+    {
+
+        private readonly ILog logger = LogManager.GetLogger(typeof(SelfAddDialogViewModel));
+        public string Title => "自选加药";
+
+        //凭证号
+        private string _pzh;
+        public string PZH { get => _pzh; set { SetProperty(ref _pzh, value); } }
+
+        public event Action<IDialogResult> RequestClose;
+
+        private static readonly DateTime Jan1st1970 = new DateTime
+   (1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+
+        private string WindowName = "SelfAddWindow";
+
+        private PortUtil _portUtil;
+        IEventAggregator _eventAggregator;
+
+        public SelfAddDialogViewModel(PortUtil portUtil, IEventAggregator eventAggregator)
+        {
+            _portUtil = portUtil;
+            _eventAggregator = eventAggregator;
+        }
+
+        void DoMyPrismEvent(DeviceMsg msg)
+        {
+
+            if (msg.WindowName.Equals(WindowName))
+            {
+                IGrouping<int, ChannelStock> grouping = enumerator.Current;
+                int DrawerNo = grouping.Key;
+                List<ChannelStock> channelStocks = grouping.ToList();
+
+                switch (msg.EventType)
+                {
+                    // 抽屉打开
+                    case EventType.DRAWEROPEN:
+
+
+                        if (Status == 1)
+                        {
+                            if (channelStocks[0].process == 1)
+                            {
+                                channelStocks.ForEach(it => it.process = 2);
+                            }
+                        }
+
+                        break;
+                    // 抽屉关闭
+                    case EventType.DRAWERCLOSE:
+                        if (Status == 1)
+                        {
+                            if (channelStocks[0].process == 2)
+                            {
+                                channelStocks.ForEach(it => it.process = 3);
+                            }
+                            if (enumerator.MoveNext())
+                            {
+                                OpenOneByOne();
+                            }
+                            // 已经全部取出
+                            else
+                            {
+                                Status = 3;
+                            }
+                        }
+                        break;
+                    // 数量变化
+                    case EventType.UPDATEQUANTITY:
+                        if (Status == 1)
+                        {
+
+                            logger.Info($"抽屉【{DrawerNo}】库位药品数量【{msg.Quantitys}】");
+                        }
+                        break;
+                    // 打开失败
+                    case EventType.OPENERROR:
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = msg.Message,
+                            Type = MsgType.ERROR,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        Status = 0;
+                        break;
+                }
+            }
+
+        }
+
+        private int _status = 0;
+
+        public int Status
+        {
+            get => _status; set => SetProperty(ref _status, value);
+        }
+
+        
+        private List<ChannelStock> _channelStocks;
+
+        public List<ChannelStock> ChannelStocks
+        {
+            get => _channelStocks;
+            set => SetProperty(ref _channelStocks, value);
+        }
+        
+        private IEnumerable<IGrouping<int, ChannelStock>> enumerable;
+        private IEnumerator<IGrouping<int, ChannelStock>> enumerator;
+
+
+        public bool CanCloseDialog()
+        {
+            return Status == 0;
+        }
+
+        public void OnDialogClosed()
+        {
+            // 取消消息订阅
+            _eventAggregator.GetEvent<PortUtilEvent>().Unsubscribe(DoMyPrismEvent);
+        }
+
+        public void OnDialogOpened(IDialogParameters parameters)
+        {
+            _eventAggregator.GetEvent<PortUtilEvent>().Subscribe(DoMyPrismEvent);
+            List<ChannelStock> channelStocks = parameters.GetValue<List<ChannelStock>>("ChannelStocks");
+            ChannelStocks = channelStocks;
+            RequestData();
+        }
+
+        public void RequestData()
+        {
+            enumerable = ChannelStocks.GroupBy(cs => cs.DrawerNo, cs => cs);
+            enumerator = enumerable.GetEnumerator();
+        }
+
+        public DelegateCommand OpenDrawer
+        {
+            get => new DelegateCommand(() =>
+            {
+                if (Status == 0)
+                {
+                    enumerator.MoveNext();
+                    Status = 1;
+                    OpenOneByOne();
+                }
+
+            });
+        }
+
+        private async void OpenOneByOne()
+        {
+            IGrouping<int, ChannelStock> grouping = enumerator.Current;
+            int DrawerNo = grouping.Key;
+            List<ChannelStock> channelStocks = grouping.ToList();
+            channelStocks.ForEach(it => it.process = 1);
+            _portUtil.SpeakAsync("正在打开" + DrawerNo + "号抽屉");
+
+
+            List<ChannelStock> singleChannels = channelStocks.FindAll(it => it.BoardType != 1);
+
+            if (_portUtil.DrawerNo != 0 && _portUtil.DrawerNo < 9 && DrawerNo > 8)
+            {
+                Thread.Sleep(50);
+            }
+            _portUtil.WindowName = WindowName;
+            _portUtil.BoardType = singleChannels.Count > 0 ? singleChannels[0].BoardType : 1;
+            _portUtil.ColNos = singleChannels.Select(it => it.ColNo).ToArray();
+            _portUtil.Stocks = singleChannels.Select(it => it.Quantity).ToArray();
+            _portUtil.DrawerNo = DrawerNo;
+
+            if((singleChannels.Count > 0 ? singleChannels[0].BoardType : 1) == 5)
+            {
+                // 发送加药数量
+                singleChannels.ForEach(it =>
+                {
+                    _portUtil.TakeQuantity(DrawerNo, it.ColNo, it.AddQuantity, it.Quantity + it.AddQuantity);
+                });
+            }
+
+            if ((singleChannels.Count > 0 ? singleChannels[0].BoardType : 1) == 6)
+            {
+                for(int i = 0; i < singleChannels.Count; i++)
+                {
+                    ChannelStock it = singleChannels[i];
+                    _portUtil.ClearCount(it.DrawerNo, it.ColNo);
+                    await Task.Delay(50);
+                }
+            }
+
+            _portUtil.Start();
+        }
+
+        private bool _isFinishClick = false;
+        // 完成按钮
+        public DelegateCommand TakeFinish
+        {
+            get => new DelegateCommand(async () =>
+            {
+                if (!_isFinishClick)
+                {
+                    _isFinishClick = true;
+                    List<ChannelStock> record = ChannelStocks.ToList();
+                    //string InvoiceId = "SELF_" + CurrentTimeMillis();
+                    string InvoiceId = PZH;
+                    var f = SqlSugarHelper.Db.UseTran(() =>
+                    {   
+                        for (int i = 0; i < record.Count; i++)
+                        {
+                            ChannelStock it = record[i];
+                            if (it.BoardType == 6 && it.PosNo == 0)
+                            {
+                                _portUtil.SetNumCount(it.DrawerNo, it.ColNo, it.AddQuantity);
+                            }
+                            // 更新数据 库存信息
+                            SqlSugarHelper.Db.Updateable(new ChannelStock()
+                            {
+                                Quantity = it.Quantity + it.AddQuantity,
+                                PosNo = 1,
+                                ManuNo = it.ManuNo,
+                                EffDate = it.EffDate,
+                                Id = it.Id,
+                            }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate, it.PosNo }).ExecuteCommand();
+                            // 获取更新完库存后的药品库存
+                            List<ChannelStock> nowChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                                .Where(cs => cs.MachineId.Equals(it.MachineId))
+                                .Where(cs => cs.DrugId.Equals(it.DrugId))
+                                .Where(cs => cs.DrawerType == 1)
+                                .ToList();
+
+                            // 保存数据 出/入库记录
+                            SqlSugarHelper.Db.Insertable(new MachineRecord()
+                            {
+                                MachineId = it.MachineId,
+                                DrawerNo = it.DrawerNo,
+                                ColNo = it.ColNo,
+                                DrugId = it.DrugId,
+                                ManuNo = it.ManuNo,
+                                EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
+                                Operator = HomeWindowViewModel.Operator?.Id,
+                                Reviewer = HomeWindowViewModel.Reviewer?.Id,
+                                OperationTime = DateTime.Now,
+                                Quantity = it.AddQuantity,
+                                Type = 1,
+                                InvoiceId = InvoiceId,
+                                StockQuantity = nowChannels.Sum(it => it.Quantity),
+                                ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity)
+                            }).ExecuteCommand();
+                        }
+                        return true;
+                    });
+                    if (f.Data)
+                    {
+                        // 更新屏显库存
+                        List<ChannelStock> singleChannels = record.FindAll(it => it.BoardType != 1);
+                        if ((singleChannels.Count > 0 ? singleChannels[0].BoardType : 1) == 5)
+                        {
+                            singleChannels.ForEach(it =>
+                            {
+                                _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.Quantity + it.AddQuantity);
+                            });
+                        }
+                        
+
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "操作完成，库存已更新",
+                            Type = MsgType.SUCCESS,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    }
+                    if (!f.IsSuccess)
+                    {
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "库存更新失败！",
+                            Type = MsgType.ERROR,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    }
+                    Status = 0;
+                    _isFinishClick = false;
+                    RequestClose?.Invoke(new DialogResult(ButtonResult.OK));
+
+                }
+
+            });
+        }
+
+        public long CurrentTimeMillis()
+        {
+            return (long)(DateTime.UtcNow - Jan1st1970).TotalMilliseconds;
+        }
+
+        // 取消按钮
+        public DelegateCommand CancleTake
+        {
+            get => new DelegateCommand(() =>
+            {
+                RequestData();
+                _portUtil.ResetData();
+                Status = 0;
+            });
+        }
+
+        public DelegateCommand BtnCloseCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                if (Status != 0)
+                {
+                    _portUtil.ResetData();
+                    Status = 0;
+                }
+                //DialogParameters parameters = new DialogParameters();
+                //parameters.Add("",);
+                // 关闭当前窗口
+                RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+            });
+        }
+
+        public bool KeepAlive => false;
+    }
+}
diff --git a/DM_Weight/ViewModels/SelfAddWindowViewModel.cs b/DM_Weight/ViewModels/SelfAddWindowViewModel.cs
new file mode 100644
index 0000000..0d32a55
--- /dev/null
+++ b/DM_Weight/ViewModels/SelfAddWindowViewModel.cs
@@ -0,0 +1,201 @@
+using Prism.Commands;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DM_Weight.Models;
+using DM_Weight.select;
+using DM_Weight.util;
+using Prism.Events;
+using DM_Weight.msg;
+
+namespace DM_Weight.ViewModels
+{
+    public class SelfAddWindowViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime
+    {
+        IDialogService _dialogService;
+        IEventAggregator _eventAggregator;
+
+        public static List<OrderTakeSelect> StaticSelects = new()
+        {
+            new OrderTakeSelect
+            {
+                Code = "DrugName",
+                Name = "药品名称"
+            },
+            new OrderTakeSelect
+            {
+                Code = "PyCode",
+                Name = "拼音码"
+            },
+            new OrderTakeSelect
+            {
+                Code = "DrugBarcode",
+                Name = "药品条码"
+            },
+            new OrderTakeSelect
+            {
+                Code = "DrugId",
+                Name = "药品编码"
+            }
+        };
+
+        public SelfAddWindowViewModel(IDialogService DialogService,IEventAggregator eventAggregator)
+        {
+            _dialogService = DialogService;
+            _eventAggregator = eventAggregator;
+        }
+
+        
+
+        private List<OrderTakeSelect> _selects = StaticSelects;
+
+        public List<OrderTakeSelect> Selects
+        {
+            get { return _selects; }
+            set
+            {
+                SetProperty(ref _selects, value);
+            }
+        }
+
+        private OrderTakeSelect _selectedItem = StaticSelects[0];
+        /// <summary>
+        /// 查询条件 查询字段
+        /// </summary>
+        public OrderTakeSelect SelectedItem
+        {
+            get { return _selectedItem; }
+            set
+            {
+                SetProperty(ref _selectedItem, value);
+                RequestChannelData();
+            }
+        } 
+
+        private string? _searchValue;
+
+        /// <summary>
+        /// 查询条件 查询字段值
+        /// </summary>
+        public string? SearchValue
+        {
+            get { return _searchValue; }
+            set
+            {
+                SetProperty(ref _searchValue, value);
+                RequestChannelData();
+            }
+        }
+
+
+
+
+        private List<ChannelStock> _channelStocks = new();
+
+        public List<ChannelStock> ChannelStocks { get { return _channelStocks; } set { SetProperty(ref _channelStocks, value); } }
+
+        public DelegateCommand QueryCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                RequestChannelData();
+            });
+        }
+
+
+        public DelegateCommand OpenSelfDialog
+        {
+            get => new DelegateCommand(() =>
+            {
+                List<ChannelStock> addChannels = ChannelStocks.FindAll(it => it.AddQuantity > 0).ToList();
+                if (addChannels.Count > 0)
+                {
+                    addChannels.Sort((a, b) =>
+                    {
+                        if ((a.DrawerNo - b.DrawerNo) == 0)
+                        {
+                            return a.ColNo - b.ColNo;
+                        }
+                        return a.DrawerNo - b.DrawerNo;
+                    });
+                    DialogParameters dialogParameters = new DialogParameters();
+                    dialogParameters.Add("ChannelStocks", addChannels);
+                    DialogServiceExtensions.ShowDialogHost(_dialogService, "SelfAddDialog", dialogParameters, DoDialogResult, "RootDialog");
+                }
+                else
+                {
+                    AlertMsg alertMsg = new AlertMsg
+                    {
+                        Message = "请填写加药数量",
+                        Type = MsgType.ERROR
+                    };
+                    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                }
+            });
+        }
+
+        private void DoDialogResult(IDialogResult dialogResult)
+        {
+            // 委托   被动执行     被子窗口执行
+            // dialogResult  第一方面可以拿到任意参数   第二方面   可判断关闭状态
+            if (dialogResult.Result == ButtonResult.OK)
+            {
+                RequestChannelData();
+            }
+            //MessageBox.Show("返回值：" + dialogResult.Result.ToString());
+        }
+
+        public bool KeepAlive => false;
+
+        //这个方法用于拦截请求,continuationCallback(true)就是不拦截，continuationCallback(false)拦截本次操作
+        public void ConfirmNavigationRequest(NavigationContext navigationContext, Action<bool> continuationCallback)
+        {
+            continuationCallback(true);
+        }
+
+
+
+        public void RequestChannelData()
+        {
+            List<ChannelStock> queryData = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                .Includes<DrugInfo>(cs => cs.DrugInfo)
+                .Where(cs => cs.DrugId != null)
+                .Where(cs => cs.DrawerType == 1)
+                .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
+                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugId"), (cs) => cs.DrugId.Contains(SearchValue))
+                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugName"), (cs) => cs.DrugInfo.DrugName.Contains(SearchValue))
+                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("PyCode"), (cs) => cs.DrugInfo.PyCode.Contains(SearchValue))
+                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugBarcode"), (cs) => cs.DrugInfo.DrugBarcode.Contains(SearchValue))
+                .OrderBy(cs => cs.DrugId)
+                .OrderBy(cs => cs.DrawerNo)
+                .OrderBy(cs => cs.ColNo)
+                .ToList();
+            ChannelStocks = queryData;
+        }
+
+        //接收导航传过来的参数  现在是在此处初始化了表格数据
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            RequestChannelData();
+        }
+
+        //每次导航的时候，该实列用不用重新创建，true是不重新创建,false是重新创建
+        public bool IsNavigationTarget(NavigationContext navigationContext)
+        {
+            return true;
+        }
+
+        //这个方法用于拦截请求
+        public void OnNavigatedFrom(NavigationContext navigationContext)
+        {
+
+        }
+    }
+}
diff --git a/DM_Weight/ViewModels/SelfTakeDialogViewModel.cs b/DM_Weight/ViewModels/SelfTakeDialogViewModel.cs
new file mode 100644
index 0000000..1908b3f
--- /dev/null
+++ b/DM_Weight/ViewModels/SelfTakeDialogViewModel.cs
@@ -0,0 +1,327 @@
+using log4net;
+using log4net.Repository.Hierarchy;
+using Prism.Commands;
+using Prism.Events;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Speech.Synthesis;
+using System.Text;
+using System.Threading.Tasks;
+using DM_Weight.Models;
+using DM_Weight.msg;
+using DM_Weight.Port;
+using DM_Weight.util;
+using System.Threading;
+
+namespace DM_Weight.ViewModels
+{
+    public class SelfTakeDialogViewModel : BindableBase, IDialogAware, IRegionMemberLifetime
+    {
+
+        private readonly ILog logger = LogManager.GetLogger(typeof(SelfTakeDialogViewModel));
+        public string Title => "自选取药";
+
+        public event Action<IDialogResult> RequestClose;
+
+        private static readonly DateTime Jan1st1970 = new DateTime
+   (1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+
+        private string WindowName = "SelfTakeWindow";
+
+        private PortUtil _portUtil;
+        IEventAggregator _eventAggregator;
+
+        public SelfTakeDialogViewModel(PortUtil portUtil, IEventAggregator eventAggregator)
+        {
+            _portUtil = portUtil;
+            _eventAggregator = eventAggregator;
+        }
+
+        void DoMyPrismEvent(DeviceMsg msg)
+        {
+
+            if (msg.WindowName.Equals(WindowName))
+            {
+                IGrouping<int, ChannelStock> grouping = enumerator.Current;
+                int DrawerNo = grouping.Key;
+                List<ChannelStock> channelStocks = grouping.ToList();
+
+                switch (msg.EventType)
+                {
+                    // 抽屉打开
+                    case EventType.DRAWEROPEN:
+
+
+                        if (Status == 1)
+                        {
+                            if (channelStocks[0].process == 1)
+                            {
+                                channelStocks.ForEach(it => it.process = 2);
+                            }
+                        }
+
+                        break;
+                    // 抽屉关闭
+                    case EventType.DRAWERCLOSE:
+                        if (Status == 1)
+                        {
+                            if (channelStocks[0].process == 2)
+                            {
+                                channelStocks.ForEach(it => it.process = 3);
+                            }
+                            IGrouping<int, ChannelStock> groupingBefore = enumerator.Current;
+                            int DrawerNoBefore = grouping.Key;
+                            if (enumerator.MoveNext())
+                            {
+
+                                IGrouping<int, ChannelStock> groupingAfter = enumerator.Current;
+                                int DrawerNoAfter = grouping.Key;
+                                if (DrawerNoBefore < 9 && DrawerNoAfter > 8)
+                                {
+                                    Thread.Sleep(50);
+                                }
+                                OpenOneByOne();
+                            }
+                            // 已经全部取出
+                            else
+                            {
+                                Status = 3;
+                            }
+                        }
+                        break;
+                    // 数量变化
+                    case EventType.UPDATEQUANTITY:
+                        if (Status == 1)
+                        {
+                            logger.Info($"抽屉【{DrawerNo}】库位药品数量【{msg.Quantitys}】");
+                        }
+                        break;
+                    // 打开失败
+                    case EventType.OPENERROR:
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = msg.Message,
+                            Type = MsgType.ERROR
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        Status = 0;
+                        break;
+                }
+            }
+
+        }
+
+        private int _status = 0;
+
+        public int Status
+        {
+            get => _status; set => SetProperty(ref _status, value);
+        }
+
+
+        private List<ChannelStock> _channelStocks;
+
+        public List<ChannelStock> ChannelStocks
+        {
+            get => _channelStocks;
+            set => SetProperty(ref _channelStocks, value);
+        }
+
+        private IEnumerable<IGrouping<int, ChannelStock>> enumerable;
+        private IEnumerator<IGrouping<int, ChannelStock>> enumerator;
+
+
+        public bool CanCloseDialog()
+        {
+            return Status == 0;
+        }
+
+        public void OnDialogClosed()
+        {
+            // 取消消息订阅
+            _eventAggregator.GetEvent<PortUtilEvent>().Unsubscribe(DoMyPrismEvent);
+        }
+
+        public void OnDialogOpened(IDialogParameters parameters)
+        {
+            _eventAggregator.GetEvent<PortUtilEvent>().Subscribe(DoMyPrismEvent);
+            List<ChannelStock> channelStocks = parameters.GetValue<List<ChannelStock>>("ChannelStocks");
+            ChannelStocks = channelStocks;
+            RequestData();
+        }
+
+        public void RequestData()
+        {
+            enumerable = ChannelStocks.GroupBy(cs => cs.DrawerNo, cs => cs);
+            enumerator = enumerable.GetEnumerator();
+        }
+
+        public DelegateCommand OpenDrawer
+        {
+            get => new DelegateCommand(() =>
+            {
+                if (Status == 0)
+                {
+                    enumerator.MoveNext();
+                    Status = 1;
+                    OpenOneByOne();
+                }
+
+            });
+        }
+
+        private void OpenOneByOne()
+        {
+            IGrouping<int, ChannelStock> grouping = enumerator.Current;
+            int DrawerNo = grouping.Key;
+            List<ChannelStock> channelStocks = grouping.ToList();
+            channelStocks.ForEach(it => it.process = 1);
+            _portUtil.SpeakAsync("正在打开" + DrawerNo + "号抽屉");
+
+
+            List<ChannelStock> singleChannels = channelStocks.FindAll(it => it.BoardType != 1);
+
+            //if (_portUtil.DrawerNo != 0 && _portUtil.DrawerNo < 9 && DrawerNo > 8)
+            //{
+                //Thread.Sleep(50);
+            //}
+            // 发送取药数量
+            singleChannels.ForEach(it =>
+            {
+                _portUtil.TakeQuantity(DrawerNo, it.ColNo, it.TakeQuantity, it.Quantity - it.TakeQuantity);
+            });
+            _portUtil.WindowName = WindowName;
+            _portUtil.BoardType = singleChannels.Count > 0 ? singleChannels[0].BoardType : 1;
+            _portUtil.ColNos = singleChannels.Select(it => it.ColNo).ToArray();
+            _portUtil.Stocks = singleChannels.Select(it => it.Quantity).ToArray();
+            _portUtil.DrawerNo = DrawerNo;
+            _portUtil.Start();
+        }
+
+        private bool _isFinishClick = false;
+        // 完成按钮
+        public DelegateCommand TakeFinish
+        {
+            get => new DelegateCommand(() =>
+            {
+                if (!_isFinishClick)
+                {
+                    _isFinishClick = true;
+                    List<ChannelStock> record = ChannelStocks.ToList();
+                    string InvoiceId = "SELF_" + CurrentTimeMillis();
+                    var f = SqlSugarHelper.Db.UseTran(() =>
+                    {
+                        for (int i = 0; i < record.Count; i++)
+                        {
+                            ChannelStock it = record[i];
+                            // 更新数据 库存信息
+                            SqlSugarHelper.Db.Updateable(new ChannelStock()
+                            {
+                                Quantity = it.Quantity - it.TakeQuantity,
+                                ManuNo = it.ManuNo,
+                                EffDate = it.EffDate,
+                                Id = it.Id,
+                            }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate }).ExecuteCommand();
+                            // 获取更新完库存后的药品库存
+                            List<ChannelStock> nowChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                                .Where(cs => cs.MachineId.Equals(it.MachineId))
+                                .Where(cs => cs.DrugId.Equals(it.DrugId))
+                                .Where(cs => cs.DrawerType == 1)
+                                .ToList();
+
+                            // 保存数据 出/入库记录
+                            SqlSugarHelper.Db.Insertable(new MachineRecord()
+                            {
+                                MachineId = it.MachineId,
+                                DrawerNo = it.DrawerNo,
+                                ColNo = it.ColNo,
+                                DrugId = it.DrugId,
+                                ManuNo = it.ManuNo,
+                                EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
+                                Operator = HomeWindowViewModel.Operator?.Id,
+                                OperationTime = DateTime.Now,
+                                Quantity = it.TakeQuantity,
+                                Reviewer = HomeWindowViewModel.Reviewer?.Id,
+                                Type = 2,
+                                InvoiceId = InvoiceId,
+                                StockQuantity = nowChannels.Sum(it => it.Quantity),
+                                ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity)
+                            }).ExecuteCommand();
+                        }
+                        return true;
+                    });
+                    if (f.Data)
+                    {
+                        // 更新屏显库存
+                        List<ChannelStock> singleChannels = record.FindAll(it => it.BoardType != 1);
+                        if ((singleChannels.Count > 0 ? singleChannels[0].BoardType : 1) == 5)
+                        {
+                            singleChannels.ForEach(it =>
+                            {
+                                _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.Quantity - it.TakeQuantity);
+                            });
+                        }
+
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "操作完成，库存已更新",
+                            Type = MsgType.SUCCESS,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    }
+                    if (!f.IsSuccess)
+                    {
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "库存更新失败！",
+                            Type = MsgType.ERROR,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    }
+                    Status = 0;
+                    _isFinishClick = false;
+                    RequestClose?.Invoke(new DialogResult(ButtonResult.OK));
+
+                }
+
+            });
+        }
+
+        public long CurrentTimeMillis()
+        {
+            return (long)(DateTime.UtcNow - Jan1st1970).TotalMilliseconds;
+        }
+
+        // 取消按钮
+        public DelegateCommand CancleTake
+        {
+            get => new DelegateCommand(() =>
+            {
+                _portUtil.ResetData();
+                Status = 0;
+            });
+        }
+
+        public DelegateCommand BtnCloseCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                if (Status != 0)
+                {
+                    _portUtil.ResetData();
+                    Status = 0;
+                }
+                //DialogParameters parameters = new DialogParameters();
+                //parameters.Add("",);
+                // 关闭当前窗口
+                RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+            });
+        }
+
+        public bool KeepAlive => false;
+    }
+}
diff --git a/DM_Weight/ViewModels/SelfTakeDrugWindowViewModel.cs b/DM_Weight/ViewModels/SelfTakeDrugWindowViewModel.cs
new file mode 100644
index 0000000..178d03f
--- /dev/null
+++ b/DM_Weight/ViewModels/SelfTakeDrugWindowViewModel.cs
@@ -0,0 +1,192 @@
+using Prism.Commands;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DM_Weight.Models;
+using DM_Weight.select;
+using DM_Weight.util;
+using DM_Weight.msg;
+using Prism.Events;
+
+namespace DM_Weight.ViewModels
+{
+    public class SelfTakeDrugWindowViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime
+    {
+        IDialogService _dialogService;
+        IEventAggregator _eventAggregator;
+
+        public static List<OrderTakeSelect> StaticSelects = new()
+        {
+            new OrderTakeSelect
+            {
+                Code = "DrugName",
+                Name = "药品名称"
+            },
+            new OrderTakeSelect
+            {
+                Code = "PyCode",
+                Name = "拼音码"
+            },
+            new OrderTakeSelect
+            {
+                Code = "DrugBarcode",
+                Name = "药品条码"
+            },
+            new OrderTakeSelect
+            {
+                Code = "DrugId",
+                Name = "药品编码"
+            }
+        };
+
+        public SelfTakeDrugWindowViewModel(IDialogService DialogService, IEventAggregator eventAggregator)
+        {
+            _dialogService = DialogService;
+            _eventAggregator= eventAggregator;
+        }
+
+
+
+        private List<OrderTakeSelect> _selects = StaticSelects;
+
+        public List<OrderTakeSelect> Selects
+        {
+            get { return _selects; }
+            set
+            {
+                SetProperty(ref _selects, value);
+            }
+        }
+
+        private OrderTakeSelect _selectedItem = StaticSelects[0];
+        /// <summary>
+        /// 查询条件 查询字段
+        /// </summary>
+        public OrderTakeSelect SelectedItem
+        {
+            get { return _selectedItem; }
+            set
+            {
+                SetProperty(ref _selectedItem, value);
+                RequestChannelData();
+            }
+        }
+
+        private string? _searchValue;
+
+        /// <summary>
+        /// 查询条件 查询字段值
+        /// </summary>
+        public string? SearchValue
+        {
+            get { return _searchValue; }
+            set
+            {
+                SetProperty(ref _searchValue, value);
+                RequestChannelData();
+            }
+        }
+
+
+        private List<ChannelStock> _channelStocks = new();
+
+        public List<ChannelStock> ChannelStocks { get { return _channelStocks; } set { SetProperty(ref _channelStocks, value); } }
+
+
+        public DelegateCommand OpenSelfDialog
+        {
+            get => new DelegateCommand(() =>
+            {
+                List<ChannelStock> takeChannels = ChannelStocks.FindAll(it => it.TakeQuantity > 0).ToList();
+                if (takeChannels.Count > 0)
+                {
+                    takeChannels.Sort((a, b) =>
+                    {
+                        if ((a.DrawerNo - b.DrawerNo) == 0)
+                        {
+                            return a.ColNo - b.ColNo;
+                        }
+                        return a.DrawerNo - b.DrawerNo;
+                    });
+                    DialogParameters dialogParameters = new DialogParameters();
+                    dialogParameters.Add("ChannelStocks", takeChannels);
+                    DialogServiceExtensions.ShowDialogHost(_dialogService, "SelfTakeDialog", dialogParameters, DoDialogResult, "RootDialog");
+                }
+                else
+                {
+                    AlertMsg alertMsg = new AlertMsg
+                    {
+                        Message = "请填写取药数量",
+                        Type = MsgType.ERROR
+                    };
+                    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                }
+
+            });
+        }
+
+        private void DoDialogResult(IDialogResult dialogResult)
+        {
+            // 委托   被动执行     被子窗口执行
+            // dialogResult  第一方面可以拿到任意参数   第二方面   可判断关闭状态
+            if (dialogResult.Result == ButtonResult.OK)
+            {
+                RequestChannelData();
+            }
+            //MessageBox.Show("返回值：" + dialogResult.Result.ToString());
+        }
+
+        public bool KeepAlive => false;
+
+        //这个方法用于拦截请求,continuationCallback(true)就是不拦截，continuationCallback(false)拦截本次操作
+        public void ConfirmNavigationRequest(NavigationContext navigationContext, Action<bool> continuationCallback)
+        {
+            continuationCallback(true);
+        }
+
+
+
+        public void RequestChannelData()
+        {
+            List<ChannelStock> queryData = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                .Includes<DrugInfo>(cs => cs.DrugInfo)
+                .Where(cs => cs.DrugId != null)
+                .Where(cs => cs.DrawerType == 1)
+                .Where(cs => cs.Quantity > 0)
+                .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
+                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugId"), (cs) => cs.DrugId.Contains(SearchValue))
+                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugName"), (cs) => cs.DrugInfo.DrugName.Contains(SearchValue))
+                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("PyCode"), (cs) => cs.DrugInfo.PyCode.Contains(SearchValue))
+                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugBarcode"), (cs) => cs.DrugInfo.DrugBarcode.Contains(SearchValue))
+                .OrderBy(cs => cs.DrugId)
+                .OrderBy(cs => cs.DrawerNo)
+                .OrderBy(cs => cs.ColNo)
+                .ToList();
+            ChannelStocks = queryData;
+        }
+
+        //接收导航传过来的参数  现在是在此处初始化了表格数据
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            RequestChannelData();
+        }
+
+        //每次导航的时候，该实列用不用重新创建，true是不重新创建,false是重新创建
+        public bool IsNavigationTarget(NavigationContext navigationContext)
+        {
+            return true;
+        }
+
+        //这个方法用于拦截请求
+        public void OnNavigatedFrom(NavigationContext navigationContext)
+        {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/DM_Weight/ViewModels/SettingWindowViewModel.cs b/DM_Weight/ViewModels/SettingWindowViewModel.cs
new file mode 100644
index 0000000..5ea9ec4
--- /dev/null
+++ b/DM_Weight/ViewModels/SettingWindowViewModel.cs
@@ -0,0 +1,83 @@
+using Prism.Commands;
+using Prism.Mvvm;
+using Prism.Regions;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DM_Weight.select;
+using System.Xml;
+
+namespace DM_Weight.ViewModels
+{
+    public class SettingWindowViewModel : BindableBase, IRegionMemberLifetime
+    {
+        public bool KeepAlive => false;
+        public static List<OrderTakeSelect> defaultKeyValuePairs = new()
+        {
+            new OrderTakeSelect() { Code = "operator", Name = "操作人" },
+            new OrderTakeSelect() { Code = "reviewer", Name = "审核人" }
+        };
+
+        public List<OrderTakeSelect> keyValuePairs
+        {
+            get { return defaultKeyValuePairs; }
+        }
+
+        public static string _defaultLoginMode = string.Empty;// ConfigurationManager.AppSettings["loginMode"]??"1";
+
+        public static string _defaultFirstLogin = string.Empty;//ConfigurationManager.AppSettings["firstLogin"] ?? "operator";
+
+        private bool _loginMode = false;// _defaultLoginMode.Equals("2");
+        public bool LoginMode { get => _loginMode; set => SetProperty(ref _loginMode, value); }
+
+        private string _firstLogin = _defaultFirstLogin;
+        public string FirstLogin
+        {
+            get => _firstLogin; set => SetProperty(ref _firstLogin, value);
+        }
+
+         
+        public SettingWindowViewModel()
+        {
+            FirstLogin = ReadAppSetting("firstLogin"); //ConfigurationManager.AppSettings["firstLogin"] ?? "operator";
+            _defaultLoginMode = ReadAppSetting("loginMode");
+            _defaultFirstLogin = ReadAppSetting("firstLogin");
+            _loginMode= _defaultLoginMode.Equals("2");
+        }
+
+        public DelegateCommand ResetConfigCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                var l = LoginMode ? "2" : "1";
+                if (!l.Equals(_defaultLoginMode))
+                {
+                    Configuration _configuration = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
+                    _configuration.AppSettings.Settings["loginMode"].Value = l;
+                    _configuration.Save();
+                    ConfigurationManager.RefreshSection("loginMode");
+                }
+                if (LoginMode && !FirstLogin.Equals(_defaultFirstLogin))
+                {
+                    Configuration _configuration = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
+                    _configuration.AppSettings.Settings["firstLogin"].Value = FirstLogin;
+                    _configuration.Save();
+                    ConfigurationManager.RefreshSection("firstLogin");
+                }
+            });
+        }
+        //手动实现调用配置的逻辑 规避修改配置文件后不起作用的问题
+        public string ReadAppSetting(string key)
+        {
+            string xPath = "/configuration/appSettings//add[@key='" + key + "']";
+            XmlDocument doc = new XmlDocument();
+            string exeFileName = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
+            doc.Load(exeFileName + ".dll.config");
+            XmlNode node = doc.SelectSingleNode(xPath);
+            return node.Attributes["value"].Value.ToString();
+        }
+    }
+}
diff --git a/DM_Weight/ViewModels/ShowMessageDialogViewModel.cs b/DM_Weight/ViewModels/ShowMessageDialogViewModel.cs
new file mode 100644
index 0000000..28ca179
--- /dev/null
+++ b/DM_Weight/ViewModels/ShowMessageDialogViewModel.cs
@@ -0,0 +1,54 @@
+using DM_Weight.Models;
+using DM_Weight.msg;
+using Prism.Commands;
+using Prism.Mvvm;
+using Prism.Services.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Interop;
+
+namespace DM_Weight.ViewModels
+{
+    internal class ShowMessageDialogViewModel :BindableBase, IDialogAware
+    {
+        public string Title => strPara;
+
+        private string _msg;
+        public string Msg { get => _msg; set { SetProperty(ref _msg, value); } }
+
+        public event Action<IDialogResult> RequestClose;
+
+        public bool CanCloseDialog()
+        {
+            return true;
+        }
+
+        public void OnDialogClosed()
+        {
+            
+        }
+        string strPara=string.Empty;
+        public void OnDialogOpened(IDialogParameters parameters)
+        {
+            if (parameters.ContainsKey("msgInfo"))
+            {
+                List<string> strPara = parameters.GetValue<List<string>>("msgInfo");
+                Msg = strPara[0];
+            }
+        }
+
+        public DelegateCommand SaveCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                //DialogParameters parameters = new DialogParameters();
+                //parameters.Add("",);
+                // 关闭当前窗口
+                RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+            });
+        }
+    }
+}
diff --git a/DM_Weight/ViewModels/StockListWindowViewModel.cs b/DM_Weight/ViewModels/StockListWindowViewModel.cs
new file mode 100644
index 0000000..23e13d5
--- /dev/null
+++ b/DM_Weight/ViewModels/StockListWindowViewModel.cs
@@ -0,0 +1,199 @@
+using Prism.Commands;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Documents;
+using DM_Weight.Models;
+using DM_Weight.Report;
+using DM_Weight.select;
+using DM_Weight.util;
+using System.ComponentModel;
+using System.Windows.Data;
+
+namespace DM_Weight.ViewModels
+{
+    public class StockListWindowViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime
+    {
+
+        public static List<OrderTakeSelect> StaticSelects = new()
+        {
+            new OrderTakeSelect
+            {
+                Code = "DrugName",
+                Name = "药品名称"
+            },
+            new OrderTakeSelect
+            {
+                Code = "PyCode",
+                Name = "拼音码"
+            },
+            new OrderTakeSelect
+            {
+                Code = "DrugBarcode",
+                Name = "药品条码"
+            },
+            new OrderTakeSelect
+            {
+                Code = "DrugId",
+                Name = "药品编码"
+            }
+        };
+
+        private List<OrderTakeSelect> _selects = StaticSelects;
+
+        public List<OrderTakeSelect> Selects
+        {
+            get { return _selects; }
+            set
+            {
+                SetProperty(ref _selects, value);
+            }
+        }
+
+        private OrderTakeSelect _selectedItem = StaticSelects[0];
+        /// <summary>
+        /// 查询条件 查询字段
+        /// </summary>
+        public OrderTakeSelect SelectedItem
+        {
+            get { return _selectedItem; }
+            set
+            {
+                SetProperty(ref _selectedItem, value);
+                RequestData();
+            }
+        }
+
+        private string? _searchValue;
+
+        /// <summary>
+        /// 查询条件 查询字段值
+        /// </summary>
+        public string? SearchValue
+        {
+            get { return _searchValue; }
+            set
+            {
+                SetProperty(ref _searchValue, value);
+                RequestData();
+            }
+        }
+
+        IDialogService _dialogService;
+        public StockListWindowViewModel(IDialogService dialogService)
+        {
+            _dialogService = dialogService;
+        }
+        private ChannelStock? _selectedChannel;
+
+        public ChannelStock? SelectedChannel
+        {
+            get => _selectedChannel;
+            set => SetProperty(ref _selectedChannel, value);
+        }
+
+        private List<ChannelStock>? _channelStocks = new();
+
+        public List<ChannelStock>? ChannelStocks
+        {
+            get => _channelStocks;
+            set => SetProperty(ref _channelStocks, value);
+        }
+
+        public DelegateCommand BindingChannelDialog
+        {
+            get => new DelegateCommand(() =>
+            {
+                DialogParameters dialogParameters = new DialogParameters();
+                DialogServiceExtensions.ShowDialogHost(_dialogService, "BindingChannelNewDialog", dialogParameters, DoDialogResult, "RootDialog");
+            });
+        }
+
+
+        public DelegateCommand QueryCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                RequestData();
+            });
+        }
+
+        private void DoDialogResult(IDialogResult dialogResult)
+        {
+            // 委托   被动执行     被子窗口执行
+            // dialogResult  第一方面可以拿到任意参数   第二方面   可判断关闭状态
+            //if (dialogResult.Result == ButtonResult.OK)
+            //{
+                RequestData();
+            //}
+            //MessageBox.Show("返回值：" + dialogResult.Result.ToString());
+        }
+
+        public DelegateCommand Download
+        {
+            get => new DelegateCommand(() =>
+            {
+                GridReportUtil.PrintReportStock();
+            });
+        }
+
+
+        public bool KeepAlive => false;
+
+       
+
+        //这个方法用于拦截请求,continuationCallback(true)就是不拦截，continuationCallback(false)拦截本次操作
+        public void ConfirmNavigationRequest(NavigationContext navigationContext, Action<bool> continuationCallback)
+        {
+            continuationCallback(true);
+        }
+
+
+        public void RequestData()
+        {
+            ChannelStocks.Clear();
+            List<ChannelStock> q = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                .Includes<DrugInfo>(cs => cs.DrugInfo)
+                .Where(cs => cs.DrawerType == 1)
+                .Where(cs =>cs.DrugId != null)
+                .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
+                
+                .WhereIF(!String.IsNullOrEmpty(SearchValue),cs => cs.DrugInfo.DrugName == SearchValue)
+                .OrderBy(cs => cs.DrugId)
+                .OrderBy(cs => cs.DrawerNo)
+                .OrderBy(cs => cs.ColNo)
+                .ToList();
+
+            ICollectionView vw = CollectionViewSource.GetDefaultView(q);
+            vw.GroupDescriptions.Add(new PropertyGroupDescription("DrugInfo"));
+            ChannelStocks = q;
+           
+        }
+
+        //接收导航传过来的参数  现在是在此处初始化了表格数据
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            RequestData();
+        }
+
+
+        //每次导航的时候，该实列用不用重新创建，true是不重新创建,false是重新创建
+        public bool IsNavigationTarget(NavigationContext navigationContext)
+        {
+            return true;
+        }
+
+        //这个方法用于拦截请求
+        public void OnNavigatedFrom(NavigationContext navigationContext)
+        {
+
+        }
+    }
+}
diff --git a/DM_Weight/ViewModels/TakeDrugControlViewModel.cs b/DM_Weight/ViewModels/TakeDrugControlViewModel.cs
new file mode 100644
index 0000000..f98369a
--- /dev/null
+++ b/DM_Weight/ViewModels/TakeDrugControlViewModel.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.ViewModels
+{
+    public class TakeDrugControlViewModel
+    {
+    }
+}
diff --git a/DM_Weight/ViewModels/UserManagerWindowViewModel.cs b/DM_Weight/ViewModels/UserManagerWindowViewModel.cs
new file mode 100644
index 0000000..2ecadba
--- /dev/null
+++ b/DM_Weight/ViewModels/UserManagerWindowViewModel.cs
@@ -0,0 +1,198 @@
+using MaterialDesignThemes.Wpf;
+using Prism.Commands;
+using Prism.Events;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using DM_Weight.Models;
+using DM_Weight.select;
+using DM_Weight.util;
+
+namespace DM_Weight.ViewModels
+{
+    public class UserManagerWindowViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime
+    {
+        private int _pageNum = 1;
+        public int PageNum
+        {
+            get => _pageNum;
+            set
+            {
+                SetProperty(ref _pageNum, value);
+                RequestData();
+            }
+        }
+
+        private int _pageCount = 1;
+        public int PageCount
+        {
+            get => _pageCount;
+            set
+            {
+                SetProperty(ref _pageCount, value);
+            }
+        }
+
+        private int _pageSize = 8;
+        public int PageSize
+        {
+            get => _pageSize;
+            set
+            {
+                SetProperty(ref _pageSize, value);
+            }
+        }
+
+        private int _totalCount = 0;
+        public int TotalCount
+        {
+            get => _totalCount;
+            set
+            {
+                SetProperty(ref _totalCount, value);
+            }
+        }
+        private List<UserList> _userList;
+        public List<UserList> UserList
+        {
+            get { return _userList; }
+            set { SetProperty(ref _userList, value); }
+        }
+        private UserList? _user;
+        public UserList? User
+        {
+            get { return _user; }
+            set { SetProperty(ref _user, value); }
+        }
+        private readonly IDialogService _dialogService;
+
+        public UserManagerWindowViewModel(IDialogService dialogService)
+        {
+            _dialogService = dialogService;
+        }
+
+        private string? _searchValue;
+
+        /// <summary>
+        /// 查询条件 查询字段值
+        /// </summary>
+        public string? SearchValue
+        {
+            get { return _searchValue; }
+            set
+            {
+                SetProperty(ref _searchValue, value);
+                RequestData();
+            }
+        }
+        public bool KeepAlive => false;
+
+
+        public DelegateCommand Query
+        {
+            get => new DelegateCommand(() =>
+            {
+                RequestData();
+            });
+        }
+
+
+
+         public DelegateCommand OpenFingerDialog
+        {
+            get => new DelegateCommand(() =>
+            {
+                DialogParameters dialogParameters = new DialogParameters();
+                dialogParameters.Add("User", User);
+                DialogServiceExtensions.ShowDialogHost(_dialogService, "FingerprintDialog", dialogParameters, DoDialogResult, "RootDialog");
+            });
+        }
+
+        public DelegateCommand OpenEditUserDialog
+        {
+            get => new DelegateCommand(() =>
+            {
+                DialogParameters dialogParameters = new DialogParameters();
+                dialogParameters.Add("User", User);
+                DialogServiceExtensions.ShowDialogHost(_dialogService, "EditUserDialog", dialogParameters, DoDialogResult2, "RootDialog");
+            });
+        }
+
+        public DelegateCommand OpenInsertUserDialog
+        {
+            get => new DelegateCommand(() =>
+            {
+                DialogParameters dialogParameters = new DialogParameters();
+                DialogServiceExtensions.ShowDialogHost(_dialogService, "EditUserDialog", dialogParameters, DoDialogResult2, "RootDialog");
+            });
+        }
+
+        private void DoDialogResult(IDialogResult dialogResult)
+        {
+            // 委托   被动执行     被子窗口执行
+            // dialogResult  第一方面可以拿到任意参数   第二方面   可判断关闭状态
+            if (dialogResult.Result == ButtonResult.OK)
+            {
+                RequestData();
+            }
+        }
+        private void DoDialogResult2(IDialogResult dialogResult)
+        {
+            // 委托   被动执行     被子窗口执行
+            // dialogResult  第一方面可以拿到任意参数   第二方面   可判断关闭状态
+            if (dialogResult.Result == ButtonResult.OK)
+            {
+                RequestData();
+            }
+        }
+
+        //这个方法用于拦截请求,continuationCallback(true)就是不拦截，continuationCallback(false)拦截本次操作
+        public void ConfirmNavigationRequest(NavigationContext navigationContext, Action<bool> continuationCallback)
+        {
+            continuationCallback(true);
+        }
+
+
+        //接收导航传过来的参数
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            //查询表格数据
+            RequestData();
+        }
+
+
+
+        void RequestData()
+        {
+            int totalcount = 0;
+            UserList = SqlSugarHelper.Db.Queryable<UserList>()
+                .Includes<RoleDm>(ul => ul.Role)
+                .Where(ul => ul.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
+                .WhereIF(!String.IsNullOrEmpty(SearchValue) , (di) => di.Nickname.Contains(SearchValue))
+                .ToPageList(PageNum, PageSize, ref totalcount)
+                //.ToList()
+                ;
+            TotalCount = totalcount;
+        }
+
+        //每次导航的时候，该实列用不用重新创建，true是不重新创建,false是重新创建
+        public bool IsNavigationTarget(NavigationContext navigationContext)
+        {
+            return true;
+        }
+
+        //这个方法用于拦截请求
+        public void OnNavigatedFrom(NavigationContext navigationContext)
+        {
+
+        }
+    }
+}
diff --git a/DM_Weight/Views/AddDrugControl.xaml b/DM_Weight/Views/AddDrugControl.xaml
new file mode 100644
index 0000000..81f3b03
--- /dev/null
+++ b/DM_Weight/Views/AddDrugControl.xaml
@@ -0,0 +1,395 @@
+<UserControl x:Class="DM_Weight.Views.AddDrugControl"
+             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: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" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <UserControl.Resources>
+        <convert:QuantityCountConverter x:Key="QuantityCountConverter" />
+        <convert:BoardTypeConverter x:Key="BoardTypeConverter" />
+        <convert:DrawerSelectConverter x:Key="DrawerSelectConverter" />
+        <convert:StatusConverter x:Key="StatusConverter" />
+        <convert:InputQuantityConverter x:Key="InputQuantityConverter" />
+        <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.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition />
+        </Grid.ColumnDefinitions>
+
+        <Grid Margin="0" Grid.Column="0"  Width="280" Height="570"  Visibility="{Binding Is8Drawer, Converter={StaticResource BooleanToVisibilityConverter}}">
+            <Grid.Background>
+                <ImageBrush ImageSource="/Images/box.png" />
+            </Grid.Background>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="200" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Grid Grid.Row="1">
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <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>
+                <Button Grid.Row="0" Width="210" Content="1" Command="{Binding UpdateDrawerNo}" CommandParameter="1" />
+                <Button Grid.Row="1" Width="210" Content="2" Command="{Binding UpdateDrawerNo}" CommandParameter="2" />
+                <Button Grid.Row="2" Width="210" Content="3" Command="{Binding UpdateDrawerNo}" CommandParameter="3" />
+                <Button Grid.Row="3" Width="210" Content="4" Command="{Binding UpdateDrawerNo}" CommandParameter="4" />
+                <Button Grid.Row="4" Width="210" Content="5" Command="{Binding UpdateDrawerNo}" CommandParameter="5" />
+                <Button Grid.Row="5" Width="210" Content="6" Command="{Binding UpdateDrawerNo}" CommandParameter="6" />
+                <Button Grid.Row="6" Width="210" Content="7" Command="{Binding UpdateDrawerNo}" CommandParameter="7" />
+                <Button Grid.Row="7" Width="210" Content="8" Command="{Binding UpdateDrawerNo}" CommandParameter="8" />
+
+            </Grid>
+        </Grid>
+        <Grid Margin="0" Grid.Column="1" Width="300" Height="570" Visibility="{Binding Is16Drawer, Converter={StaticResource BooleanToVisibilityConverter}}">
+            <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.Background>
+                <ImageBrush ImageSource="/Images/box-16.jpg" />
+            </Grid.Background>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="200" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Grid Margin="10 0 0 0"  Visibility="{Binding Is17Drawer, Converter={StaticResource BooleanToVisibilityConverter}}" Grid.Row="0">
+                <Button  Width="110" Content="17" HorizontalAlignment="Left" Command="{Binding UpdateDrawerNo}" CommandParameter="17" />
+            </Grid>
+
+            <Grid Grid.Row="1">
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+
+                <Button Grid.Row="0" Grid.Column="0" Width="120" Content="1" Command="{Binding UpdateDrawerNo}" CommandParameter="1" />
+                <Button Grid.Row="1" Grid.Column="0" Width="120" Content="2" Command="{Binding UpdateDrawerNo}" CommandParameter="2" />
+                <Button Grid.Row="2" Grid.Column="0" Width="120" Content="3" Command="{Binding UpdateDrawerNo}" CommandParameter="3" />
+                <Button Grid.Row="3" Grid.Column="0" Width="120" Content="4" Command="{Binding UpdateDrawerNo}" CommandParameter="4" />
+                <Button Grid.Row="4" Grid.Column="0" Width="120" Content="5" Command="{Binding UpdateDrawerNo}" CommandParameter="5" />
+                <Button Grid.Row="5" Grid.Column="0" Width="120" Content="6" Command="{Binding UpdateDrawerNo}" CommandParameter="6" />
+                <Button Grid.Row="6" Grid.Column="0" Width="120" Content="7" Command="{Binding UpdateDrawerNo}" CommandParameter="7" />
+                <Button Grid.Row="7" Grid.Column="0" Width="120" Content="8" Command="{Binding UpdateDrawerNo}" CommandParameter="8" />
+
+                <Button Grid.Row="0" Grid.Column="1" Width="120" Content="9" Command="{Binding UpdateDrawerNo}" CommandParameter="9" />
+                <Button Grid.Row="1" Grid.Column="1" Width="120" Content="10" Command="{Binding UpdateDrawerNo}" CommandParameter="10" />
+                <Button Grid.Row="2" Grid.Column="1" Width="120" Content="11" Command="{Binding UpdateDrawerNo}" CommandParameter="11" />
+                <Button Grid.Row="3" Grid.Column="1" Width="120" Content="12" Command="{Binding UpdateDrawerNo}" CommandParameter="12" />
+                <Button Grid.Row="4" Grid.Column="1" Width="120" Content="13" Command="{Binding UpdateDrawerNo}" CommandParameter="13" />
+                <Button Grid.Row="5" Grid.Column="1" Width="120" Content="14" Command="{Binding UpdateDrawerNo}" CommandParameter="14" />
+                <Button Grid.Row="6" Grid.Column="1" Width="120" Content="15" Command="{Binding UpdateDrawerNo}" CommandParameter="15" />
+                <Button Grid.Row="7" Grid.Column="1" Width="120" Content="16" Command="{Binding UpdateDrawerNo}" CommandParameter="16" />
+
+            </Grid>
+        </Grid>
+        <Grid Grid.Column="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <StackPanel Grid.Row="0" Margin="6" Orientation="Horizontal" HorizontalAlignment="Right">
+                <Button
+                    Margin="0 0 3 0"
+                    VerticalAlignment="Center"
+                    Command="{Binding OpenDrawer}"
+                    Visibility="{Binding Status,Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnVisible}"
+                    materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                    materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    Content="加药" />
+
+                <TextBox Text="{Binding PZH, UpdateSourceTrigger=PropertyChanged}" materialDesign:HintAssist.Hint="凭证号"
+                materialDesign:HintAssist.IsFloating="True" Width="100"
+                Margin="0 0 3 0"
+                Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CompleteBtn}"
+                />
+
+                <Button
+                    Margin="0 0 3 0"
+                    VerticalAlignment="Center"
+                    Command="{Binding TakeFinish}"
+                    Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CompleteBtn}"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    Content="完成" />
+
+                <Button
+                    Margin="0 0 6 0"
+                    VerticalAlignment="Center"
+                    Command="{Binding CancleTake}"
+                    Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CancelBtn}"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    Content="取消" />
+            </StackPanel>
+            <ScrollViewer  Grid.Row="1"  Margin="6">
+                <ItemsControl 
+                ItemsSource="{Binding ChannelLsts}"
+                Grid.IsSharedSizeScope="True"
+               >
+                    <!--<ItemsControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        -->
+                    <!--<UniformGrid Columns="4" />-->
+                    <!--
+                    </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>-->
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <!--<materialDesign:Card
+                                Background="{StaticResource MaterialDesignLightBackground}"
+                                Margin="4"
+                                Padding="0">-->
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="200"/>
+                                    <ColumnDefinition/>
+                                </Grid.ColumnDefinitions>
+                                <Border BorderBrush="White" BorderThickness="1">
+                                    <StackPanel Orientation="Horizontal" Background="#31ccec" Grid.Column="0">
+
+                                        <Grid>
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition/>
+                                                <RowDefinition/>
+                                                <RowDefinition/>
+                                            </Grid.RowDefinitions>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="200"/>
+                                            </Grid.ColumnDefinitions>
+                                            <TextBlock TextWrapping="Wrap" Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center"  Padding="0 10 0 0 " Text="{Binding Drug.DrugName}"/>
+
+                                            <TextBlock TextWrapping="Wrap" Grid.Row="1"  HorizontalAlignment="Center" VerticalAlignment="Center"  Padding="0 0 0 1 " Text="{Binding Drug.DrugSpec}"/>
+                                            <Button  Grid.Row="2"   Padding="0 0 0 1 "  Style="{x:Null}" BorderBrush="{x:Null}" Background="{x:Null}" Click="Button_Click" CommandParameter="{Binding}">
+
+                                                <Button.Content>
+                                                    <Border Width="32" Height="32" CornerRadius="16" Background="CornflowerBlue" VerticalAlignment="Center" HorizontalAlignment="Center">
+                                                        <Path Data="M0 11L22 11M11 0L11 22" Stroke="WhiteSmoke" StrokeThickness="4" VerticalAlignment="Center" HorizontalAlignment="Center"></Path>
+                                                    </Border>
+                                                </Button.Content>
+                                            </Button>
+                                        </Grid>
+
+
+                                    </StackPanel>
+                                </Border>
+                                <DataGrid
+                Margin="0"
+                 Grid.Column="1" 
+                materialDesign:DataGridAssist.ColumnHeaderPadding="15"
+                 ItemsSource="{Binding channelStocks}"  
+                materialDesign:DataGridAssist.EnableEditBoxAssist="False"
+                materialDesign:DataGridAssist.CellPadding="13"
+                SelectionUnit="Cell"
+                CanUserAddRows="False"
+                AutoGenerateColumns="False">
+                                    <DataGrid.Resources>
+                                        <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}">
+                                            <Setter Property="Background" Value="#31ccec" />
+                                            <Setter Property="Foreground" Value="white" />
+                                            <Setter Property="Height" Value="56" />
+                                            <Setter Property="BorderBrush" Value="white"/>
+                                            <Setter Property="BorderThickness" Value="0.6"/>
+                                            <Setter Property="HorizontalContentAlignment" Value="Center"/>
+
+                                        </Style>
+                                        <Style TargetType="{x:Type DataGridCell}" BasedOn="{StaticResource MaterialDesignDataGridCell}">
+                                            <Style.Triggers>
+                                                <Trigger Property="IsReadOnly" Value="True">
+                                                    <Setter Property="BorderBrush" Value="Transparent" />
+                                                    <Setter Property="HorizontalAlignment" Value="Center"/>
+                                                </Trigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </DataGrid.Resources>
+                                    <DataGrid.Columns>
+                                        <DataGridTextColumn Width="80"
+                        Binding="{Binding ColNo}"
+                        Header="库位"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                                        <DataGridTextColumn Width="180"
+                        Binding="{Binding DrugInfo.DrugName}"
+                        Header="药品名称"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                                        <DataGridTextColumn Width="100"
+                        Binding="{Binding DrugInfo.DrugSpec}"
+                        Header="规格"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                                        <DataGridTemplateColumn Width="200" IsReadOnly="True"
+                        Header="批次">
+                                            <DataGridTemplateColumn.CellTemplate>
+                                                <DataTemplate>
+                                                    <ComboBox
+                                    Style="{StaticResource MaterialDesignDataGridComboBox}"                  
+                                    ItemsSource="{Binding DrugInfo.DrugManuNos}"
+                                    SelectedItem="{Binding drugManuNo,UpdateSourceTrigger=PropertyChanged}"
+                                    DisplayMemberPath="ManuNo" 
+                                    IsEnabled="{Binding Quantity,Converter={StaticResource QuantityCountConverter}}">
+
+
+                                                    </ComboBox>
+                                                </DataTemplate>
+                                            </DataGridTemplateColumn.CellTemplate>
+                                        </DataGridTemplateColumn>
+                                        <DataGridTextColumn Width="100"
+                        Binding="{Binding drugManuNo.EffDate}"
+                        Header="效期"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                                        <DataGridTextColumn Width="100"
+                        Binding="{Binding Quantity}"
+                        Header="库存"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                                        <DataGridTemplateColumn Width="100"
+                        Header="添加数量">
+                                            <DataGridTemplateColumn.CellTemplate>
+                                                <DataTemplate>
+                                                    <TextBox Style="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}" IsReadOnly="{Binding BoardType, Converter={StaticResource InputQuantityConverter}}">
+                                                        <TextBox.Text>
+                                                            <Binding Path="AddQuantity" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
+                                                                <Binding.ValidationRules>
+                                                                    <ExceptionValidationRule />
+                                                                </Binding.ValidationRules>
+                                                            </Binding>
+                                                        </TextBox.Text>
+                                                    </TextBox>
+                                                </DataTemplate>
+                                            </DataGridTemplateColumn.CellTemplate>
+                                        </DataGridTemplateColumn>
+
+                                    </DataGrid.Columns>
+                                </DataGrid>
+                                <!--<ListView Padding="0 6 0 0"  Grid.Column="1" 
+                                     materialDesign:ListViewAssist.ListViewItemPadding="15"
+                                        ItemsSource="{Binding channelStocks}"  SelectedItem="{Binding channelStock}"
+                                        materialDesign:ListViewAssist.HeaderRowBackground="#31ccec">
+                                    <ListView.Resources>
+                                        <Style TargetType="{x:Type GridViewColumnHeader}" BasedOn="{StaticResource {x:Type GridViewColumnHeader}}">
+                                            <Setter Property="Background" Value="#31ccec" />
+                                            <Setter Property="Foreground" Value="white" />
+
+                                            <Setter Property="BorderBrush" Value="white"/>
+                                            <Setter Property="BorderThickness" Value="0.6"/>
+                                            <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                                        </Style>
+                                    </ListView.Resources>
+                                    <ListView.View>
+
+                                        <GridView ColumnHeaderContainerStyle="{StaticResource st}">
+                                            <GridView.Columns>
+                                                <GridViewColumn Width="80" Header="库位" DisplayMemberBinding="{Binding ColNo}" />
+                                                <GridViewColumn Width="130"  Header="批次">
+                                                    <GridViewColumn.CellTemplate>
+                                                        <DataTemplate>
+                                                            <ComboBox Style="{StaticResource MaterialDesignComboBox}"                  
+                                                                    ItemsSource="{Binding DrugInfo.DrugManuNos}" SelectedItem="{Binding drugManuNo,UpdateSourceTrigger=PropertyChanged}"
+                                                                    DisplayMemberPath="ManuNo" IsEnabled="{Binding Quantity,Converter={StaticResource QuantityCountConverter}}">
+                                                            </ComboBox>
+                                                        </DataTemplate>
+                                                    </GridViewColumn.CellTemplate>
+                                                </GridViewColumn>
+                                                <GridViewColumn Width="130" Header="效期" DisplayMemberBinding="{Binding drugManuNo.EffDate}" />
+                                                <GridViewColumn Width="80" Header="库存" DisplayMemberBinding="{Binding Quantity}" />
+                                                <GridViewColumn Width="80" Header="添加数量">
+                                                    <GridViewColumn.CellTemplate>
+                                                        <DataTemplate>
+                                                            <TextBox  Width="80" Padding="10" Grid.Column="1"
+                                                                    Text="{Binding AddQuantity}"
+                                                                    materialDesign:HintAssist.Hint="添加数量"
+                                                                    Style="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"/>
+                                                        </DataTemplate>
+                                                    </GridViewColumn.CellTemplate>
+                                                </GridViewColumn>
+                                            </GridView.Columns>
+                                        </GridView>
+                                    </ListView.View>
+                                </ListView>-->
+                            </Grid>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </ScrollViewer>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/DM_Weight/Views/AddDrugControl.xaml.cs b/DM_Weight/Views/AddDrugControl.xaml.cs
new file mode 100644
index 0000000..075135a
--- /dev/null
+++ b/DM_Weight/Views/AddDrugControl.xaml.cs
@@ -0,0 +1,41 @@
+using DM_Weight.Models;
+using DM_Weight.msg;
+using DM_Weight.ViewModels;
+using Prism.Events;
+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>
+    /// AddDrugControl.xaml 的交互逻辑
+    /// </summary>
+    public partial class AddDrugControl : UserControl
+    {
+        IEventAggregator _eventAggregator;
+        public AddDrugControl(IEventAggregator eventAggregator)
+        {
+            InitializeComponent();
+            _eventAggregator= eventAggregator;
+        }
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            Button btn = (Button)sender;
+            ChannelList cls = (ChannelList)btn.CommandParameter;
+            //vms.AddAction(cls);
+            _eventAggregator.GetEvent<AddDrugEvent>().Publish(cls);
+        }
+    }
+}
diff --git a/DM_Weight/Views/ChangeShiftsListWindow.xaml b/DM_Weight/Views/ChangeShiftsListWindow.xaml
new file mode 100644
index 0000000..fcab7a8
--- /dev/null
+++ b/DM_Weight/Views/ChangeShiftsListWindow.xaml
@@ -0,0 +1,136 @@
+<UserControl x:Class="DM_Weight.Views.ChangeShiftsListWindow"
+             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:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" 
+             xmlns:pagination="clr-namespace:DM_Weight.Components.pagination"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+             xmlns:prism="http://prismlibrary.com/"
+             xmlns:convert="clr-namespace:DM_Weight.Converter"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <UserControl.Resources>
+        <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>
+        <convert:ShiftsStateConverter x:Key="ShiftsStateConverter"/>
+    </UserControl.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Grid Margin="0 6 0 6" Grid.Row="0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1.5*" />
+                <ColumnDefinition Width="1.5*" />
+                <ColumnDefinition Width="2*" />
+                <ColumnDefinition Width="5*"/>
+            </Grid.ColumnDefinitions>
+            <DatePicker
+                Grid.Column="0"
+                SelectedDate="{Binding StartDate, TargetNullValue=''}"
+                Margin="6 0 0 0"
+                materialDesign:HintAssist.Hint="开始时间"
+                Style="{StaticResource MaterialDesignOutlinedDatePicker}"
+            />
+            <DatePicker
+                Grid.Column="1"
+                SelectedDate="{Binding EndDate}"
+                Margin="6 0 0 0"
+                materialDesign:HintAssist.Hint="结束时间"
+                Style="{StaticResource MaterialDesignOutlinedDatePicker}"
+            />
+
+            <StackPanel Grid.Column="3" Orientation="Horizontal" HorizontalAlignment="Right">
+
+                <Button
+                    Margin="0 0 3 0"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    ToolTip="导出" Command="{Binding Download}">
+                    <StackPanel Orientation="Horizontal">
+                        <materialDesign:PackIcon Kind="download" />
+                        <TextBlock Text="导出记录" />
+                    </StackPanel>
+                </Button>
+                <Button
+                    Margin="0 0 3 0"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    ToolTip="交接班" Command="{Binding ShiftsCommand}">
+                    <StackPanel Orientation="Horizontal">
+                        <materialDesign:PackIcon Kind="CompareVertical" />
+                        <TextBlock Text="交接班" />
+                    </StackPanel>
+                </Button>
+                <Button
+                Margin="0 0 6 0"
+                VerticalAlignment="Center"
+                Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                ToolTip="刷新" Command="{Binding Query}">
+                    <materialDesign:PackIcon
+                    Kind="Refresh" />
+                </Button>
+            </StackPanel>
+
+
+        </Grid>
+        <ListView Grid.Row="1" ItemsSource="{Binding HkcChangeShifts}" 
+                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"
+                        Header="日期"
+                        DisplayMemberBinding="{Binding OptDate, StringFormat='yyyy-MM-dd HH:mm:ss'}" />
+                    <GridViewColumn  Width="130"
+                        DisplayMemberBinding="{Binding FromOperator}"
+                        Header="交班人发药人"/>
+                    <GridViewColumn  Width="130"
+                        DisplayMemberBinding="{Binding FromRviewer}"
+                        Header="交班人审核人"/>
+                    <GridViewColumn  Width="130"
+                        DisplayMemberBinding="{Binding ToOperator}"
+                        Header="接班人发药人"/>
+                    <GridViewColumn  Width="130"
+                        DisplayMemberBinding="{Binding ToReviewer}"
+                        Header="接班人审核人"/>
+                    <GridViewColumn  Width="180"
+                        DisplayMemberBinding="{Binding ToDate, StringFormat='yyyy-MM-dd HH:mm:ss'}"
+                        Header="接班日期"/>
+                    <GridViewColumn  Width="100"
+                        DisplayMemberBinding="{Binding State,Converter={StaticResource ShiftsStateConverter}}"
+                        Header="当班状态"/>
+                </GridView>
+            </ListView.View>
+        </ListView>
+
+        <pagination:Pagination Grid.Row="2"
+                                   CurrentPage="{Binding PageNum}"
+                                   PageSize="{Binding PageSize}"
+                                   TotalPages="{Binding TotalCount}"
+                                   InfoTextIsEnabel="True"
+                                />
+    </Grid>
+</UserControl>
diff --git a/DM_Weight/Views/ChangeShiftsListWindow.xaml.cs b/DM_Weight/Views/ChangeShiftsListWindow.xaml.cs
new file mode 100644
index 0000000..3c5b7fa
--- /dev/null
+++ b/DM_Weight/Views/ChangeShiftsListWindow.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>
+    /// ChangeShiftsListWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class ChangeShiftsListWindow : UserControl
+    {
+        public ChangeShiftsListWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/ChangeShiftsRecordWindow.xaml b/DM_Weight/Views/ChangeShiftsRecordWindow.xaml
new file mode 100644
index 0000000..66f46ac
--- /dev/null
+++ b/DM_Weight/Views/ChangeShiftsRecordWindow.xaml
@@ -0,0 +1,143 @@
+<UserControl x:Class="DM_Weight.Views.ChangeShiftsRecordWindow"
+             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:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" 
+             xmlns:pagination="clr-namespace:DM_Weight.Components.pagination"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+             xmlns:prism="http://prismlibrary.com/"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <UserControl.Resources>
+        <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 Height="Auto" />
+            <RowDefinition />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Grid Margin="0 6 0 6" Grid.Row="0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1.5*" />
+                <ColumnDefinition Width="1.5*" />
+                <ColumnDefinition Width="2*" />
+                <ColumnDefinition Width="5*"/>
+            </Grid.ColumnDefinitions>
+            <DatePicker
+                Grid.Column="0"
+                SelectedDate="{Binding StartDate, TargetNullValue=''}"
+                Margin="6 0 0 0"
+                materialDesign:HintAssist.Hint="开始时间"
+                Style="{StaticResource MaterialDesignOutlinedDatePicker}"
+            />
+            <DatePicker
+                Grid.Column="1"
+                SelectedDate="{Binding EndDate}"
+                Margin="6 0 0 0"
+                materialDesign:HintAssist.Hint="结束时间"
+                Style="{StaticResource MaterialDesignOutlinedDatePicker}"
+            />
+
+            <StackPanel Grid.Column="3" Orientation="Horizontal" HorizontalAlignment="Right">
+               
+                <Button
+                    Margin="0 0 3 0"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    ToolTip="导出" Command="{Binding Download}">
+                    <StackPanel Orientation="Horizontal">
+                        <materialDesign:PackIcon Kind="download" />
+                        <TextBlock Text="导出记录" />
+                    </StackPanel>
+                </Button>
+                <Button
+                    Margin="0 0 3 0"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    ToolTip="交接班" Command="{Binding ShiftsCommand}">
+                    <StackPanel Orientation="Horizontal">
+                        <materialDesign:PackIcon Kind="CompareVertical" />
+                        <TextBlock Text="交接班" />
+                    </StackPanel>
+                </Button>
+                <Button
+                Margin="0 0 6 0"
+                VerticalAlignment="Center"
+                Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                ToolTip="刷新" Command="{Binding Query}">
+                    <materialDesign:PackIcon
+                    Kind="Refresh" />
+                </Button>
+            </StackPanel>
+
+
+        </Grid>
+        <ListView Grid.Row="1" ItemsSource="{Binding MachineRecords}" 
+                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="100"
+                        Header="日期"
+                        DisplayMemberBinding="{Binding OperationTime, StringFormat='yyyy-MM-dd HH:mm:ss'}" />
+                    <GridViewColumn  Width="180"
+                        DisplayMemberBinding="{Binding DrugInfo.DrugName}"
+                        Header="品名"/>
+                    <GridViewColumn  Width="100"
+                        DisplayMemberBinding="{Binding DrugInfo.DrugSpec}"
+                        Header="规格"/>
+                    <GridViewColumn  Width="100"
+                        DisplayMemberBinding="{Binding Quantity}"
+                        Header="上班结存数"/>
+                    <GridViewColumn  Width="100"
+                        DisplayMemberBinding="{Binding Quantity}"
+                        Header="领用数"/>
+                    <GridViewColumn  Width="100"
+                        DisplayMemberBinding="{Binding Quantity}"
+                        Header="消耗数"/>
+                    <GridViewColumn  Width="180"
+                        DisplayMemberBinding="{Binding ManuNo}"
+                        Header="批号"/>
+                    <GridViewColumn  Width="100"
+                        DisplayMemberBinding="{Binding Quantity}"
+                        Header="余"/>
+                    <GridViewColumn  Width="150"
+                        DisplayMemberBinding="{Binding EffDate, StringFormat=yyyy-MM-dd}"
+                        Header="交班人"/>
+                    <GridViewColumn  Width="150"
+                        DisplayMemberBinding="{Binding EffDate, StringFormat=yyyy-MM-dd}"
+                        Header="接班人"/>
+                </GridView>
+            </ListView.View>
+        </ListView>
+
+        <pagination:Pagination Grid.Row="2"
+                                   CurrentPage="{Binding PageNum}"
+                                   PageSize="{Binding PageSize}"
+                                   TotalPages="{Binding TotalCount}"
+                                   InfoTextIsEnabel="True"
+                                />
+    </Grid>
+</UserControl>
diff --git a/DM_Weight/Views/ChangeShiftsRecordWindow.xaml.cs b/DM_Weight/Views/ChangeShiftsRecordWindow.xaml.cs
new file mode 100644
index 0000000..5d94fa7
--- /dev/null
+++ b/DM_Weight/Views/ChangeShiftsRecordWindow.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>
+    /// ChangeShiftsRecordWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class ChangeShiftsRecordWindow : UserControl
+    {
+        public ChangeShiftsRecordWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/ChangeShiftsWindow.xaml b/DM_Weight/Views/ChangeShiftsWindow.xaml
new file mode 100644
index 0000000..ce2616b
--- /dev/null
+++ b/DM_Weight/Views/ChangeShiftsWindow.xaml
@@ -0,0 +1,288 @@
+<UserControl x:Class="DM_Weight.Views.ChangeShiftsWindow"
+             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:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" 
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <Grid.RowDefinitions >
+            <RowDefinition Height="8*"></RowDefinition>
+            <RowDefinition Height="2*"></RowDefinition>
+        </Grid.RowDefinitions>
+        <materialDesign:Card>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="5*"/>
+                    <ColumnDefinition Width="5*"/>
+                </Grid.ColumnDefinitions>
+                <Grid Grid.Column="0" Margin="5">
+                    <Grid.RowDefinitions >
+                        <RowDefinition Height="*"></RowDefinition>
+                        <RowDefinition Height="*"></RowDefinition>
+                        <RowDefinition Height="*"></RowDefinition>
+                        <RowDefinition Height="2*"></RowDefinition>
+                        <RowDefinition Height="*"></RowDefinition>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.ColumnSpan="2"
+                    Grid.Row="1"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="28"
+                    Foreground="#31ccec"
+                    FontWeight="Bold"
+                    Text="交班人">
+                    </TextBlock>
+                    <TextBlock
+                    Grid.Row="2"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="14"
+                    Foreground="#31ccec"
+                    FontWeight="Bold"
+                    Text="发药人">
+                    </TextBlock>
+                    <Grid Grid.Row="3" Margin="2" >
+                        <Grid.RowDefinitions >
+                            <RowDefinition Height="*"></RowDefinition>
+                            <RowDefinition Height="*"></RowDefinition>
+                        </Grid.RowDefinitions>
+
+                        <!--<Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="4*"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>-->
+                        <TextBox IsEnabled="False"
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            x:Name="account"
+                            Text="{Binding JiaoFaUsername, UpdateSourceTrigger=PropertyChanged}"
+                            Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                            VerticalAlignment="Top"
+                            AcceptsReturn="False"
+                            TextWrapping="Wrap"
+                            materialDesign:HintAssist.Hint="账号" />
+                        <PasswordBox
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            x:Name="PasswordBox"
+                            materialDesign:PasswordBoxAssist.Password="{Binding JiaoFaPassword, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                            Style="{StaticResource MaterialDesignOutlinedPasswordBox}"
+                            VerticalAlignment="Top"
+                            materialDesign:HintAssist.Hint="密码" />
+                    </Grid>
+                    <TextBlock 
+                    Grid.Row="2" Grid.Column="1"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="14"
+                    Foreground="#31ccec"
+                    FontWeight="Bold"
+                    Text="审核人"/>
+                    <Grid Grid.Row="3" Grid.Column="1" Margin="2"  >
+                        <Grid.RowDefinitions >
+                            <RowDefinition Height="*"></RowDefinition>
+                            <RowDefinition Height="*"></RowDefinition>
+                            <!--<RowDefinition Height="*"></RowDefinition>-->
+                        </Grid.RowDefinitions>
+
+                        <!--<Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="4*"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>-->
+                        <TextBox IsEnabled="False"
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            x:Name="account2"
+                            Text="{Binding JiaoShenUsername, UpdateSourceTrigger=PropertyChanged}"
+                            Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                            VerticalAlignment="Top"
+                            AcceptsReturn="False"
+                            TextWrapping="Wrap"
+                            materialDesign:HintAssist.Hint="账号" />
+                        <PasswordBox
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            x:Name="PasswordBox2"
+                            materialDesign:PasswordBoxAssist.Password="{Binding JiaoShenPassword, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                            Style="{StaticResource MaterialDesignOutlinedPasswordBox}"
+                            VerticalAlignment="Top"
+                            materialDesign:HintAssist.Hint="密码" />                        
+                    </Grid>
+                    <StackPanel Grid.Row="4"
+                            Grid.ColumnSpan="2">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"></ColumnDefinition>
+                                <ColumnDefinition Width="2*"></ColumnDefinition>
+                                <ColumnDefinition Width="*"></ColumnDefinition>
+                                <ColumnDefinition Width="2*"></ColumnDefinition>
+                                <ColumnDefinition Width="*"></ColumnDefinition>
+                            </Grid.ColumnDefinitions>
+                            <Button IsEnabled="{Binding JiaoBanOk}"
+                                    Grid.Column="1"
+                                    Style="{StaticResource MaterialDesignRaisedButton}"
+                                    materialDesign:ButtonAssist.CornerRadius="5"
+                                    Command="{ Binding JiaobanCommand }"
+                                    Background="#42a5f5" 
+                                    BorderBrush="#42a5f5" Cursor="Hand"  IsDefault="True"  Content="确定"/>
+                            <Button
+                                Grid.Column="3"
+                                Style="{StaticResource MaterialDesignRaisedLightButton}"
+                                Background="#7986cb"
+                                BorderBrush="#7986cb"
+                                materialDesign:ButtonAssist.CornerRadius="5" Cursor="Hand" IsCancel="true" 
+                                Command="{ Binding ClearOneCommand }" >
+                                <TextBlock Foreground="{DynamicResource MaterialDesignPaper}" Text="清空" />
+                            </Button>
+                        </Grid>
+                    </StackPanel>
+                </Grid>
+
+                <Border BorderBrush="Gray"  BorderThickness="1"/>
+                <Grid Grid.Column="1" Margin="5">
+                    <Grid.RowDefinitions >
+                        <RowDefinition Height="*"></RowDefinition>
+                        <RowDefinition Height="*"></RowDefinition>
+                        <RowDefinition Height="*"></RowDefinition>
+                        <RowDefinition Height="2*"></RowDefinition>
+                        <RowDefinition Height="*"></RowDefinition>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.ColumnSpan="2"
+                    Grid.Row="1"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="28"
+                    Foreground="#31ccec"
+                    FontWeight="Bold"
+                    Text="接班人"/>
+                    <TextBlock
+                    Grid.Row="2"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="14"
+                    Foreground="#31ccec"
+                    FontWeight="Bold"
+                    Text="发药人">
+                    </TextBlock>
+                    <Grid Grid.Row="3" Margin="2" >
+                        <Grid.RowDefinitions >
+                            <RowDefinition Height="*"></RowDefinition>
+                            <RowDefinition Height="*"></RowDefinition>
+                        </Grid.RowDefinitions>
+
+                        <Grid.ColumnDefinitions>
+                            <!--<ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="4*"/>
+                            <ColumnDefinition Width="*"/>-->
+                        </Grid.ColumnDefinitions>
+                        <TextBox
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            x:Name="accountShifts"
+                            Text="{Binding JieFaUsername, UpdateSourceTrigger=PropertyChanged}"
+                            Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                            VerticalAlignment="Top"
+                            AcceptsReturn="False"
+                            TextWrapping="Wrap"
+                            materialDesign:HintAssist.Hint="账号" />
+                        <PasswordBox
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            x:Name="PasswordBoxShifts"
+                            materialDesign:PasswordBoxAssist.Password="{Binding JieFaPassword, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                            Style="{StaticResource MaterialDesignOutlinedPasswordBox}"
+                            VerticalAlignment="Top"
+                            materialDesign:HintAssist.Hint="密码" />
+                    </Grid>
+                    <TextBlock
+                    Grid.Row="2" Grid.Column="1"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="14"
+                    Foreground="#31ccec"
+                    FontWeight="Bold"
+                    Text="审核人"/>
+                    <Grid Grid.Row="3" Grid.Column="1" Margin="2" >
+                        <Grid.RowDefinitions >
+                            <RowDefinition Height="*"></RowDefinition>
+                            <RowDefinition Height="*"></RowDefinition>
+                        </Grid.RowDefinitions>
+
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+                        <TextBox
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            x:Name="accountShifts2"
+                            Text="{Binding JieShenUsername, UpdateSourceTrigger=PropertyChanged}"
+                            Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                            VerticalAlignment="Top"
+                            AcceptsReturn="False"
+                            TextWrapping="Wrap"
+                            materialDesign:HintAssist.Hint="账号" />
+                        <PasswordBox
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            x:Name="PasswordBoxShifts2"
+                            materialDesign:PasswordBoxAssist.Password="{Binding JieShenPassword, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                            Style="{StaticResource MaterialDesignOutlinedPasswordBox}"
+                            VerticalAlignment="Top"
+                            materialDesign:HintAssist.Hint="密码" />
+                    </Grid>
+                    <StackPanel Grid.Row="4"  Grid.ColumnSpan="2">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"></ColumnDefinition>
+                                <ColumnDefinition Width="2*"></ColumnDefinition>
+                                <ColumnDefinition Width="*"></ColumnDefinition>
+                                <ColumnDefinition Width="2*"></ColumnDefinition>
+                                <ColumnDefinition Width="*"></ColumnDefinition>
+                            </Grid.ColumnDefinitions>
+                            <Button
+                                    Grid.Column="1" IsEnabled="{Binding JieBanOk}"
+                                    Style="{StaticResource MaterialDesignRaisedButton}"
+                                    materialDesign:ButtonAssist.CornerRadius="5"
+                                    Command="{ Binding JiebanCommand }"
+                                    Background="#42a5f5"
+                                    BorderBrush="#42a5f5" Cursor="Hand"  IsDefault="True"  Content="确定" Height="32" VerticalAlignment="Top"/>
+                            <Button
+                                Grid.Column="3"
+                                Style="{StaticResource MaterialDesignRaisedLightButton}"
+                                Background="#7986cb"
+                                BorderBrush="#7986cb"
+                                materialDesign:ButtonAssist.CornerRadius="5" Cursor="Hand" IsCancel="true" 
+                                Command="{ Binding ClearTwoCommand }" >
+                                <TextBlock Foreground="{DynamicResource MaterialDesignPaper}" Text="清空" />
+                            </Button>
+                        </Grid>
+                    </StackPanel>
+
+                </Grid>
+                <Border BorderBrush="Gray"  BorderThickness="1"/>
+            </Grid>
+        </materialDesign:Card>
+        <materialDesign:Card Grid.Row="1">
+            <Button
+                                    Grid.Column="0"
+                                    Style="{StaticResource MaterialDesignRaisedButton}"
+                                    materialDesign:ButtonAssist.CornerRadius="5"
+                                    Command="{ Binding ShiftsCommand }"
+                                    Background="#42a5f5"
+                                    BorderBrush="#42a5f5" Cursor="Hand"  IsDefault="True"  Content="确认交接"/>
+        </materialDesign:Card>
+    </Grid>
+</UserControl>
diff --git a/DM_Weight/Views/ChangeShiftsWindow.xaml.cs b/DM_Weight/Views/ChangeShiftsWindow.xaml.cs
new file mode 100644
index 0000000..50fc2f0
--- /dev/null
+++ b/DM_Weight/Views/ChangeShiftsWindow.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>
+    /// ChangeShiftsWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class ChangeShiftsWindow : UserControl
+    {
+        public ChangeShiftsWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/CheckStockWindow.xaml b/DM_Weight/Views/CheckStockWindow.xaml
new file mode 100644
index 0000000..4fd0a24
--- /dev/null
+++ b/DM_Weight/Views/CheckStockWindow.xaml
@@ -0,0 +1,314 @@
+<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:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+             xmlns:convert="clr-namespace:DM_Weight.Converter"
+             mc:Ignorable="d">
+
+    <UserControl.Resources>
+        <convert:DrawerSelectConverter x:Key="DrawerSelectConverter" />
+        <convert:StatusConverter x:Key="StatusConverter" />
+    </UserControl.Resources>
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition />
+        </Grid.ColumnDefinitions>
+        <Grid Margin="0" Grid.Column="0" Width="280" Height="570"  Visibility="{Binding Is8Drawer, Converter={StaticResource BooleanToVisibilityConverter}}">
+            <Grid.Background>
+                <ImageBrush ImageSource="/Images/box.png" />
+            </Grid.Background>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="200" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Grid Grid.Row="1">
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <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>
+                <Button Grid.Row="0" Width="210" Content="1" Command="{Binding UpdateDrawerNo}" CommandParameter="1" />
+                <Button Grid.Row="1" Width="210" Content="2" Command="{Binding UpdateDrawerNo}" CommandParameter="2" />
+                <Button Grid.Row="2" Width="210" Content="3" Command="{Binding UpdateDrawerNo}" CommandParameter="3" />
+                <Button Grid.Row="3" Width="210" Content="4" Command="{Binding UpdateDrawerNo}" CommandParameter="4" />
+                <Button Grid.Row="4" Width="210" Content="5" Command="{Binding UpdateDrawerNo}" CommandParameter="5" />
+                <Button Grid.Row="5" Width="210" Content="6" Command="{Binding UpdateDrawerNo}" CommandParameter="6" />
+                <Button Grid.Row="6" Width="210" Content="7" Command="{Binding UpdateDrawerNo}" CommandParameter="7" />
+                <Button Grid.Row="7" Width="210" Content="8" Command="{Binding UpdateDrawerNo}" CommandParameter="8" />
+
+            </Grid>
+        </Grid>
+        <Grid Margin="0" Grid.Column="0" Width="300" Height="570" Visibility="{Binding Is16Drawer, Converter={StaticResource BooleanToVisibilityConverter}}">
+            <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.Background>
+                <ImageBrush ImageSource="/Images/box-16.jpg" />
+            </Grid.Background>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="200" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Grid Margin="10 0 0 0"  Visibility="{Binding Is17Drawer, Converter={StaticResource BooleanToVisibilityConverter}}" Grid.Row="0">
+                <Button  Width="110" Content="17" HorizontalAlignment="Left" Command="{Binding UpdateDrawerNo}" CommandParameter="17" />
+            </Grid>
+
+            <Grid Grid.Row="1">
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+
+                <Button Grid.Row="0" Grid.Column="0" Width="120" Content="1" Command="{Binding UpdateDrawerNo}" CommandParameter="1" />
+                <Button Grid.Row="1" Grid.Column="0" Width="120" Content="2" Command="{Binding UpdateDrawerNo}" CommandParameter="2" />
+                <Button Grid.Row="2" Grid.Column="0" Width="120" Content="3" Command="{Binding UpdateDrawerNo}" CommandParameter="3" />
+                <Button Grid.Row="3" Grid.Column="0" Width="120" Content="4" Command="{Binding UpdateDrawerNo}" CommandParameter="4" />
+                <Button Grid.Row="4" Grid.Column="0" Width="120" Content="5" Command="{Binding UpdateDrawerNo}" CommandParameter="5" />
+                <Button Grid.Row="5" Grid.Column="0" Width="120" Content="6" Command="{Binding UpdateDrawerNo}" CommandParameter="6" />
+                <Button Grid.Row="6" Grid.Column="0" Width="120" Content="7" Command="{Binding UpdateDrawerNo}" CommandParameter="7" />
+                <Button Grid.Row="7" Grid.Column="0" Width="120" Content="8" Command="{Binding UpdateDrawerNo}" CommandParameter="8" />
+
+                <Button Grid.Row="0" Grid.Column="1" Width="120" Content="9" Command="{Binding UpdateDrawerNo}" CommandParameter="9" />
+                <Button Grid.Row="1" Grid.Column="1" Width="120" Content="10" Command="{Binding UpdateDrawerNo}" CommandParameter="10" />
+                <Button Grid.Row="2" Grid.Column="1" Width="120" Content="11" Command="{Binding UpdateDrawerNo}" CommandParameter="11" />
+                <Button Grid.Row="3" Grid.Column="1" Width="120" Content="12" Command="{Binding UpdateDrawerNo}" CommandParameter="12" />
+                <Button Grid.Row="4" Grid.Column="1" Width="120" Content="13" Command="{Binding UpdateDrawerNo}" CommandParameter="13" />
+                <Button Grid.Row="5" Grid.Column="1" Width="120" Content="14" Command="{Binding UpdateDrawerNo}" CommandParameter="14" />
+                <Button Grid.Row="6" Grid.Column="1" Width="120" Content="15" Command="{Binding UpdateDrawerNo}" CommandParameter="15" />
+                <Button Grid.Row="7" Grid.Column="1" Width="120" Content="16" Command="{Binding UpdateDrawerNo}" CommandParameter="16" />
+
+            </Grid>
+        </Grid>
+        <Grid Grid.Column="1" Margin="6">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Right">
+                <Button
+                    Margin="0 0 3 0"
+                    VerticalAlignment="Center"
+                    Command="{Binding OpenDrawer}"
+                    Visibility="{Binding Status,Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnVisible}"
+                    materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                    materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    Content="盘点" />
+                <Button
+                    Margin="0 0 3 0"
+                    VerticalAlignment="Center"
+                    Command="{Binding TakeFinish}"
+                    Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CompleteBtn}"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    Content="完成" />
+
+                <Button
+                    Margin="0 0 6 0"
+                    VerticalAlignment="Center"
+                    Command="{Binding CancleTake}"
+                    Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CancelBtn}"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    Content="取消" />
+            </StackPanel>
+            <DataGrid
+                Padding="0 6 0 0"
+                Grid.Row="1"
+                materialDesign:DataGridAssist.ColumnHeaderPadding="15"
+                ItemsSource="{Binding ChannelStocks}"
+                materialDesign:DataGridAssist.EnableEditBoxAssist="False"
+                materialDesign:DataGridAssist.CellPadding="13"
+                SelectionUnit="Cell"
+                CanUserAddRows="False"
+                AutoGenerateColumns="False">
+                <DataGrid.Resources>
+                    <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}">
+                        <Setter Property="Background" Value="#31ccec" />
+                        <Setter Property="Foreground" Value="white" />
+                        <Setter Property="Height" Value="56" />
+                        <Setter Property="BorderBrush" Value="white"/>
+                        <Setter Property="BorderThickness" Value="0.6"/>
+                        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                    </Style>
+                    <Style TargetType="{x:Type DataGridCell}" BasedOn="{StaticResource MaterialDesignDataGridCell}">
+                        <Style.Triggers>
+                            <Trigger Property="IsReadOnly" Value="True">
+                                <Setter Property="BorderBrush" Value="Transparent" />
+                                <Setter Property="HorizontalAlignment" Value="Left"/>
+                            </Trigger>
+                        </Style.Triggers>
+                    </Style>
+                </DataGrid.Resources>
+                <DataGrid.Columns>
+                    <DataGridTextColumn Width="100"
+                        Binding="{Binding ColNo}"
+                        Header="库位"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                    <DataGridTextColumn Width="130"
+                        Binding="{Binding DrugInfo.DrugName}"
+                        Header="药品名称"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                    <DataGridTextColumn Width="100"
+                        Binding="{Binding DrugInfo.DrugSpec}"
+                        Header="规格"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                    <DataGridTextColumn Width="100"
+                        Binding="{Binding ManuNo}"
+                        Header="批次"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                    <DataGridTextColumn Width="100"
+                        Binding="{Binding EffDate}"
+                        Header="效期"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                    <DataGridTextColumn Width="100"
+                        Binding="{Binding Quantity}"
+                        Header="库存"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                    <!--<DataGridTextColumn
+                        Header="盘点数量"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}">
+                        <DataGridTextColumn.Binding>
+                            <Binding Path="CheckQuantity" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
+                                <Binding.ValidationRules>
+                                    <ExceptionValidationRule />
+                                </Binding.ValidationRules>
+                            </Binding>
+                        </DataGridTextColumn.Binding>
+                    </DataGridTextColumn>-->
+                    <DataGridTemplateColumn Width="100"
+                        Header="盘点数量">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBox Style="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}">
+                                    <TextBox.Text>
+                                        <Binding Path="CheckQuantity" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
+                                            <Binding.ValidationRules>
+                                                <ExceptionValidationRule />
+                                            </Binding.ValidationRules>
+                                        </Binding>
+                                    </TextBox.Text>
+                                </TextBox>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
+                </DataGrid.Columns>
+            </DataGrid>
+            <!--<ListView
+                Grid.Row="1"
+                ItemsSource="{Binding ChannelStocks}"
+                materialDesign:ListViewAssist.HeaderRowBackground="#31ccec">
+                <ListView.Resources>
+                    <Style TargetType="{x:Type GridViewColumnHeader}" BasedOn="{StaticResource {x:Type GridViewColumnHeader}}">
+                        <Setter Property="Foreground" Value="White" />
+                    </Style>
+                </ListView.Resources>
+                <ListView.View>
+
+                    <GridView>
+                        <GridView.Columns>
+                            <GridViewColumn
+                            Header="库位"
+                            DisplayMemberBinding="{Binding ColNo}"/>
+                            <GridViewColumn
+                            Header="药品名称"
+                            DisplayMemberBinding="{Binding DrugInfo.DrugName}" />
+                            <GridViewColumn
+                            Header="规格"
+                            DisplayMemberBinding="{Binding DrugInfo.DrugSpec}" />
+                            <GridViewColumn
+                            Header="批次"
+                            DisplayMemberBinding="{Binding ManuNo}" />
+                            <GridViewColumn
+                            Header="效期"
+                            DisplayMemberBinding="{Binding EffDate}" />
+                            <GridViewColumn
+                            Header="当前库存"
+                            DisplayMemberBinding="{Binding Quantity}" />
+                            <GridViewColumn
+                            Header="盘点数量">
+                                <GridViewColumn.CellTemplate>
+                                    <DataTemplate>
+                                        <TextBox
+                                        Width="80"
+                                        Padding="10"
+                                        Grid.Column="1"
+                                        Text="{Binding CheckQuantity}"
+                                        materialDesign:HintAssist.Hint="添加数量"
+                                        Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
+                                    </DataTemplate>
+                                </GridViewColumn.CellTemplate>
+                            </GridViewColumn>
+                        </GridView.Columns>
+                    </GridView>
+                </ListView.View>
+            </ListView>-->
+
+        </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();
+        }
+    }
+}
diff --git a/DM_Weight/Views/DebugWindow.xaml b/DM_Weight/Views/DebugWindow.xaml
new file mode 100644
index 0000000..b0e3945
--- /dev/null
+++ b/DM_Weight/Views/DebugWindow.xaml
@@ -0,0 +1,23 @@
+<UserControl x:Class="DM_Weight.Views.DebugWindow"
+             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:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+             xmlns:convert="clr-namespace:DM_Weight.Converter"
+             mc:Ignorable="d">
+    <Grid>
+        <materialDesign:Card>
+            <TabControl TabStripPlacement="Left" Style="{StaticResource MaterialDesignFilledTabControl}">
+                <TabItem Header="数据库">
+                    <TextBlock Margin="8" Text="Not filled example tab 1" />
+                </TabItem>
+                <TabItem Header="串口">
+                    <TextBlock Margin="8" Text="No filled example tab 2" />
+                </TabItem>
+            </TabControl>
+        </materialDesign:Card>
+    </Grid>
+</UserControl>
diff --git a/DM_Weight/Views/DebugWindow.xaml.cs b/DM_Weight/Views/DebugWindow.xaml.cs
new file mode 100644
index 0000000..b7de1a5
--- /dev/null
+++ b/DM_Weight/Views/DebugWindow.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>
+    /// DebugWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class DebugWindow : UserControl
+    {
+        public DebugWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/Dialog/AddManunoDialog.xaml b/DM_Weight/Views/Dialog/AddManunoDialog.xaml
new file mode 100644
index 0000000..378494e
--- /dev/null
+++ b/DM_Weight/Views/Dialog/AddManunoDialog.xaml
@@ -0,0 +1,116 @@
+<UserControl x:Class="DM_Weight.Views.Dialog.AddManunoDialog"
+             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.Dialog"
+              xmlns:prism="http://prismlibrary.com/"
+             prism:ViewModelLocator.AutoWireViewModel="True"
+             xmlns:convert="clr-namespace:DM_Weight.Converter"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <UserControl.Resources>
+        <convert:StatusConverter x:Key="StatusConverter" />
+        <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>
+    <materialDesign:Card Padding="0">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid Background="#03a9f4" Grid.Row="0">
+                <TextBlock VerticalAlignment="Center" Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}" Margin="16 4 16 4" Style="{StaticResource MaterialDesignHeadline5TextBlock}" Text="{Binding Title}" />
+                <Button
+                        Style="{StaticResource MaterialDesignIconForegroundButton}"
+                        Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}"
+                        HorizontalAlignment="Right"
+                        Command="{Binding BtnCloseCommand}"
+                        IsEnabled="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CloseBtn}"
+                        ToolTip="关闭"
+                    >
+                    <materialDesign:PackIcon Kind="Close" Width="34" Height="34" />
+                </Button>
+            </Grid>
+
+            <ListView Padding="0 6 0 0"
+                Grid.Row="1" materialDesign:ListViewAssist.ListViewItemPadding="15"
+                ItemsSource="{Binding AddChannelStocks}" 
+                materialDesign:ListViewAssist.HeaderRowBackground="#31ccec">
+                <ListView.Resources>
+                    <Style TargetType="{x:Type GridViewColumnHeader}" BasedOn="{StaticResource {x:Type GridViewColumnHeader}}">
+                        <Setter Property="Background" Value="#31ccec" />
+                        <Setter Property="Foreground" Value="white" />
+                        <Setter Property="Height" Value="56" />
+                        <Setter Property="BorderBrush" Value="white"/>
+                        <Setter Property="BorderThickness" Value="0.6"/>
+                        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                    </Style>
+                </ListView.Resources>
+                <ListView.View>
+
+                    <GridView ColumnHeaderContainerStyle="{StaticResource st}">
+                        <GridView.Columns>
+                            <GridViewColumn Width="50">
+                                <GridViewColumnHeader>
+                                    <CheckBox x:Name="allCheck" IsChecked="{Binding IsAllChecked,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+                                </GridViewColumnHeader>
+                                <GridViewColumn.CellTemplate>
+                                    <DataTemplate>
+                                        <CheckBox x:Name="check_1" IsChecked="{Binding ItemIsChecked,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  />
+                                    </DataTemplate>
+                                </GridViewColumn.CellTemplate>
+                            </GridViewColumn>
+                            <GridViewColumn Width="80"
+                            Header="库位"
+                            DisplayMemberBinding="{Binding ColNo}"/>
+                            <GridViewColumn Width="180"
+                            Header="药品名称"
+                            DisplayMemberBinding="{Binding DrugName}" />
+                            <GridViewColumn Width="150"
+                            Header="规格"
+                            DisplayMemberBinding="{Binding DrugSpec}" />
+                            
+                            <GridViewColumn Width="150"  Header="批次" DisplayMemberBinding="{Binding ManuNo}" />
+
+                            <GridViewColumn Width="120"
+                            Header="效期"
+                            DisplayMemberBinding="{Binding EffDate}" />                          
+                        </GridView.Columns>
+                    </GridView>
+                </ListView.View>
+            </ListView>
+            <Grid Grid.Row="3">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <StackPanel Orientation="Horizontal" Grid.Column="1" HorizontalAlignment="Center">
+                    <Button
+                            Margin="2"
+                            Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CompleteBtn}"
+                            Style="{StaticResource MaterialDesignRaisedAccentButton}"
+                            Content="保存"
+                            Command="{Binding SaveCommand}"/>
+                </StackPanel>
+
+            </Grid>
+        </Grid>
+    </materialDesign:Card>
+</UserControl>
diff --git a/DM_Weight/Views/Dialog/AddManunoDialog.xaml.cs b/DM_Weight/Views/Dialog/AddManunoDialog.xaml.cs
new file mode 100644
index 0000000..10dc158
--- /dev/null
+++ b/DM_Weight/Views/Dialog/AddManunoDialog.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.Dialog
+{
+    /// <summary>
+    /// AddManunoDialog.xaml 的交互逻辑
+    /// </summary>
+    public partial class AddManunoDialog : UserControl
+    {
+        public AddManunoDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/Dialog/BindingChannelDialog.xaml b/DM_Weight/Views/Dialog/BindingChannelDialog.xaml
new file mode 100644
index 0000000..ceaf642
--- /dev/null
+++ b/DM_Weight/Views/Dialog/BindingChannelDialog.xaml
@@ -0,0 +1,217 @@
+<UserControl xmlns:pagination="clr-namespace:DM_Weight.Components.pagination"  x:Class="DM_Weight.Views.Dialog.BindingChannelDialog"
+             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.Dialog"
+             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"
+             MinWidth="880"
+             MinHeight="479"
+             Width="Auto"
+             Height="Auto"
+             mc:Ignorable="d" >
+
+    <UserControl.Resources>
+        <convert:BoardTypeConverter x:Key="BoardTypeConverter" />
+    </UserControl.Resources>
+
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <!--<RowDefinition Height="Auto" />-->
+            </Grid.RowDefinitions>
+            <Grid Background="#03a9f4" Grid.Row="0">
+                <TextBlock VerticalAlignment="Center" Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}" Margin="16 4 16 4" Style="{StaticResource MaterialDesignHeadline5TextBlock}" Text="{Binding Title}" />
+                <Button
+                        Style="{StaticResource MaterialDesignIconForegroundButton}"
+                        Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}"
+                        HorizontalAlignment="Right"
+                        Command="{Binding BtnCloseCommand}"
+                        ToolTip="关闭" Cursor="Hand"
+                    >
+                    <materialDesign:PackIcon Kind="Close" Width="34" Height="34" />
+                </Button>
+            </Grid>
+            <Grid Grid.Row="1" Margin="0 4 0 4">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+            <ComboBox
+                    Margin="6 0 6 0"
+                    Grid.Column="0"
+                    materialDesign:HintAssist.Hint="拼音码"
+                    IsEditable="True"
+                    ItemsSource="{Binding DrugInfos_PY}"
+                    SelectedItem="{Binding DrugInfo_Py}"
+                    DisplayMemberPath="PyCode"
+                />
+            <ComboBox
+                    Margin="6 0 6 0"
+                    Grid.Column="1"
+                    materialDesign:HintAssist.Hint="药品名称"
+                    IsEditable="True"
+                    ItemsSource="{Binding DrugInfos}"
+                    SelectedItem="{Binding DrugInfo}"
+                    DisplayMemberPath="DrugName"
+                />
+            <ComboBox
+                    Grid.Column="2"
+                    Style="{StaticResource MaterialDesignOutlinedComboBox}"
+                    materialDesign:HintAssist.Hint="批次"
+                    ItemsSource="{Binding DrugManuNos}"
+                    SelectedItem="{Binding DrugManuNo}"
+                    DisplayMemberPath="ManuNo"/>
+                <StackPanel HorizontalAlignment="Right"  Grid.Column="3" 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>
+        <ItemsControl
+                Grid.Row="2"
+                ItemsSource="{Binding Channels}"
+                Grid.IsSharedSizeScope="True"
+                Margin="12 0 12 0">
+            <ItemsControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <UniformGrid Columns="4" />
+                </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+            <ItemsControl.ItemTemplate>
+                <DataTemplate>
+                    <materialDesign:Card
+                                Background="{StaticResource MaterialDesignLightBackground}"
+                                Margin="4"
+                                Padding="0">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <StackPanel Grid.Row="0" Orientation="Horizontal" Background="#31ccec" >
+                                <CheckBox
+                                        materialDesign:CheckBoxAssist.CheckBoxSize="30"
+                                        VerticalAlignment="Center"
+                                        IsChecked="{Binding IsSelected}" />
+                                <TextBlock
+                                        Style="{StaticResource MaterialDesignHeadline5TextBlock}"
+                                        Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}"
+                                        Padding="8"
+                                        Text="{Binding Location}" />
+                                <TextBlock
+                                        Style="{StaticResource MaterialDesignHeadline5TextBlock}"
+                                        Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}"
+                                        Padding="8"
+                                        HorizontalAlignment="Right">
+                                    <TextBlock.Text>
+                                        <MultiBinding Converter="{StaticResource BoardTypeConverter}">
+                                            <Binding Path="BoardType" />
+                                            <Binding Path="DrawerType" />
+                                        </MultiBinding>
+                                    </TextBlock.Text>
+                                </TextBlock>
+                            </StackPanel>
+                            <Grid Grid.Row="1" x:Name="Border">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+                                <Grid.Resources>
+                                    <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource MaterialDesignSubtitle1TextBlock}">
+                                        <Setter Property="Padding" Value="6" />
+                                    </Style>
+                                </Grid.Resources>
+                                <TextBlock
+                                        HorizontalAlignment="Left"
+                                        Grid.Row="0"
+                                        Grid.Column="0"
+                                        Text="药品:" />
+                                <StackPanel
+                                        Grid.Row="0"
+                                        Grid.Column="1"
+                                        HorizontalAlignment="Right"
+                                        Orientation="Horizontal">
+                                    <TextBlock Text="{Binding DrugInfo.DrugName}" />
+                                    <TextBlock
+                                            Visibility="{Binding Quantity, Converter={StaticResource NotZeroToVisibilityConverter}}"
+                                            Text="{Binding Quantity, StringFormat=({0})}" />
+                                </StackPanel>
+
+                                <TextBlock
+                                        HorizontalAlignment="Left"
+                                        Grid.Row="1"
+                                        Grid.Column="0"
+                                        Text="批次:" />
+                                <TextBlock
+                                        HorizontalAlignment="Right"
+                                        Grid.Row="1"
+                                        Grid.Column="1"
+                                        Text="{Binding ManuNo}" />
+                                <TextBlock
+                                        HorizontalAlignment="Left"
+                                        Grid.Row="2"
+                                        Grid.Column="0"
+                                        Text="效期:" />
+                                <TextBlock
+                                        HorizontalAlignment="Right"
+                                        Grid.Row="2"
+                                        Grid.Column="1"
+                                        Text="{Binding EffDate}" />
+                            </Grid>
+                        </Grid>
+                    </materialDesign:Card>
+                    <DataTemplate.Triggers>
+                        <DataTrigger Binding="{Binding IsSelected}" Value="True">
+                            <Setter Property="RenderTransformOrigin" Value="0.5,0.5" />
+                            <Setter TargetName="Border" Property="Background" Value="#90caf9" />
+                            <Setter Property="RenderTransform">
+                                <Setter.Value>
+                                    <ScaleTransform  ScaleX="0.95" ScaleY="0.95" />
+                                </Setter.Value>
+                            </Setter>
+                        </DataTrigger>
+                    </DataTemplate.Triggers>
+                </DataTemplate>
+            </ItemsControl.ItemTemplate>
+        </ItemsControl>
+
+        <pagination:Pagination Grid.Row="3"
+                                   CurrentPage="{Binding PageNum}"
+                                   PageSize="{Binding PageSize}"
+                                   TotalPages="{Binding TotalCount}"
+                                   InfoTextIsEnabel="True"
+                                />
+        <materialDesign:Snackbar
+                Background="{Binding SnackbarBackground}"
+                MessageQueue="{Binding SnackbarMessageQueue}"/>
+        </Grid>
+</UserControl>
diff --git a/DM_Weight/Views/Dialog/BindingChannelDialog.xaml.cs b/DM_Weight/Views/Dialog/BindingChannelDialog.xaml.cs
new file mode 100644
index 0000000..e5ce398
--- /dev/null
+++ b/DM_Weight/Views/Dialog/BindingChannelDialog.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.Dialog
+{
+    /// <summary>
+    /// BindingChannelDialog.xaml 的交互逻辑
+    /// </summary>
+    public partial class BindingChannelDialog : UserControl
+    {
+        public BindingChannelDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/Dialog/BindingChannelNewDialog.xaml b/DM_Weight/Views/Dialog/BindingChannelNewDialog.xaml
new file mode 100644
index 0000000..58f50cb
--- /dev/null
+++ b/DM_Weight/Views/Dialog/BindingChannelNewDialog.xaml
@@ -0,0 +1,210 @@
+<UserControl xmlns:pagination="clr-namespace:DM_Weight.Components.pagination"  x:Class="DM_Weight.Views.Dialog.BindingChannelNewDialog"
+             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.Dialog"
+             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"
+             MinWidth="880"
+             MinHeight="479"
+             Width="Auto"
+             Height="Auto"
+             mc:Ignorable="d" >
+
+    <UserControl.Resources>
+        <convert:BoardTypeConverter x:Key="BoardTypeConverter" />
+    </UserControl.Resources>
+
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <!--<RowDefinition Height="Auto" />-->
+            </Grid.RowDefinitions>
+            <Grid Background="#03a9f4" Grid.Row="0">
+                <TextBlock VerticalAlignment="Center" Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}" Margin="16 4 16 4" Style="{StaticResource MaterialDesignHeadline5TextBlock}" Text="{Binding Title}" />
+                <Button
+                        Style="{StaticResource MaterialDesignIconForegroundButton}"
+                        Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}"
+                        HorizontalAlignment="Right"
+                        Command="{Binding BtnCloseCommand}"
+                        ToolTip="关闭" Cursor="Hand"
+                    >
+                    <materialDesign:PackIcon Kind="Close" Width="34" Height="34" />
+                </Button>
+            </Grid>
+            <Grid Grid.Row="1" Margin="0 4 0 4">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+            <ComboBox
+                    Margin="6 0 6 0"
+                    Grid.Column="0"
+                    materialDesign:HintAssist.Hint="拼音码"
+                    IsEditable="True"
+                    ItemsSource="{Binding DrugInfos_PY}"
+                    SelectedItem="{Binding DrugInfo_Py}"
+                    DisplayMemberPath="PyCode"
+                />
+            <ComboBox
+                    Margin="6 0 6 0"
+                    Grid.Column="1"
+                    materialDesign:HintAssist.Hint="药品名称"
+                    IsEditable="True"
+                    ItemsSource="{Binding DrugInfos}"
+                    SelectedItem="{Binding DrugInfo}"
+                    DisplayMemberPath="DrugName"
+                />
+            <StackPanel HorizontalAlignment="Right"  Grid.Column="3" 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>
+        <ItemsControl
+                Grid.Row="2"
+                ItemsSource="{Binding Channels}"
+                Grid.IsSharedSizeScope="True"
+                Margin="12 0 12 0">
+            <ItemsControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <UniformGrid Columns="4" />
+                </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+            <ItemsControl.ItemTemplate>
+                <DataTemplate>
+                    <materialDesign:Card
+                                Background="{StaticResource MaterialDesignLightBackground}"
+                                Margin="4"
+                                Padding="0">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <StackPanel Grid.Row="0" Orientation="Horizontal" Background="#31ccec" >
+                                <CheckBox
+                                        materialDesign:CheckBoxAssist.CheckBoxSize="30"
+                                        VerticalAlignment="Center"
+                                        IsChecked="{Binding IsSelected}" />
+                                <TextBlock
+                                        Style="{StaticResource MaterialDesignHeadline5TextBlock}"
+                                        Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}"
+                                        Padding="8"
+                                        Text="{Binding Location}" />
+                                <TextBlock
+                                        Style="{StaticResource MaterialDesignHeadline5TextBlock}"
+                                        Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}"
+                                        Padding="8"
+                                        HorizontalAlignment="Right">
+                                    <TextBlock.Text>
+                                        <MultiBinding Converter="{StaticResource BoardTypeConverter}">
+                                            <Binding Path="BoardType" />
+                                            <Binding Path="DrawerType" />
+                                        </MultiBinding>
+                                    </TextBlock.Text>
+                                </TextBlock>
+                            </StackPanel>
+                            <Grid Grid.Row="1" x:Name="Border">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+                                <Grid.Resources>
+                                    <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource MaterialDesignSubtitle1TextBlock}">
+                                        <Setter Property="Padding" Value="6" />
+                                    </Style>
+                                </Grid.Resources>
+                                <TextBlock
+                                        HorizontalAlignment="Left"
+                                        Grid.Row="0"
+                                        Grid.Column="0"
+                                        Text="药品:" />
+                                <StackPanel
+                                        Grid.Row="0"
+                                        Grid.Column="1"
+                                        HorizontalAlignment="Right"
+                                        Orientation="Horizontal">
+                                    <TextBlock Text="{Binding Drug.DrugName}" />
+                                    <TextBlock
+                                            Visibility="{Binding Quantity, Converter={StaticResource NotZeroToVisibilityConverter}}"
+                                            Text="{Binding Quantity, StringFormat=({0})}" />
+                                </StackPanel>
+
+                                <TextBlock
+                                        HorizontalAlignment="Left"
+                                        Grid.Row="1"
+                                        Grid.Column="0"
+                                        Text="批次:" />
+                                <TextBlock
+                                        HorizontalAlignment="Right"
+                                        Grid.Row="1"
+                                        Grid.Column="1"
+                                        Text="{Binding ManuNo}" />
+                                <TextBlock
+                                        HorizontalAlignment="Left"
+                                        Grid.Row="2"
+                                        Grid.Column="0"
+                                        Text="效期:" />
+                                <TextBlock
+                                        HorizontalAlignment="Right"
+                                        Grid.Row="2"
+                                        Grid.Column="1"
+                                        Text="{Binding EffDate}" />
+                            </Grid>
+                        </Grid>
+                    </materialDesign:Card>
+                    <DataTemplate.Triggers>
+                        <DataTrigger Binding="{Binding IsSelected}" Value="True">
+                            <Setter Property="RenderTransformOrigin" Value="0.5,0.5" />
+                            <Setter TargetName="Border" Property="Background" Value="#90caf9" />
+                            <Setter Property="RenderTransform">
+                                <Setter.Value>
+                                    <ScaleTransform  ScaleX="0.95" ScaleY="0.95" />
+                                </Setter.Value>
+                            </Setter>
+                        </DataTrigger>
+                    </DataTemplate.Triggers>
+                </DataTemplate>
+            </ItemsControl.ItemTemplate>
+        </ItemsControl>
+
+        <pagination:Pagination Grid.Row="3"
+                                   CurrentPage="{Binding PageNum}"
+                                   PageSize="{Binding PageSize}"
+                                   TotalPages="{Binding TotalCount}"
+                                   InfoTextIsEnabel="True"
+                                />
+        <materialDesign:Snackbar
+                Background="{Binding SnackbarBackground}"
+                MessageQueue="{Binding SnackbarMessageQueue}"/>
+        </Grid>
+</UserControl>
diff --git a/DM_Weight/Views/Dialog/BindingChannelNewDialog.xaml.cs b/DM_Weight/Views/Dialog/BindingChannelNewDialog.xaml.cs
new file mode 100644
index 0000000..3d1dd3f
--- /dev/null
+++ b/DM_Weight/Views/Dialog/BindingChannelNewDialog.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.Dialog
+{
+    /// <summary>
+    /// BindingChannelNewDialog.xaml 的交互逻辑
+    /// </summary>
+    public partial class BindingChannelNewDialog : UserControl
+    {
+        public BindingChannelNewDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/Dialog/ChangeShiftsDialog.xaml b/DM_Weight/Views/Dialog/ChangeShiftsDialog.xaml
new file mode 100644
index 0000000..f9d0f5a
--- /dev/null
+++ b/DM_Weight/Views/Dialog/ChangeShiftsDialog.xaml
@@ -0,0 +1,322 @@
+<UserControl x:Class="DM_Weight.Views.Dialog.ChangeShiftsDialog"
+             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.Dialog"
+              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:convert="clr-namespace:DM_Weight.Converter"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <UserControl.Resources>
+        <convert:BoardTypeConverter x:Key="BoardTypeConverter" />
+        <convert:ForeColorConverter x:Key="ForeColorConverter"/>
+    </UserControl.Resources>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="5*"/>
+            <ColumnDefinition Width="5*"/>
+        </Grid.ColumnDefinitions>
+        <Grid Background="#03a9f4" Grid.Row="0" Grid.ColumnSpan="2">
+            <TextBlock VerticalAlignment="Center" Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}" Margin="16 0 16 0" Style="{StaticResource MaterialDesignHeadline5TextBlock}" Text="{Binding Title}" />
+            <Button
+                        Style="{StaticResource MaterialDesignIconForegroundButton}"
+                        Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}"
+                        HorizontalAlignment="Right"
+                        Command="{Binding BtnCloseCommand}"
+                        ToolTip="关闭" Cursor="Hand"
+                    >
+                <materialDesign:PackIcon Kind="Close" Width="34" Height="34" />
+            </Button>
+        </Grid>
+        <Grid Grid.Row="1">
+            <materialDesign:Card>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition/>
+                        <RowDefinition/>
+                        <RowDefinition/>
+                        <RowDefinition/>
+                    </Grid.RowDefinitions>
+                    <TextBlock Grid.Row="0" Margin="15,10,60,5" Text="验证方式1：账号密码验证" Foreground="#31ccec" FontWeight="Bold" FontSize="14"/>
+                    <TextBox  Margin="15,5,15,5" 
+                            Grid.Row="1"
+                            x:Name="account" Foreground="Gray"
+                            Text="{Binding Username, UpdateSourceTrigger=PropertyChanged}"
+                            Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                            VerticalAlignment="Top"
+                            AcceptsReturn="False"
+                            TextWrapping="Wrap" 
+                            materialDesign:HintAssist.Hint="账号" />
+                    <PasswordBox Margin="15,5,15,5" 
+                            Grid.Row="2"
+                            x:Name="PasswordBox" Foreground="Gray"
+                            materialDesign:PasswordBoxAssist.Password="{Binding Password, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                            Style="{StaticResource MaterialDesignOutlinedPasswordBox}"
+                            VerticalAlignment="Top"
+                            materialDesign:HintAssist.Hint="密码" />
+                    <StackPanel Grid.Row="3"
+                            Grid.Column="1">
+                        <Grid Margin="2,2,2,10">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"></ColumnDefinition>
+                                <ColumnDefinition Width="3*"></ColumnDefinition>
+                                <ColumnDefinition Width="*"></ColumnDefinition>
+                                <ColumnDefinition Width="3*"></ColumnDefinition>
+                                <ColumnDefinition Width="*"></ColumnDefinition>
+                            </Grid.ColumnDefinitions>
+                            <Button
+                                    Grid.Column="1"
+                                    Style="{StaticResource MaterialDesignRaisedButton}"
+                                    materialDesign:ButtonAssist.CornerRadius="5"
+                                    Command="{ Binding LoginCommand }"
+                                    Background="#42a5f5" IsEnabled="{Binding JiaoBanOk}"
+                                    BorderBrush="#42a5f5" Cursor="Hand"  IsDefault="True"  Content="验证"/>
+                            <Button
+                                Grid.Column="3"
+                                Style="{StaticResource MaterialDesignRaisedLightButton}"
+                                Background="#7986cb"
+                                BorderBrush="#7986cb"
+                                materialDesign:ButtonAssist.CornerRadius="5" Cursor="Hand" IsCancel="true" 
+                                Command="{ Binding ClearCommand }" >
+                                <TextBlock Foreground="{DynamicResource MaterialDesignPaper}" Text="清空" />
+                            </Button>
+                        </Grid>
+                    </StackPanel>
+                </Grid>
+                <!--<StackPanel>
+                    <Expander HorizontalAlignment="Stretch" Header="验证方式1：账号密码验证"
+                              materialDesign:ExpanderAssist.HeaderFontSize="14" Foreground="#31ccec" FontWeight="Bold">
+                        <Grid>
+                            <Grid.RowDefinitions >
+                                <RowDefinition Height="*"></RowDefinition>
+                                <RowDefinition Height="*"></RowDefinition>
+                                <RowDefinition Height="*"></RowDefinition>
+                            </Grid.RowDefinitions>
+
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="4*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <TextBox
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            x:Name="account" Foreground="Gray"
+                            Text="{Binding Username, UpdateSourceTrigger=PropertyChanged}"
+                            Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                            VerticalAlignment="Top"
+                            AcceptsReturn="False"
+                            TextWrapping="Wrap" 
+                            materialDesign:HintAssist.Hint="账号" />
+                            <PasswordBox
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            x:Name="PasswordBox" Foreground="Gray"
+                            materialDesign:PasswordBoxAssist.Password="{Binding Password, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                            Style="{StaticResource MaterialDesignOutlinedPasswordBox}"
+                            VerticalAlignment="Top"
+                            materialDesign:HintAssist.Hint="密码" />
+                            <StackPanel Grid.Row="2"
+                            Grid.Column="1">
+                                <Grid Margin="0,8,0,8">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*"></ColumnDefinition>
+                                        <ColumnDefinition Width="2*"></ColumnDefinition>
+                                        <ColumnDefinition Width="*"></ColumnDefinition>
+                                        <ColumnDefinition Width="2*"></ColumnDefinition>
+                                        <ColumnDefinition Width="*"></ColumnDefinition>
+                                    </Grid.ColumnDefinitions>
+                                    <Button
+                                    Grid.Column="1"
+                                    Style="{StaticResource MaterialDesignRaisedButton}"
+                                    materialDesign:ButtonAssist.CornerRadius="5"
+                                    Command="{ Binding LoginCommand }"
+                                    Background="#42a5f5"
+                                    BorderBrush="#42a5f5" Cursor="Hand"  IsDefault="True"  Content="登录"/>
+                                    <Button
+                                Grid.Column="3"
+                                Style="{StaticResource MaterialDesignRaisedLightButton}"
+                                Background="#7986cb"
+                                BorderBrush="#7986cb"
+                                materialDesign:ButtonAssist.CornerRadius="5" Cursor="Hand" IsCancel="true" 
+                                Command="{ Binding ClearCommand }" >
+                                        <TextBlock Foreground="{DynamicResource MaterialDesignPaper}" Text="清空" />
+                                    </Button>
+                                </Grid>
+                            </StackPanel>
+                        </Grid>
+                    </Expander>
+                </StackPanel>-->
+            </materialDesign:Card>
+        </Grid>
+        <Grid Grid.Row="1" Grid.Column="1" >
+            <materialDesign:Card>
+                <Grid>
+                    <!--<Grid.Background>
+                    <ImageBrush ImageSource="/Images/finger-bg-r.png" Stretch="Fill"/>
+                </Grid.Background>-->
+                    <Grid.RowDefinitions>
+                        <RowDefinition/>
+                        <RowDefinition/>
+                        <RowDefinition/>
+                        <RowDefinition/>
+                    </Grid.RowDefinitions>
+                    <!--<StackPanel  Grid.Row="0"></StackPanel>-->
+
+                    <TextBlock Grid.Row="0" Margin="15,10,15,0" Text="验证方式2：屏幕外右侧指纹验证" Foreground="#31ccec" FontWeight="Bold" FontSize="14" />
+
+                    <StackPanel Grid.Row="1">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition/>
+                                <RowDefinition/>
+                                <RowDefinition/>
+                                <RowDefinition/>
+                            </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition/>
+                                <ColumnDefinition/>
+                            </Grid.ColumnDefinitions>
+                            <TextBlock Grid.Row="0" Text="交班人 发药人:" Grid.Column="0"  HorizontalAlignment="Right" Margin="0 15 0 5"
+                    FontSize="14" Foreground="#31ccec" FontWeight="Bold"/>
+                            <TextBlock  Grid.Row="0" Grid.Column="1" Margin="5 15 0 5" Foreground="{Binding OperatorLogin,Converter={StaticResource ForeColorConverter}}"
+                            FontSize="14"
+                            FontWeight="Bold"
+                            Text="{Binding Operator.Nickname, UpdateSourceTrigger=PropertyChanged}" />
+
+                            <TextBlock  Grid.Row="1"  Text="审核人:" Grid.Column="0" HorizontalAlignment="Right" Margin="0 15 0 5"
+                    FontSize="14" Foreground="#31ccec" FontWeight="Bold"/>
+                            <TextBlock Grid.Column="1" Margin="5 15 0 5"  Foreground="{Binding ReviewerLogin,Converter={StaticResource ForeColorConverter}}"
+                            FontSize="14"
+                            FontWeight="Bold" 
+                            Grid.Row="1" Text="{Binding Reviewer.Nickname, UpdateSourceTrigger=PropertyChanged}" />
+
+                            <TextBlock  Grid.Row="2" Text="接班人 发药人:" Grid.Column="0"  HorizontalAlignment="Right" Margin="0 15 0 5"
+                    FontSize="14" Foreground="#31ccec" FontWeight="Bold"/>
+                            <TextBlock Grid.Column="2" Margin="5 15 0 5"
+                            FontSize="14"
+                            FontWeight="Bold" TextAlignment="Left" HorizontalAlignment="Left"
+                            Foreground="#3ECFED"
+                            Grid.Row="2" Text="{Binding JieOperator.Nickname, UpdateSourceTrigger=PropertyChanged}" />
+
+                            <TextBlock Grid.Row="3" Text="审核人:" Grid.Column="0"  HorizontalAlignment="Right" Margin="0 15 0 5"
+                    FontSize="14" Foreground="#31ccec" FontWeight="Bold"/>
+                            <TextBlock Grid.Column="1" HorizontalAlignment="Left" Margin="5 15 0 5"
+                            FontSize="14"
+                            FontWeight="Bold"
+                            Foreground="#3ECFED"
+                            Grid.Row="3" Text="{Binding JieReviewer.Nickname, UpdateSourceTrigger=PropertyChanged}" />
+                        </Grid>
+                    </StackPanel>
+
+                    <!--<StackPanel  Grid.Row="2"></StackPanel>-->
+                    <!--<StackPanel  Grid.Row="3" Visibility="{Binding SingleLogin, Converter={StaticResource BooleanToVisibilityConverter}}">
+                    <materialDesign:PackIcon
+                            Kind="Fingerprint"
+                            Foreground="{DynamicResource MaterialDesignPaper}"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Width="75"
+                            Height="75"
+                        />
+                </StackPanel>-->
+                    <!--<Grid  Grid.Row="3" Visibility="{Binding MultiLogin, Converter={StaticResource BooleanToVisibilityConverter}}" Margin="0,0,0,5">
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Row="0" 
+                            FontSize="14"
+                            FontWeight="Bold"
+                            Foreground="{DynamicResource MaterialDesignPaper}"
+                            Grid.Column="1" Text="发药人：" />
+                    <TextBlock
+                            FontSize="14"
+                            FontWeight="Bold"
+                            Foreground="{DynamicResource MaterialDesignPaper}"
+                            Grid.Row="0" Grid.Column="2" Text="{Binding Operator.Nickname,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                    <TextBlock
+                            FontSize="14"
+                            FontWeight="Bold"
+                            Foreground="{DynamicResource MaterialDesignPaper}"
+                            Grid.Row="1" Grid.Column="1" Text="审核人：" />
+                    <TextBlock
+                            FontSize="14"
+                            FontWeight="Bold"
+                            Foreground="{DynamicResource MaterialDesignPaper}"
+                            Grid.Row="1" Grid.Column="2" Text="{Binding Reviewer.Nickname, UpdateSourceTrigger=PropertyChanged}" />
+                </Grid>-->
+                </Grid>
+            </materialDesign:Card>
+            <!--<Grid Grid.Row="3" Margin="0,10,0,10">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition/>
+                        <RowDefinition/>
+                        <RowDefinition/>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Row="0" Grid.Column="0" Text="交班人 发药人:"
+                    FontSize="14" Foreground="#31ccec" FontWeight="Bold"/>
+                    <TextBlock  Grid.Row="0" Grid.Column="1"
+                            FontSize="14"
+                            FontWeight="Bold"
+                            Foreground="Gray"
+                            Text="{Binding Operator.Nickname, UpdateSourceTrigger=PropertyChanged}" />
+
+                    <TextBlock  Grid.Row="0"  Text="交班人 审核人:" Grid.Column="2"
+                    FontSize="14" Foreground="#31ccec" FontWeight="Bold"/>
+                    <TextBlock Grid.Column="3"
+                            FontSize="14"
+                            FontWeight="Bold"
+                            Foreground="Gray"
+                            Grid.Row="0" Text="{Binding Reviewer.Nickname, UpdateSourceTrigger=PropertyChanged}" />
+
+                    <TextBlock  Grid.Row="1" Text="接班人 发药人:" Grid.Column="0"
+                    FontSize="14" Foreground="#31ccec" FontWeight="Bold"/>
+                    <TextBlock Grid.Column="1"
+                            FontSize="14"
+                            FontWeight="Bold" TextAlignment="Left" HorizontalAlignment="Left"
+                            Foreground="Gray"
+                            Grid.Row="1" Text="{Binding JieOperator.Nickname, UpdateSourceTrigger=PropertyChanged}" />
+
+                    <TextBlock Grid.Row="1" Text="接班人 审核人:" Grid.Column="2"
+                    FontSize="14" Foreground="#31ccec" FontWeight="Bold"/>
+                    <TextBlock Grid.Column="3"
+                            FontSize="14"
+                            FontWeight="Bold"
+                            Foreground="Gray"
+                            Grid.Row="1" Text="{Binding JieReviewer.Nickname, UpdateSourceTrigger=PropertyChanged}" />
+
+                </Grid>
+            </Grid>-->
+        </Grid>
+        <materialDesign:Card Grid.Row="2" Grid.ColumnSpan="2" Margin="10">
+            <Button
+                                    Style="{StaticResource MaterialDesignRaisedButton}"
+                                    materialDesign:ButtonAssist.CornerRadius="5"
+                                    Command="{ Binding ShiftsCommand }"
+                                    Background="#42a5f5"
+                                    BorderBrush="#42a5f5" Cursor="Hand"  IsDefault="True"  Content="确认交接"/>
+        </materialDesign:Card>
+    </Grid>
+</UserControl>
diff --git a/DM_Weight/Views/Dialog/ChangeShiftsDialog.xaml.cs b/DM_Weight/Views/Dialog/ChangeShiftsDialog.xaml.cs
new file mode 100644
index 0000000..d0ed8aa
--- /dev/null
+++ b/DM_Weight/Views/Dialog/ChangeShiftsDialog.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.Dialog
+{
+    /// <summary>
+    /// ChangeShiftsDialog.xaml 的交互逻辑
+    /// </summary>
+    public partial class ChangeShiftsDialog : UserControl
+    {
+        public ChangeShiftsDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/Dialog/EditUserDialog.xaml b/DM_Weight/Views/Dialog/EditUserDialog.xaml
new file mode 100644
index 0000000..88b4bbd
--- /dev/null
+++ b/DM_Weight/Views/Dialog/EditUserDialog.xaml
@@ -0,0 +1,106 @@
+<UserControl x:Class="DM_Weight.Views.Dialog.EditUserDialog"
+             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.Dialog"
+             xmlns:prism="http://prismlibrary.com/"
+             prism:ViewModelLocator.AutoWireViewModel="True"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:convert="clr-namespace:DM_Weight.Converter"
+             MinWidth="450"
+             Width="Auto"
+             Height="Auto"
+             mc:Ignorable="d" >
+
+    <materialDesign:Card Padding="0">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid Background="#03a9f4" Grid.Row="0">
+                <TextBlock VerticalAlignment="Center" Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}" Margin="16 4 16 4" Style="{StaticResource MaterialDesignHeadline5TextBlock}" Text="{Binding Title}" />
+                <Button
+                        Style="{StaticResource MaterialDesignIconForegroundButton}"
+                        Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}"
+                        HorizontalAlignment="Right"
+                        Command="{Binding CancelCommand}"
+                        ToolTip="关闭" Cursor="Hand"
+                    >
+                    <materialDesign:PackIcon Kind="Close" Width="34" Height="34" />
+                </Button>
+            </Grid>
+            <Grid Grid.Row="1" Margin="0 4 0 4" Visibility="{Binding EditUser,Converter={StaticResource BooleanToVisibilityConverter}}">
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <TextBox
+                    Grid.Row="0"
+                    Text="{Binding UserList.Nickname}"
+                    materialDesign:HintAssist.Hint="姓名"
+                     Margin="8 8 8 0"
+                    Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
+                <TextBox
+                    Grid.Row="1"
+                    Text="{Binding UserList.UserName}"
+                    materialDesign:HintAssist.Hint="账号"
+                     Margin="8 8 8 0"
+                    Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
+                <TextBox
+                    Grid.Row="2"
+                    Text="{Binding NewPass}"
+                    materialDesign:HintAssist.Hint="密码"
+                     Margin="8 8 8 0"
+                    Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
+                <TextBox
+                    Grid.Row="3"
+                    Text="{Binding UserList.UserBarcode}"
+                    materialDesign:HintAssist.Hint="卡号"
+                     Margin="8 8 8 0"
+                    Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
+                <ComboBox
+                    Margin="8 8 8 0"
+                    Grid.Row="4"
+                    Style="{StaticResource MaterialDesignOutlinedComboBox}"
+                    materialDesign:HintAssist.Hint="角色"
+                    ItemsSource="{Binding Roles}"
+                    SelectedValuePath="Id"
+                    SelectedValue="{Binding UserList.RoleId}"
+                    DisplayMemberPath="RoleName"/>
+            </Grid>
+            <Grid Grid.Row="2" Visibility="{Binding OnlyPassword,Converter={StaticResource BooleanToVisibilityConverter}}">
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <TextBox
+                    Grid.Row="0"
+                    Text="{Binding OldPass, ValidatesOnExceptions=True}"
+                    materialDesign:HintAssist.Hint="旧密码"
+                    Margin="8 8 8 0"
+                    Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
+                <TextBox
+                    Grid.Row="1"
+                    Text="{Binding NewPass}"
+                    materialDesign:HintAssist.Hint="新密码"
+                     Margin="8 8 8 0"
+                    Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
+            </Grid>
+            <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Center">
+                <Button Content="确定"  Margin="8" Command="{Binding SaveUser}" />
+                <Button Content="取消"  Margin="8" Command="{Binding CancelCommand}"/>
+            </StackPanel>
+            
+            <!--<materialDesign:Snackbar
+                Background="{Binding SnackbarBackground}"
+                MessageQueue="{Binding SnackbarMessageQueue}"/>-->
+        </Grid>
+    </materialDesign:Card>
+</UserControl>
diff --git a/DM_Weight/Views/Dialog/EditUserDialog.xaml.cs b/DM_Weight/Views/Dialog/EditUserDialog.xaml.cs
new file mode 100644
index 0000000..e0d3f16
--- /dev/null
+++ b/DM_Weight/Views/Dialog/EditUserDialog.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.Dialog
+{
+    /// <summary>
+    /// EditUserDialog.xaml 的交互逻辑
+    /// </summary>
+    public partial class EditUserDialog : UserControl
+    {
+        public EditUserDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/Dialog/FingerprintDialog.xaml b/DM_Weight/Views/Dialog/FingerprintDialog.xaml
new file mode 100644
index 0000000..937e826
--- /dev/null
+++ b/DM_Weight/Views/Dialog/FingerprintDialog.xaml
@@ -0,0 +1,59 @@
+<UserControl x:Class="DM_Weight.Views.Dialog.FingerprintDialog"
+             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.Dialog"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             mc:Ignorable="d" 
+             MinWidth="300"
+             Width="Auto"
+             Height="Auto">
+    <materialDesign:Card Padding="0">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid Background="#03a9f4" Grid.Row="0" 
+                Margin="0 0 0 16">
+                <TextBlock Padding="0 8 0 8" VerticalAlignment="Center" Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}" Margin="16 4 16 4" Style="{StaticResource MaterialDesignHeadline5TextBlock}" Text="{Binding Title}" />
+            </Grid>
+            <!--<ComboBox
+                Grid.Row="1"
+                Style="{StaticResource MaterialDesignOutlinedComboBox}"
+                IsEnabled="{Binding Path=IsChecked, ElementName=OutlinedComboBoxEnabledCheckBox}"
+                materialDesign:HintAssist.Hint="手指"
+                SelectedValue="{Binding FingerIndex}"
+                DisplayMemberPath="Key"
+                SelectedValuePath="Value"
+                ItemsSource="{Binding FingerIndexs}"
+                Width="256" />-->
+            <ComboBox
+                Grid.Row="1"
+                Style="{StaticResource MaterialDesignOutlinedComboBox}"
+                materialDesign:HintAssist.Hint="手指"
+                SelectedValue="{Binding FingerIndex}"
+                DisplayMemberPath="Key"
+                SelectedValuePath="Value"
+                ItemsSource="{Binding FingerIndexs}"
+                Width="256" />
+            <StackPanel Orientation="Horizontal" Grid.Row="2"
+                        HorizontalAlignment="Right"
+                    Margin="0 16 8 8">
+                <Button IsDefault="True"
+                    Style="{StaticResource MaterialDesignFlatButton}"
+                    Command="{Binding StartInsert}">
+                    确定
+                </Button>
+                <Button IsCancel="True"
+                    Margin="8 0 0 0"
+                    Style="{StaticResource MaterialDesignFlatButton}"
+                    Command="{Binding CancelCommand}">
+                    取消
+                </Button>
+            </StackPanel>
+        </Grid>
+    </materialDesign:Card>
+</UserControl>
diff --git a/DM_Weight/Views/Dialog/FingerprintDialog.xaml.cs b/DM_Weight/Views/Dialog/FingerprintDialog.xaml.cs
new file mode 100644
index 0000000..e3d606a
--- /dev/null
+++ b/DM_Weight/Views/Dialog/FingerprintDialog.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.Dialog
+{
+    /// <summary>
+    /// FingerprintDialog.xaml 的交互逻辑
+    /// </summary>
+    public partial class FingerprintDialog : UserControl
+    {
+        public FingerprintDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/Dialog/InvoiceAddDialog.xaml b/DM_Weight/Views/Dialog/InvoiceAddDialog.xaml
new file mode 100644
index 0000000..0b616e9
--- /dev/null
+++ b/DM_Weight/Views/Dialog/InvoiceAddDialog.xaml
@@ -0,0 +1,180 @@
+<UserControl x:Class="DM_Weight.Views.Dialog.InvoiceAddDialog"
+             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.Dialog"
+             xmlns:prism="http://prismlibrary.com/"
+             prism:ViewModelLocator.AutoWireViewModel="True"
+             xmlns:convert="clr-namespace:DM_Weight.Converter"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             MinWidth="880"
+             Width="Auto"
+             Height="Auto"
+             mc:Ignorable="d" >
+
+    <UserControl.Resources>
+        <convert:StatusConverter x:Key="StatusConverter" />
+    </UserControl.Resources>
+    <materialDesign:Card Padding="0">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="50" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid Background="#03a9f4" Grid.Row="0">
+                <TextBlock VerticalAlignment="Center" Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}" Margin="16 4 16 4" Style="{StaticResource MaterialDesignHeadline5TextBlock}" Text="{Binding Title}" />
+                <Button
+                        Style="{StaticResource MaterialDesignIconForegroundButton}"
+                        Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}"
+                        HorizontalAlignment="Right"
+                        Command="{Binding BtnCloseCommand}"
+                        IsEnabled="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CloseBtn}"
+                        ToolTip="关闭"
+                    >
+                    <materialDesign:PackIcon Kind="Close" Width="34" Height="34" />
+                </Button>
+            </Grid>
+            <Grid Grid.Row="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="3*" />
+                    <ColumnDefinition Width="3*" />
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="3*" />
+                </Grid.ColumnDefinitions>
+
+                <TextBlock
+                      Grid.Column="0"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Right"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="凭证单号：" />
+                <TextBlock
+                      Grid.Column="1"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Left"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="{Binding Invoice.InvoiceNo}" />
+                <TextBlock
+                      Grid.Column="2"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Right"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="时间：" />
+                <TextBlock
+                      Grid.Column="3"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Left"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="{Binding Invoice.InvoiceDate}" />
+            </Grid>
+            <DataGrid Grid.Row="2" ItemsSource="{Binding ChannelStocks}" AutoGenerateColumns="False" CanUserAddRows="False">
+                <DataGrid.Resources>
+                    <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}">
+                        <Setter Property="HorizontalContentAlignment" Value="Center" />
+                        <Setter Property="Background" Value="#31ccec" />
+                        <Setter Property="Foreground" Value="white" />
+                        <Setter Property="Height" Value="48" />
+                        <Setter Property="BorderThickness" Value="0.6"/>
+                    </Style>
+                    <Style TargetType="{x:Type DataGridCell}" BasedOn="{StaticResource MaterialDesignDataGridCell}">
+                        <Setter Property="HorizontalAlignment" Value="Left" />
+                        <Setter Property="Padding" Value="13" />
+                        
+                    </Style>
+                </DataGrid.Resources>
+                <DataGrid.Columns>
+                    <DataGridTextColumn Width="100"
+                            Header="库位"
+                            IsReadOnly="True"
+                            Binding="{Binding Location}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn Width="180"
+                            Header="药品名称"
+                            IsReadOnly="True"
+                            Binding="{Binding DrugInfo.DrugName}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn Width="180"
+                            Header="规格"
+                            IsReadOnly="True"
+                            Binding="{Binding DrugInfo.DrugSpec}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                         />
+                    <DataGridTextColumn Width="100"
+                            Header="数量" 
+                            IsReadOnly="True"
+                            Binding="{Binding Quantity}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn Width="121"
+                            Header="批次"
+                            IsReadOnly="True"
+                            Binding="{Binding ManuNo}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn Width="100"
+                            Header="效期"
+                            IsReadOnly="True"
+                            Binding="{Binding EffDate}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn Width="100"
+                            Header="添加数量"
+                            IsReadOnly="True"
+                            Binding="{Binding AddQuantity}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                </DataGrid.Columns>
+            </DataGrid>
+            <Grid Grid.Row="3">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <StackPanel Orientation="Horizontal" Grid.Column="1" HorizontalAlignment="Center">
+
+                    <Button
+                            Margin="2"
+                            Style="{StaticResource MaterialDesignRaisedAccentButton}"
+                            Visibility="{Binding Status,Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnVisible}"
+                            materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                            materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                            Content="加药"
+                            Command="{Binding OpenDrawer}">
+                    </Button>
+                    <Button
+                            Margin="2"
+                            Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CompleteBtn}"
+                            Style="{StaticResource MaterialDesignRaisedAccentButton}"
+                            Content="完成"
+                            Command="{Binding TakeFinish}"/>
+                    <Button
+                            Margin="2"
+                            Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CancelBtn}"
+                            Style="{StaticResource MaterialDesignRaisedButton}"
+                            Background="Orange"
+                            BorderBrush="Orange"
+                            Content="取消"
+                            Command="{Binding CancleTake}" />
+                </StackPanel>
+
+            </Grid>
+        </Grid>
+    </materialDesign:Card>
+</UserControl>
\ No newline at end of file
diff --git a/DM_Weight/Views/Dialog/InvoiceAddDialog.xaml.cs b/DM_Weight/Views/Dialog/InvoiceAddDialog.xaml.cs
new file mode 100644
index 0000000..afdc06c
--- /dev/null
+++ b/DM_Weight/Views/Dialog/InvoiceAddDialog.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.Dialog
+{
+    /// <summary>
+    /// InvoiceAddDialog.xaml 的交互逻辑
+    /// </summary>
+    public partial class InvoiceAddDialog : UserControl
+    {
+        public InvoiceAddDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/Dialog/InvoiceTakeDialog.xaml b/DM_Weight/Views/Dialog/InvoiceTakeDialog.xaml
new file mode 100644
index 0000000..c5b34bf
--- /dev/null
+++ b/DM_Weight/Views/Dialog/InvoiceTakeDialog.xaml
@@ -0,0 +1,181 @@
+<!--处方取药弹窗-->
+<UserControl x:Class="DM_Weight.Views.Dialog.InvoiceTakeDialog"
+             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.Dialog"
+             xmlns:prism="http://prismlibrary.com/"
+             prism:ViewModelLocator.AutoWireViewModel="True"
+             xmlns:convert="clr-namespace:DM_Weight.Converter"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             MinWidth="880"
+             Width="Auto"
+             Height="Auto"
+             mc:Ignorable="d" >
+
+    <UserControl.Resources>
+        <convert:StatusConverter x:Key="StatusConverter" />
+    </UserControl.Resources>
+    <materialDesign:Card Padding="0">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="50" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid Background="#03a9f4" Grid.Row="0">
+                <TextBlock VerticalAlignment="Center" Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}" Margin="16 4 16 4" Style="{StaticResource MaterialDesignHeadline5TextBlock}" Text="{Binding Title}" />
+                <Button
+                        Style="{StaticResource MaterialDesignIconForegroundButton}"
+                        Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}"
+                        HorizontalAlignment="Right"
+                        Command="{Binding BtnCloseCommand}"
+                        IsEnabled="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CloseBtn}"
+                        ToolTip="关闭"
+                    >
+                    <materialDesign:PackIcon Kind="Close" Width="34" Height="34" />
+                </Button>
+            </Grid>
+            <Grid Grid.Row="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="3*" />
+                    <ColumnDefinition Width="3*" />
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="3*" />
+                </Grid.ColumnDefinitions>
+
+                <TextBlock
+                      Grid.Column="0"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Right"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="凭证单号：" />
+                <TextBlock
+                      Grid.Column="1"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Left"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="{Binding Invoice.InvoiceNo}" />
+                <TextBlock
+                      Grid.Column="2"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Right"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="时间：" />
+                <TextBlock
+                      Grid.Column="3"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Left"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="{Binding Invoice.InvoiceDate}" />
+            </Grid>
+            <DataGrid Grid.Row="2" ItemsSource="{Binding ChannelStocks}" AutoGenerateColumns="False" CanUserAddRows="False">
+                <DataGrid.Resources>
+                    <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}">
+                        <Setter Property="HorizontalContentAlignment" Value="Center" />
+                        <Setter Property="Background" Value="#31ccec" />
+                        <Setter Property="Foreground" Value="white" />
+                        <Setter Property="Height" Value="48" />
+                        <Setter Property="BorderBrush" Value="white"/>
+                        <Setter Property="BorderThickness" Value="0.6"/>
+                    </Style>
+                    <Style TargetType="{x:Type DataGridCell}" BasedOn="{StaticResource MaterialDesignDataGridCell}">
+                        <Setter Property="HorizontalAlignment" Value="Left" />
+                        <Setter Property="Padding" Value="13" />
+                    </Style>
+                </DataGrid.Resources>
+                <DataGrid.Columns>
+                    <DataGridTextColumn  Width="100"
+                            Header="库位"
+                            IsReadOnly="True"
+                            Binding="{Binding Location}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn Width="180"
+                            Header="药品名称"
+                            IsReadOnly="True"
+                            Binding="{Binding DrugInfo.DrugName}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn  Width="180"
+                            Header="规格"
+                            IsReadOnly="True"
+                            Binding="{Binding DrugInfo.DrugSpec}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                         />
+                    <DataGridTextColumn Width="100"
+                            Header="数量" 
+                            IsReadOnly="True"
+                            Binding="{Binding Quantity}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn  Width="130"
+                            Header="批次"
+                            IsReadOnly="True"
+                            Binding="{Binding ManuNo}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn  Width="130"
+                            Header="效期"
+                            IsReadOnly="True"
+                            Binding="{Binding EffDate}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn Width="100"
+                            Header="取出数量"
+                            IsReadOnly="True"
+                            Binding="{Binding TakeQuantity}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                </DataGrid.Columns>
+            </DataGrid>
+            <Grid Grid.Row="3">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <StackPanel Orientation="Horizontal" Grid.Column="1" HorizontalAlignment="Center">
+
+                    <Button
+                            Margin="2"
+                            Style="{StaticResource MaterialDesignRaisedAccentButton}"
+                            Visibility="{Binding Status,Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnVisible}"
+                            materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                            materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                            Content="取药"
+                            Command="{Binding OpenDrawer}">
+                    </Button>
+                    <Button
+                            Margin="2"
+                            Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CompleteBtn}"
+                            Style="{StaticResource MaterialDesignRaisedAccentButton}"
+                            Content="完成"
+                            Command="{Binding TakeFinish}"/>
+                    <Button
+                            Margin="2"
+                            Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CancelBtn}"
+                            Style="{StaticResource MaterialDesignRaisedButton}"
+                            Background="Orange"
+                            BorderBrush="Orange"
+                            Content="取消"
+                            Command="{Binding CancleTake}" />
+                </StackPanel>
+
+            </Grid>
+        </Grid>
+    </materialDesign:Card>
+</UserControl>
diff --git a/DM_Weight/Views/Dialog/InvoiceTakeDialog.xaml.cs b/DM_Weight/Views/Dialog/InvoiceTakeDialog.xaml.cs
new file mode 100644
index 0000000..e3ed5da
--- /dev/null
+++ b/DM_Weight/Views/Dialog/InvoiceTakeDialog.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.Dialog
+{
+    /// <summary>
+    /// OrderTakeDialog.xaml 的交互逻辑
+    /// </summary>
+    public partial class InvoiceTakeDialog : UserControl
+    {
+        public InvoiceTakeDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/Dialog/OrderReturnDialog.xaml b/DM_Weight/Views/Dialog/OrderReturnDialog.xaml
new file mode 100644
index 0000000..1ac252f
--- /dev/null
+++ b/DM_Weight/Views/Dialog/OrderReturnDialog.xaml
@@ -0,0 +1,239 @@
+<!--处方取药弹窗-->
+<UserControl x:Class="DM_Weight.Views.Dialog.OrderReturnDialog"
+             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.Dialog"
+             xmlns:prism="http://prismlibrary.com/"
+             prism:ViewModelLocator.AutoWireViewModel="True"
+             xmlns:convert="clr-namespace:DM_Weight.Converter"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             MinWidth="880"
+             Width="Auto"
+             Height="Auto"
+             mc:Ignorable="d" >
+
+    <UserControl.Resources>
+        <convert:StatusConverter x:Key="StatusConverter" />
+        <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>
+    <materialDesign:Card Padding="0">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="50" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid Background="#03a9f4" Grid.Row="0">
+                <TextBlock VerticalAlignment="Center" Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}" Margin="16 4 16 4" Style="{StaticResource MaterialDesignHeadline5TextBlock}" Text="处方退药" />
+                <Button
+                        Style="{StaticResource MaterialDesignIconForegroundButton}"
+                        Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}"
+                        HorizontalAlignment="Right"
+                        Command="{Binding BtnCloseCommand}"
+                        IsEnabled="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CloseBtn}"
+                        ToolTip="关闭"
+                    >
+                    <materialDesign:PackIcon Kind="Close" Width="34" Height="34" />
+                </Button>
+            </Grid>
+            <Grid Grid.Row="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="3*" />
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+
+                <TextBlock
+                      Grid.Column="0"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Right"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="处方号：" />
+                <TextBlock
+                      Grid.Column="1"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Left"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="{Binding OrderInfo.OrderNo}" />
+                <TextBlock
+                      Grid.Column="2"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Right"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="患者姓名：" />
+                <TextBlock
+                      Grid.Column="3"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Left"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="{Binding OrderInfo.PName}" />
+                <TextBlock
+                      Grid.Column="4"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Right"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="性别：" />
+                <TextBlock
+                      Grid.Column="5"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Left"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="{Binding OrderInfo.Sex}" />
+                <TextBlock
+                      Grid.Column="6"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Right"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="年龄：" />
+                <TextBlock
+                      Grid.Column="7"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Left"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="{Binding OrderInfo.Age}" />
+            </Grid>
+            <DataGrid Grid.Row="2" ItemsSource="{Binding ChannelStocks}" AutoGenerateColumns="False" CanUserAddRows="False">
+                <DataGrid.Resources>
+                    <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}">
+                        <Setter Property="HorizontalContentAlignment" Value="Center" />
+                        <Setter Property="Background" Value="#31ccec" />
+                        <Setter Property="Foreground" Value="white" />
+                        <Setter Property="Height" Value="48" />
+                        <Setter Property="BorderThickness" Value="0.6"/>
+                        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                    </Style>
+                    <Style TargetType="{x:Type DataGridCell}" BasedOn="{StaticResource MaterialDesignDataGridCell}">
+                        <Setter Property="HorizontalAlignment" Value="Center" />
+                        <Setter Property="Padding" Value="13" />
+                        <Style.Triggers>
+                            <Trigger Property="IsReadOnly" Value="True">
+                                <Setter Property="BorderBrush" Value="Transparent" />
+                                <Setter Property="HorizontalAlignment" Value="Left"/>
+                            </Trigger>
+                        </Style.Triggers>
+                    </Style>
+                </DataGrid.Resources>
+                <DataGrid.Columns>
+                    <DataGridTextColumn  Width="100"
+                            Header="库位"
+                            IsReadOnly="True"
+                            Binding="{Binding Location}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn  Width="150"
+                            Header="药品名称"
+                            IsReadOnly="True"
+                            Binding="{Binding DrugInfo.DrugName}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn   Width="150"
+                            Header="规格"
+                            IsReadOnly="True"
+                            Binding="{Binding DrugInfo.DrugSpec}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                         />
+                    <DataGridTextColumn Width="100"
+                            Header="数量" 
+                            IsReadOnly="True"
+                            Binding="{Binding Quantity}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn  Width="100"
+                            Header="批次"
+                            IsReadOnly="True"
+                            Binding="{Binding ManuNo}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn Width="150"
+                            Header="效期"
+                            IsReadOnly="True"
+                            Binding="{Binding EffDate}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn  Width="100"
+                            Header="取出数量"
+                            IsReadOnly="True"
+                            Binding="{Binding ReturnQuantity}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn  Width="100"
+                            Header="归还数量"
+                            IsReadOnly="True"
+                            Binding="{Binding ReturnQuantity}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                </DataGrid.Columns>
+            </DataGrid>
+            <Grid Grid.Row="3">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <StackPanel Orientation="Horizontal" Grid.Column="1" HorizontalAlignment="Center">
+
+                    <Button
+                            Margin="2"
+                            Style="{StaticResource MaterialDesignRaisedAccentButton}"
+                            Visibility="{Binding Status,Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnVisible}"
+                            materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                            materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                            Content="退药"
+                            Command="{Binding OpenDrawer}">
+                    </Button>
+                    <Button
+                            Margin="2"
+                            Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CompleteBtn}"
+                            Style="{StaticResource MaterialDesignRaisedAccentButton}"
+                            Content="完成"
+                            Command="{Binding TakeFinish}"/>
+                    <Button
+                            Margin="2"
+                            Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CancelBtn}"
+                            Style="{StaticResource MaterialDesignRaisedButton}"
+                            Background="Orange"
+                            BorderBrush="Orange"
+                            Content="取消"
+                            Command="{Binding CancleTake}" />
+                </StackPanel>
+
+            </Grid>
+        </Grid>
+    </materialDesign:Card>
+</UserControl>
diff --git a/DM_Weight/Views/Dialog/OrderReturnDialog.xaml.cs b/DM_Weight/Views/Dialog/OrderReturnDialog.xaml.cs
new file mode 100644
index 0000000..5ec7a3b
--- /dev/null
+++ b/DM_Weight/Views/Dialog/OrderReturnDialog.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.Dialog
+{
+    /// <summary>
+    /// OrderTakeDialog.xaml 的交互逻辑
+    /// </summary>
+    public partial class OrderReturnDialog : UserControl
+    {
+        public OrderReturnDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/Dialog/OrderTakeDialog.xaml b/DM_Weight/Views/Dialog/OrderTakeDialog.xaml
new file mode 100644
index 0000000..651c5e2
--- /dev/null
+++ b/DM_Weight/Views/Dialog/OrderTakeDialog.xaml
@@ -0,0 +1,222 @@
+<!--处方取药弹窗-->
+<UserControl x:Class="DM_Weight.Views.Dialog.OrderTakeDialog"
+             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.Dialog"
+             xmlns:prism="http://prismlibrary.com/"
+             prism:ViewModelLocator.AutoWireViewModel="True"
+             xmlns:convert="clr-namespace:DM_Weight.Converter"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             MinWidth="880"
+             Width="Auto"
+             Height="Auto"
+             mc:Ignorable="d" >
+    <UserControl.Resources>
+        <convert:StatusConverter x:Key="StatusConverter" />
+    </UserControl.Resources>
+    <materialDesign:Card Padding="0">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="50" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid Background="#03a9f4" Grid.Row="0">
+                <TextBlock VerticalAlignment="Center" Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}" Margin="16 4 16 4" Style="{StaticResource MaterialDesignHeadline5TextBlock}" Text="处方取药" />
+                <Button
+                        Style="{StaticResource MaterialDesignIconForegroundButton}"
+                        Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}"
+                        HorizontalAlignment="Right"
+                        Command="{Binding BtnCloseCommand}"
+                        IsEnabled="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CloseBtn}"
+                        ToolTip="关闭"
+                    >
+                    <materialDesign:PackIcon Kind="Close" Width="34" Height="34" />
+                </Button>
+            </Grid>
+            <Grid Grid.Row="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="3*" />
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+
+                <TextBlock
+                      Grid.Column="0"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Right"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="处方号：" />
+                <TextBlock
+                      Grid.Column="1"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Left"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="{Binding OrderInfo.OrderNo}" />
+                <TextBlock
+                      Grid.Column="2"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Right"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="患者姓名：" />
+                <TextBlock
+                      Grid.Column="3"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Left"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="{Binding OrderInfo.PName}" />
+                <TextBlock
+                      Grid.Column="4"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Right"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="性别：" />
+                <TextBlock
+                      Grid.Column="5"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Left"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="{Binding OrderInfo.Sex}" />
+                <TextBlock
+                      Grid.Column="6"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Right"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="年龄：" />
+                <TextBlock
+                      Grid.Column="7"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Left"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="{Binding OrderInfo.Age}" />
+            </Grid>
+            <DataGrid Grid.Row="2" ItemsSource="{Binding ChannelStocks}" AutoGenerateColumns="False" CanUserAddRows="False">
+                <DataGrid.Resources>
+                    <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}">
+                        <Setter Property="HorizontalContentAlignment" Value="Center" />
+                        <Setter Property="Background" Value="#31ccec" />
+                        <Setter Property="Foreground" Value="white" />
+                        <Setter Property="Height" Value="48" />
+                        <Setter Property="BorderBrush" Value="white"/>
+                        <Setter Property="BorderThickness" Value="0.6"/>
+                    </Style>
+                    <Style TargetType="{x:Type DataGridCell}" BasedOn="{StaticResource MaterialDesignDataGridCell}">
+                        <Setter Property="HorizontalAlignment" Value="left" />
+                        <Setter Property="Padding" Value="13" />
+                    </Style>
+                </DataGrid.Resources>
+                <DataGrid.Columns>
+
+                        <DataGridTextColumn Width="100"
+                            Header="库位"
+                            IsReadOnly="True"
+                            Binding="{Binding Location}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn  Width="180"
+                            Header="药品名称"
+                            IsReadOnly="True"
+                            Binding="{Binding DrugInfo.DrugName}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn  Width="180"
+                            Header="规格"
+                            IsReadOnly="True"
+                            Binding="{Binding DrugInfo.DrugSpec}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                         />
+                    <DataGridTextColumn  Width="100"
+                            Header="数量" 
+                            IsReadOnly="True"
+                            Binding="{Binding Quantity}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn  Width="130"
+                            Header="批次"
+                            IsReadOnly="True"
+                            Binding="{Binding ManuNo}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn  Width="130"
+                            Header="效期"
+                            IsReadOnly="True"
+                            Binding="{Binding EffDate}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn  Width="100"
+                            Header="取出数量"
+                            IsReadOnly="True"
+                            Binding="{Binding TakeQuantity}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    </DataGrid.Columns>
+            </DataGrid>
+            <Grid Grid.Row="3">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <StackPanel Orientation="Horizontal" Grid.Column="1" HorizontalAlignment="Center">
+
+                    <!--<Button
+                            Margin="2"
+                            Style="{StaticResource MaterialDesignRaisedAccentButton}"
+                            Visibility="{Binding Status,Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnVisible}"
+                            materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                            materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                            Content="取药"
+                            Command="{Binding OpenDrawer}">
+                    </Button>-->
+                    <Button
+                            Margin="2"
+                            Style="{StaticResource MaterialDesignRaisedAccentButton}"
+                            Visibility="{Binding Status,Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnVisible}"
+                            materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                            materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                            Content="取药"
+                            Command="{Binding OpenDrawer}">
+                    </Button>
+                    <Button
+                            Margin="2"
+                            Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CompleteBtn}"
+                            Style="{StaticResource MaterialDesignRaisedAccentButton}"
+                            Content="完成"
+                            Command="{Binding TakeFinish}"/>
+                    <Button
+                            Margin="2"
+                            Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CancelBtn}"
+                            Style="{StaticResource MaterialDesignRaisedButton}"
+                            Background="Orange"
+                            BorderBrush="Orange"
+                            Content="取消"
+                            Command="{Binding CancleTake}" />
+                </StackPanel>
+
+            </Grid>
+        </Grid>
+    </materialDesign:Card>
+</UserControl>
diff --git a/DM_Weight/Views/Dialog/OrderTakeDialog.xaml.cs b/DM_Weight/Views/Dialog/OrderTakeDialog.xaml.cs
new file mode 100644
index 0000000..b441d48
--- /dev/null
+++ b/DM_Weight/Views/Dialog/OrderTakeDialog.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.Dialog
+{
+    /// <summary>
+    /// OrderTakeDialog.xaml 的交互逻辑
+    /// </summary>
+    public partial class OrderTakeDialog : UserControl
+    {
+        public OrderTakeDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/Dialog/ReturnDrugDialog.xaml b/DM_Weight/Views/Dialog/ReturnDrugDialog.xaml
new file mode 100644
index 0000000..dbfc7c9
--- /dev/null
+++ b/DM_Weight/Views/Dialog/ReturnDrugDialog.xaml
@@ -0,0 +1,201 @@
+<UserControl x:Class="DM_Weight.Views.Dialog.ReturnDrugDialog"
+             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.Dialog"
+             xmlns:prism="http://prismlibrary.com/"
+             prism:ViewModelLocator.AutoWireViewModel="True"
+             xmlns:convert="clr-namespace:DM_Weight.Converter"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             MinWidth="880"
+             Width="Auto"
+             Height="Auto"
+             mc:Ignorable="d" >
+
+    <UserControl.Resources>
+        <convert:StatusConverter x:Key="StatusConverter" />
+        <convert:InputQuantityConverter x:Key="InputQuantityConverter" />
+        <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>
+    <materialDesign:Card Padding="0">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="50" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid Background="#03a9f4" Grid.Row="0">
+                <TextBlock VerticalAlignment="Center" Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}" Margin="16 4 16 4" Style="{StaticResource MaterialDesignHeadline5TextBlock}" Text="{Binding Title}" />
+                <Button
+                        Style="{StaticResource MaterialDesignIconForegroundButton}"
+                        Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}"
+                        HorizontalAlignment="Right"
+                        Command="{Binding BtnCloseCommand}"
+                        ToolTip="关闭"
+                    >
+                    <materialDesign:PackIcon Kind="Close" Width="34" Height="34" />
+                </Button>
+            </Grid>
+            <Grid Grid.Row="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="3*" />
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="3*" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+
+                <TextBlock
+                      Grid.Column="0"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Right"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="药品：" />
+                <TextBlock
+                      Grid.Column="1"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Left"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="{Binding MachineRecord.DrugInfo.DrugName}" />
+                <TextBlock
+                      Grid.Column="2"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Right"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="规格：" />
+                <TextBlock
+                      Grid.Column="3"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Left"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="{Binding MachineRecord.DrugInfo.DrugSpec}" />
+                <TextBlock
+                      Grid.Column="4"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Right"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="厂家：" />
+                <TextBlock
+                      Grid.Column="5"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Left"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="{Binding MachineRecord.DrugInfo.Manufactory}" />
+                <TextBlock
+                      Grid.Column="6"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Right"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="可还数量：" />
+                <TextBlock
+                      Grid.Column="7"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Left"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="{Binding MachineRecord.CanReturnQuantity}" />
+            </Grid>
+            <ListView
+            Grid.Row="2"
+            ItemsSource="{Binding ChannelStocks}"
+            SelectedItem="{Binding ChannelStock}"
+            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="200"
+                        Header="库位"
+                        DisplayMemberBinding="{Binding Location}"/>
+                        <GridViewColumn Width="200"
+                        Header="批次"
+                        DisplayMemberBinding="{Binding ManuNo}" />
+                        <GridViewColumn Width="200"
+                        DisplayMemberBinding="{Binding EffDate}"
+                        Header="效期"/>
+                        <GridViewColumn Width="200"
+                        DisplayMemberBinding="{Binding Quantity}"
+                        Header="库存"/>
+                    </GridView>
+                </ListView.View>
+            </ListView>
+            
+            <Grid Grid.Row="3">
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <TextBox
+                    Margin="0 6 0 6"
+                    Grid.Row="0"
+                    Grid.Column="1"
+                    IsReadOnly="{Binding ChannelStock.BoardType, Converter={StaticResource InputQuantityConverter}}"
+                    Text="{Binding ReturnQuantity, UpdateSourceTrigger=PropertyChanged, ValidatesOnExceptions=True}"
+                    Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                    VerticalAlignment="Top"
+                    materialDesign:HintAssist.Hint="归还数量" />
+                <StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Center">
+                    
+                    <Button
+                            Margin="2"
+                            Style="{StaticResource MaterialDesignRaisedAccentButton}"
+                            Visibility="{Binding Status,Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnVisible}"
+                            materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                            materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                            Content="还药"
+                            Command="{Binding OpenDrawer}">
+                    </Button>
+                    <Button
+                            Margin="2"
+                            Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CompleteBtn}"
+                            Style="{StaticResource MaterialDesignRaisedAccentButton}"
+                            Content="完成"
+                            Command="{Binding TakeFinish}"/>
+                    <Button
+                            Margin="2"
+                            Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CancelBtn}"
+                            Style="{StaticResource MaterialDesignRaisedButton}"
+                            Background="Orange"
+                            BorderBrush="Orange"
+                            Content="取消"
+                            Command="{Binding CancleTake}" Cursor="Hand" />
+                </StackPanel>
+
+            </Grid>
+        </Grid>
+    </materialDesign:Card>
+</UserControl>
diff --git a/DM_Weight/Views/Dialog/ReturnDrugDialog.xaml.cs b/DM_Weight/Views/Dialog/ReturnDrugDialog.xaml.cs
new file mode 100644
index 0000000..3009a15
--- /dev/null
+++ b/DM_Weight/Views/Dialog/ReturnDrugDialog.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.Dialog
+{
+    /// <summary>
+    /// ReturnDrugDialog.xaml 的交互逻辑
+    /// </summary>
+    public partial class ReturnDrugDialog : UserControl
+    {
+        public ReturnDrugDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/Dialog/ReturnEmptyDialog.xaml b/DM_Weight/Views/Dialog/ReturnEmptyDialog.xaml
new file mode 100644
index 0000000..05f0b15
--- /dev/null
+++ b/DM_Weight/Views/Dialog/ReturnEmptyDialog.xaml
@@ -0,0 +1,211 @@
+<UserControl x:Class="DM_Weight.Views.Dialog.ReturnEmptyDialog"
+             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.Dialog"
+             xmlns:prism="http://prismlibrary.com/"
+             prism:ViewModelLocator.AutoWireViewModel="True"
+             xmlns:convert="clr-namespace:DM_Weight.Converter"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             MinWidth="880"
+             Width="Auto"
+             Height="Auto"
+             mc:Ignorable="d" >
+
+    <UserControl.Resources>
+        <convert:StatusConverter x:Key="StatusConverter" />
+        <convert:InputQuantityConverter x:Key="InputQuantityConverter" />
+        <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>
+    <materialDesign:Card Padding="0">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="50" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid Background="#03a9f4" Grid.Row="0">
+                <TextBlock VerticalAlignment="Center" Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}" Margin="16 4 16 4" Style="{StaticResource MaterialDesignHeadline5TextBlock}" Text="{Binding Title}" />
+                <Button
+                        Style="{StaticResource MaterialDesignIconForegroundButton}"
+                        Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}"
+                        HorizontalAlignment="Right"
+                        Command="{Binding BtnCloseCommand}"
+                        IsEnabled="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CloseBtn}"
+                        ToolTip="关闭"
+                    >
+                    <materialDesign:PackIcon Kind="Close" Width="34" Height="34" />
+                </Button>
+            </Grid>
+            <Grid Grid.Row="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="3*" />
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="3*" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+
+                <TextBlock
+                      Grid.Column="0"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Right"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="药品：" />
+                <TextBlock
+                      Grid.Column="1"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Left"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="{Binding ChannelStock.DrugInfo.DrugName}" />
+                <TextBlock
+                      Grid.Column="2"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Right"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="规格：" />
+                <TextBlock
+                      Grid.Column="3"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Left"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="{Binding ChannelStock.DrugInfo.DrugSpec}" />
+                <TextBlock
+                      Grid.Column="4"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Right"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="厂家：" />
+                <TextBlock
+                      Grid.Column="5"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Left"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="{Binding ChannelStock.DrugInfo.Manufactory}" />
+                <TextBlock
+                      Grid.Column="6"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Right"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="可还空瓶数：" />
+                <TextBlock
+                      Grid.Column="7"
+                      Margin="16 0 16 8"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Left"
+                      Style="{StaticResource MaterialDesignBody2TextBlock}"
+                      Text="{Binding ChannelStock.CanReturnQuantity}" />
+            </Grid>
+            <ListView
+                Grid.Row="2"
+                ItemsSource="{Binding MachineRecords}"
+                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 Header="选择" Width="100">
+                            <GridViewColumn.CellTemplate>
+                                <DataTemplate>
+                                    <CheckBox IsChecked="{Binding IsSelected}" />
+                                </DataTemplate>
+                            </GridViewColumn.CellTemplate>
+                        </GridViewColumn>
+                        <GridViewColumn Width="100"
+                            Header="操作人"
+                            DisplayMemberBinding="{Binding User.Nickname}"/>
+                        <GridViewColumn Width="150"
+                            Header="时间"
+                            DisplayMemberBinding="{Binding OperationTime, StringFormat='yyyy-MM-dd HH:mm:ss'}" />
+                        <GridViewColumn Width="100"
+                            DisplayMemberBinding="{Binding Quantity}"
+                            Header="数量"/>
+                        <GridViewColumn Width="150"
+                            DisplayMemberBinding="{Binding ManuNo}"
+                            Header="批次"/>
+                        <GridViewColumn Width="150"
+                            DisplayMemberBinding="{Binding EffDate, StringFormat=yyyy-MM-dd}"
+                            Header="效期"/>
+                    </GridView>
+                </ListView.View>
+            </ListView>
+
+            <Grid Grid.Row="3">
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <TextBox
+                    Margin="0 6 0 6"
+                    Grid.Row="0"
+                    Grid.Column="1"
+                    IsReadOnly="{Binding ChannelStock.BoardType, Converter={StaticResource InputQuantityConverter}}"
+                    Text="{Binding ReturnQuantity, UpdateSourceTrigger=PropertyChanged, ValidatesOnExceptions=True}"
+                    Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                    VerticalAlignment="Top"
+                    materialDesign:HintAssist.Hint="归还数量" />
+                <StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Center">
+
+                    <Button
+                            Margin="2"
+                            Style="{StaticResource MaterialDesignRaisedAccentButton}"
+                            Visibility="{Binding Status,Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnVisible}"
+                            materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                            materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                            Content="归还"
+                            Command="{Binding OpenDrawer}">
+                    </Button>
+                    <Button
+                            Margin="2"
+                            Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CompleteBtn}"
+                            Style="{StaticResource MaterialDesignRaisedAccentButton}"
+                            Content="完成"
+                            Command="{Binding TakeFinish}"/>
+                    <Button
+                            Margin="2"
+                            Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CancelBtn}"
+                            Style="{StaticResource MaterialDesignRaisedButton}"
+                            Background="Orange"
+                            BorderBrush="Orange"
+                            Content="取消"
+                            Command="{Binding CancleTake}" />
+                </StackPanel>
+
+            </Grid>
+        </Grid>
+    </materialDesign:Card>
+</UserControl>
diff --git a/DM_Weight/Views/Dialog/ReturnEmptyDialog.xaml.cs b/DM_Weight/Views/Dialog/ReturnEmptyDialog.xaml.cs
new file mode 100644
index 0000000..f469daf
--- /dev/null
+++ b/DM_Weight/Views/Dialog/ReturnEmptyDialog.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.Dialog
+{
+    /// <summary>
+    /// ReturnEmptyDialog.xaml 的交互逻辑
+    /// </summary>
+    public partial class ReturnEmptyDialog : UserControl
+    {
+        public ReturnEmptyDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/Dialog/SelfAddDialog.xaml b/DM_Weight/Views/Dialog/SelfAddDialog.xaml
new file mode 100644
index 0000000..6eab3a8
--- /dev/null
+++ b/DM_Weight/Views/Dialog/SelfAddDialog.xaml
@@ -0,0 +1,147 @@
+<UserControl x:Class="DM_Weight.Views.Dialog.SelfAddDialog"
+             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.Dialog"
+             xmlns:prism="http://prismlibrary.com/"
+             prism:ViewModelLocator.AutoWireViewModel="True"
+             xmlns:convert="clr-namespace:DM_Weight.Converter"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             MinWidth="880"
+             Width="Auto"
+             Height="Auto"
+             mc:Ignorable="d" >
+
+    <UserControl.Resources>
+        <convert:StatusConverter x:Key="StatusConverter" />
+    </UserControl.Resources>
+    <materialDesign:Card Padding="0">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid Background="#03a9f4" Grid.Row="0">
+                <TextBlock VerticalAlignment="Center" Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}" Margin="16 4 16 4" Style="{StaticResource MaterialDesignHeadline5TextBlock}" Text="{Binding Title}" />
+                <Button
+                        Style="{StaticResource MaterialDesignIconForegroundButton}"
+                        Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}"
+                        HorizontalAlignment="Right"
+                        Command="{Binding BtnCloseCommand}"
+                        IsEnabled="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CloseBtn}"
+                        ToolTip="关闭"
+                    >
+                    <materialDesign:PackIcon Kind="Close" Width="34" Height="34" />
+                </Button>
+            </Grid>
+            
+            <DataGrid Grid.Row="1" ItemsSource="{Binding ChannelStocks}" AutoGenerateColumns="False" CanUserAddRows="False">
+                <DataGrid.Resources>
+                    <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}">
+                        <Setter Property="HorizontalContentAlignment" Value="Center" />
+                        <Setter Property="Background" Value="#31ccec" />
+                        <Setter Property="Foreground" Value="white" />
+                        <Setter Property="Height" Value="48" />
+                        <Setter Property="BorderBrush" Value="white"/>
+                        <Setter Property="BorderThickness" Value="0.6"/>
+                    </Style>
+                    <Style TargetType="{x:Type DataGridCell}" BasedOn="{StaticResource MaterialDesignDataGridCell}">
+                        <Setter Property="HorizontalAlignment" Value="Left" />
+                        <Setter Property="Padding" Value="13" />
+                    </Style>
+                </DataGrid.Resources>
+                <DataGrid.Columns>
+                    <DataGridTextColumn
+                            Header="库位"
+                            IsReadOnly="True"
+                            Binding="{Binding Location}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn
+                            Header="药品名称"
+                            IsReadOnly="True"
+                            Binding="{Binding DrugInfo.DrugName}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn
+                            Header="规格"
+                            IsReadOnly="True"
+                            Binding="{Binding DrugInfo.DrugSpec}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                         />
+                    <DataGridTextColumn
+                            Header="数量" 
+                            IsReadOnly="True"
+                            Binding="{Binding Quantity}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn
+                            Header="批次"
+                            IsReadOnly="True"
+                            Binding="{Binding ManuNo}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn
+                            Header="效期"
+                            IsReadOnly="True"
+                            Binding="{Binding EffDate}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn
+                            Header="添加数量"
+                            IsReadOnly="True"
+                            Binding="{Binding AddQuantity}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                </DataGrid.Columns>
+            </DataGrid>
+            <Grid Grid.Row="2">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <StackPanel Orientation="Horizontal" Grid.Column="1" HorizontalAlignment="Center">
+
+                    <Button
+                            Margin="2"
+                            Style="{StaticResource MaterialDesignRaisedAccentButton}"
+                            Visibility="{Binding Status,Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnVisible}"
+                            materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                            materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                            Content="加药"
+                            Command="{Binding OpenDrawer}">
+                    </Button>
+                    <TextBox Text="{Binding PZH, UpdateSourceTrigger=PropertyChanged}" materialDesign:HintAssist.Hint="凭证号"
+                            materialDesign:HintAssist.IsFloating="True" Width="100"
+                            Margin="2"
+                            Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CompleteBtn}"/>
+                    <Button
+                            Margin="2"
+                            Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CompleteBtn}"
+                            Style="{StaticResource MaterialDesignRaisedAccentButton}"
+                            Content="完成"
+                            Command="{Binding TakeFinish}"/>
+                    <Button
+                            Margin="2"
+                            Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CancelBtn}"
+                            Style="{StaticResource MaterialDesignRaisedButton}"
+                            Background="Orange"
+                            BorderBrush="Orange"
+                            Content="取消"
+                            Command="{Binding CancleTake}" />
+                </StackPanel>
+
+            </Grid>
+        </Grid>
+    </materialDesign:Card>
+</UserControl>
diff --git a/DM_Weight/Views/Dialog/SelfAddDialog.xaml.cs b/DM_Weight/Views/Dialog/SelfAddDialog.xaml.cs
new file mode 100644
index 0000000..2019151
--- /dev/null
+++ b/DM_Weight/Views/Dialog/SelfAddDialog.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.Dialog
+{
+    /// <summary>
+    /// SelfOperateDialog.xaml 的交互逻辑
+    /// </summary>
+    public partial class SelfAddDialog : UserControl
+    {
+        public SelfAddDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/Dialog/SelfTakeDialog.xaml b/DM_Weight/Views/Dialog/SelfTakeDialog.xaml
new file mode 100644
index 0000000..e82cff3
--- /dev/null
+++ b/DM_Weight/Views/Dialog/SelfTakeDialog.xaml
@@ -0,0 +1,143 @@
+<UserControl x:Class="DM_Weight.Views.Dialog.SelfTakeDialog"
+             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.Dialog"
+             xmlns:prism="http://prismlibrary.com/"
+             prism:ViewModelLocator.AutoWireViewModel="True"
+             xmlns:convert="clr-namespace:DM_Weight.Converter"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             MinWidth="880"
+             Width="Auto"
+             Height="Auto"
+             mc:Ignorable="d" >
+
+    <UserControl.Resources>
+        <convert:StatusConverter x:Key="StatusConverter" />
+    </UserControl.Resources>
+    <materialDesign:Card Padding="0">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid Background="#03a9f4" Grid.Row="0">
+                <TextBlock VerticalAlignment="Center" Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}" Margin="16 4 16 4" Style="{StaticResource MaterialDesignHeadline5TextBlock}" Text="{Binding Title}" />
+                <Button
+                        Style="{StaticResource MaterialDesignIconForegroundButton}"
+                        Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}"
+                        HorizontalAlignment="Right"
+                        Command="{Binding BtnCloseCommand}"
+                        IsEnabled="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CloseBtn}"
+                        ToolTip="关闭"
+                    >
+                    <materialDesign:PackIcon Kind="Close" Width="34" Height="34" />
+                </Button>
+            </Grid>
+
+            <DataGrid Grid.Row="1" ItemsSource="{Binding ChannelStocks}" AutoGenerateColumns="False" CanUserAddRows="False">
+                <DataGrid.Resources>
+                    <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}">
+                        <Setter Property="HorizontalContentAlignment" Value="Center" />
+                        <Setter Property="Background" Value="#31ccec" />
+                        <Setter Property="Foreground" Value="white" />
+                        <Setter Property="Height" Value="48" />
+                        <Setter Property="BorderBrush" Value="white"/>
+                        <Setter Property="BorderThickness" Value="0.6"/>
+                    </Style>
+                    <Style TargetType="{x:Type DataGridCell}" BasedOn="{StaticResource MaterialDesignDataGridCell}">
+                        <Setter Property="HorizontalAlignment" Value="Left" />
+                        <Setter Property="Padding" Value="13" />
+                    </Style>
+                </DataGrid.Resources>
+                <DataGrid.Columns>
+                    <DataGridTextColumn
+                            Header="库位"
+                            IsReadOnly="True"
+                            Binding="{Binding Location}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn
+                            Header="药品名称"
+                            IsReadOnly="True"
+                            Binding="{Binding DrugInfo.DrugName}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn
+                            Header="规格"
+                            IsReadOnly="True"
+                            Binding="{Binding DrugInfo.DrugSpec}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                         />
+                    <DataGridTextColumn
+                            Header="数量" 
+                            IsReadOnly="True"
+                            Binding="{Binding Quantity}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn
+                            Header="批次"
+                            IsReadOnly="True"
+                            Binding="{Binding ManuNo}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn
+                            Header="效期"
+                            IsReadOnly="True"
+                            Binding="{Binding EffDate}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                    <DataGridTextColumn
+                            Header="取出数量"
+                            IsReadOnly="True"
+                            Binding="{Binding TakeQuantity}"
+                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
+                        />
+                </DataGrid.Columns>
+            </DataGrid>
+            <Grid Grid.Row="2">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <StackPanel Orientation="Horizontal" Grid.Column="1" HorizontalAlignment="Center">
+
+                    <Button
+                            Margin="2"
+                            Style="{StaticResource MaterialDesignRaisedAccentButton}"
+                            Visibility="{Binding Status,Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnVisible}"
+                            materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                            materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                            Content="取药"
+                            Command="{Binding OpenDrawer}">
+                    </Button>
+                    <Button
+                            Margin="2"
+                            Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CompleteBtn}"
+                            Style="{StaticResource MaterialDesignRaisedAccentButton}"
+                            Content="完成"
+                            Command="{Binding TakeFinish}"/>
+                    <Button
+                            Margin="2"
+                            Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CancelBtn}"
+                            Style="{StaticResource MaterialDesignRaisedButton}"
+                            Background="Orange"
+                            BorderBrush="Orange"
+                            Content="取消"
+                            Command="{Binding CancleTake}" />
+                </StackPanel>
+
+            </Grid>
+        </Grid>
+    </materialDesign:Card>
+</UserControl>
diff --git a/DM_Weight/Views/Dialog/SelfTakeDialog.xaml.cs b/DM_Weight/Views/Dialog/SelfTakeDialog.xaml.cs
new file mode 100644
index 0000000..cd62cb1
--- /dev/null
+++ b/DM_Weight/Views/Dialog/SelfTakeDialog.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.Dialog
+{
+    /// <summary>
+    /// SelfTakeDialog.xaml 的交互逻辑
+    /// </summary>
+    public partial class SelfTakeDialog : UserControl
+    {
+        public SelfTakeDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/Dialog/ShowMessageDialog.xaml b/DM_Weight/Views/Dialog/ShowMessageDialog.xaml
new file mode 100644
index 0000000..9554faf
--- /dev/null
+++ b/DM_Weight/Views/Dialog/ShowMessageDialog.xaml
@@ -0,0 +1,23 @@
+<UserControl x:Class="DM_Weight.Views.Dialog.ShowMessageDialog"
+             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.Dialog"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto"/>
+            <RowDefinition/>
+            <RowDefinition Height="auto"/>
+        </Grid.RowDefinitions>
+        <TextBlock Padding="5" d:Text="温馨提示" FontSize="14" 
+                   Text="{Binding Title}" Style="{StaticResource MaterialDesignCaptionTextBlock}"/>
+        <TextBlock Grid.Row="1" Padding="15,0" HorizontalAlignment="Center" VerticalAlignment="Center"
+                   Text="{Binding Msg}" FontSize="18" Margin="5" FontWeight="Bold"/>
+        <StackPanel Grid.Row="2" Margin="10" HorizontalAlignment="Center" Orientation="Horizontal">
+            <Button Command="{Binding SaveCommand}" Content="确认"/>
+        </StackPanel>
+    </Grid>
+</UserControl>
diff --git a/DM_Weight/Views/Dialog/ShowMessageDialog.xaml.cs b/DM_Weight/Views/Dialog/ShowMessageDialog.xaml.cs
new file mode 100644
index 0000000..0ec43b0
--- /dev/null
+++ b/DM_Weight/Views/Dialog/ShowMessageDialog.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.Dialog
+{
+    /// <summary>
+    /// ShowMessageDialog.xaml 的交互逻辑
+    /// </summary>
+    public partial class ShowMessageDialog : UserControl
+    {
+        public ShowMessageDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/DrawerAddDrugWindow.xaml b/DM_Weight/Views/DrawerAddDrugWindow.xaml
new file mode 100644
index 0000000..d7ebeb2
--- /dev/null
+++ b/DM_Weight/Views/DrawerAddDrugWindow.xaml
@@ -0,0 +1,368 @@
+<UserControl x:Class="DM_Weight.Views.DrawerAddDrugWindow"
+             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:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+             xmlns:convert="clr-namespace:DM_Weight.Converter"
+             mc:Ignorable="d">
+
+    <UserControl.Resources>
+        <convert:QuantityCountConverter x:Key="QuantityCountConverter" />
+        <convert:DrawerSelectConverter x:Key="DrawerSelectConverter" />
+        <convert:StatusConverter x:Key="StatusConverter" />
+        <convert:InputQuantityConverter x:Key="InputQuantityConverter" />
+        <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.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition />
+        </Grid.ColumnDefinitions>
+
+        <Grid Margin="0" Grid.Column="0" Width="280" Height="570" Visibility="{Binding Is8Drawer, Converter={StaticResource BooleanToVisibilityConverter}}">
+            <Grid.Background>
+                <ImageBrush ImageSource="/Images/box.png" />
+            </Grid.Background>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="200" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Grid Grid.Row="1">
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <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>
+                <Button Grid.Row="0" Width="210" Content="1" Command="{Binding UpdateDrawerNo}" CommandParameter="1" />
+                <Button Grid.Row="1" Width="210" Content="2" Command="{Binding UpdateDrawerNo}" CommandParameter="2" />
+                <Button Grid.Row="2" Width="210" Content="3" Command="{Binding UpdateDrawerNo}" CommandParameter="3" />
+                <Button Grid.Row="3" Width="210" Content="4" Command="{Binding UpdateDrawerNo}" CommandParameter="4" />
+                <Button Grid.Row="4" Width="210" Content="5" Command="{Binding UpdateDrawerNo}" CommandParameter="5" />
+                <Button Grid.Row="5" Width="210" Content="6" Command="{Binding UpdateDrawerNo}" CommandParameter="6" />
+                <Button Grid.Row="6" Width="210" Content="7" Command="{Binding UpdateDrawerNo}" CommandParameter="7" />
+                <Button Grid.Row="7" Width="210" Content="8" Command="{Binding UpdateDrawerNo}" CommandParameter="8" />
+
+            </Grid>
+        </Grid>
+        <Grid Margin="0" Grid.Column="1" Width="300" Height="570" Visibility="{Binding Is16Drawer, Converter={StaticResource BooleanToVisibilityConverter}}">
+            <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.Background>
+                <ImageBrush ImageSource="/Images/box-16.jpg" />
+            </Grid.Background>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="200" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Grid Margin="10 0 0 0"  Visibility="{Binding Is17Drawer, Converter={StaticResource BooleanToVisibilityConverter}}" Grid.Row="0">
+                <Button  Width="110" Content="17" HorizontalAlignment="Left" Command="{Binding UpdateDrawerNo}" CommandParameter="17" />
+            </Grid>
+
+            <Grid Grid.Row="1">
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+
+                <Button Grid.Row="0" Grid.Column="0" Width="120" Content="1" Command="{Binding UpdateDrawerNo}" CommandParameter="1" />
+                <Button Grid.Row="1" Grid.Column="0" Width="120" Content="2" Command="{Binding UpdateDrawerNo}" CommandParameter="2" />
+                <Button Grid.Row="2" Grid.Column="0" Width="120" Content="3" Command="{Binding UpdateDrawerNo}" CommandParameter="3" />
+                <Button Grid.Row="3" Grid.Column="0" Width="120" Content="4" Command="{Binding UpdateDrawerNo}" CommandParameter="4" />
+                <Button Grid.Row="4" Grid.Column="0" Width="120" Content="5" Command="{Binding UpdateDrawerNo}" CommandParameter="5" />
+                <Button Grid.Row="5" Grid.Column="0" Width="120" Content="6" Command="{Binding UpdateDrawerNo}" CommandParameter="6" />
+                <Button Grid.Row="6" Grid.Column="0" Width="120" Content="7" Command="{Binding UpdateDrawerNo}" CommandParameter="7" />
+                <Button Grid.Row="7" Grid.Column="0" Width="120" Content="8" Command="{Binding UpdateDrawerNo}" CommandParameter="8" />
+
+                <Button Grid.Row="0" Grid.Column="1" Width="120" Content="9" Command="{Binding UpdateDrawerNo}" CommandParameter="9" />
+                <Button Grid.Row="1" Grid.Column="1" Width="120" Content="10" Command="{Binding UpdateDrawerNo}" CommandParameter="10" />
+                <Button Grid.Row="2" Grid.Column="1" Width="120" Content="11" Command="{Binding UpdateDrawerNo}" CommandParameter="11" />
+                <Button Grid.Row="3" Grid.Column="1" Width="120" Content="12" Command="{Binding UpdateDrawerNo}" CommandParameter="12" />
+                <Button Grid.Row="4" Grid.Column="1" Width="120" Content="13" Command="{Binding UpdateDrawerNo}" CommandParameter="13" />
+                <Button Grid.Row="5" Grid.Column="1" Width="120" Content="14" Command="{Binding UpdateDrawerNo}" CommandParameter="14" />
+                <Button Grid.Row="6" Grid.Column="1" Width="120" Content="15" Command="{Binding UpdateDrawerNo}" CommandParameter="15" />
+                <Button Grid.Row="7" Grid.Column="1" Width="120" Content="16" Command="{Binding UpdateDrawerNo}" CommandParameter="16" />
+
+            </Grid>
+        </Grid>
+        <Grid Grid.Column="2" Margin="6">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Right">
+                <Button
+                    Margin="0 0 3 0"
+                    VerticalAlignment="Center"
+                    Command="{Binding OpenDrawer}"
+                    Visibility="{Binding Status,Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnVisible}"
+                    materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                    materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    Content="加药" />
+
+                <TextBox Text="{Binding PZH, UpdateSourceTrigger=PropertyChanged}" materialDesign:HintAssist.Hint="凭证号"
+                materialDesign:HintAssist.IsFloating="True" Width="100"
+                Margin="0 0 3 0"
+                Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CompleteBtn}"
+                />
+
+                <Button
+                    Margin="0 0 3 0"
+                    VerticalAlignment="Center"
+                    Command="{Binding TakeFinish}"
+                    Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CompleteBtn}"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    Content="完成" />
+
+                <Button
+                    Margin="0 0 6 0"
+                    VerticalAlignment="Center"
+                    Command="{Binding CancleTake}"
+                    Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CancelBtn}"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    Content="取消" />
+            </StackPanel>
+            <DataGrid
+                Padding="0 6 0 0"
+                Grid.Row="1"
+                materialDesign:DataGridAssist.ColumnHeaderPadding="15"
+                ItemsSource="{Binding ChannelStocks}" SelectedItem="{Binding CStock,Mode=TwoWay}"
+                materialDesign:DataGridAssist.EnableEditBoxAssist="False"
+                materialDesign:DataGridAssist.CellPadding="13"
+                SelectionUnit="Cell"
+                CanUserAddRows="False"
+                AutoGenerateColumns="False">
+                <i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectionChangedCommand}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>
+                <DataGrid.Resources>
+                    <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}">
+                        <Setter Property="Background" Value="#31ccec" />
+                        <Setter Property="Foreground" Value="white" />
+                        <Setter Property="Height" Value="56" />
+                        <Setter Property="BorderBrush" Value="white"/>
+                        <Setter Property="BorderThickness" Value="0.6"/>
+                        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+
+                    </Style>
+                    <Style TargetType="{x:Type DataGridCell}" BasedOn="{StaticResource MaterialDesignDataGridCell}">
+                        <Style.Triggers>
+                            <Trigger Property="IsReadOnly" Value="True">
+                                <Setter Property="BorderBrush" Value="Transparent" />
+                                <Setter Property="HorizontalAlignment" Value="Center"/>
+                            </Trigger>
+                        </Style.Triggers>
+                    </Style>
+                </DataGrid.Resources>
+                <DataGrid.Columns>
+                    <DataGridTextColumn Width="80"
+                        Binding="{Binding ColNo}"
+                        Header="库位"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                    <DataGridTextColumn Width="180"
+                        Binding="{Binding DrugInfo.DrugName}"
+                        Header="药品名称"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                    <DataGridTextColumn Width="100"
+                        Binding="{Binding DrugInfo.DrugSpec}"
+                        Header="规格"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                    <DataGridTemplateColumn Width="200" IsReadOnly="True"
+                        Header="批次">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <ComboBox
+                                    Style="{StaticResource MaterialDesignDataGridComboBox}"                  
+                                    ItemsSource="{Binding DrugInfo.DrugManuNos}"
+                                    SelectedItem="{Binding drugManuNo,UpdateSourceTrigger=PropertyChanged}"
+                                    DisplayMemberPath="ManuNo" 
+                                    IsEnabled="{Binding Quantity,Converter={StaticResource QuantityCountConverter}}">
+
+
+                                </ComboBox>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
+                    <DataGridTextColumn Width="100"
+                        Binding="{Binding drugManuNo.EffDate}"
+                        Header="效期"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                    <DataGridTextColumn Width="100"
+                        Binding="{Binding Quantity}"
+                        Header="库存"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                    <DataGridTemplateColumn Width="100"
+                        Header="添加数量">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBox Style="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}" IsReadOnly="{Binding BoardType, Converter={StaticResource InputQuantityConverter}}">
+                                    <TextBox.Text>
+                                        <Binding Path="AddQuantity" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
+                                            <Binding.ValidationRules>
+                                                <ExceptionValidationRule />
+                                            </Binding.ValidationRules>
+                                        </Binding>
+                                    </TextBox.Text>
+                                </TextBox>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
+
+                </DataGrid.Columns>
+            </DataGrid>
+            <!--<ListView Padding="0 6 0 0"
+                Grid.Row="1" materialDesign:ListViewAssist.ListViewItemPadding="15"
+                ItemsSource="{Binding ChannelStocks}" SelectedItem="{Binding CStock}"
+                materialDesign:ListViewAssist.HeaderRowBackground="#31ccec">
+                <i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectionChangedCommand}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>
+                <ListView.Resources>
+                    <Style TargetType="{x:Type GridViewColumnHeader}" BasedOn="{StaticResource {x:Type GridViewColumnHeader}}">
+                        <Setter Property="Background" Value="#31ccec" />
+                        <Setter Property="Foreground" Value="white" />
+                        <Setter Property="Height" Value="56" />
+                        <Setter Property="BorderBrush" Value="white"/>
+                        <Setter Property="BorderThickness" Value="0.6"/>
+                        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                    </Style>
+                </ListView.Resources>
+                <ListView.View>
+
+                    <GridView ColumnHeaderContainerStyle="{StaticResource st}">
+                        <GridView.Columns>
+                            <GridViewColumn Width="80"
+                            Header="库位"
+                            DisplayMemberBinding="{Binding ColNo}"/>
+                            <GridViewColumn Width="200"
+                            Header="药品名称"
+                            DisplayMemberBinding="{Binding DrugInfo.DrugName}" />
+                            <GridViewColumn Width="180"
+                            Header="规格"
+                            DisplayMemberBinding="{Binding DrugInfo.DrugSpec}" />
+                            <GridViewColumn Width="200"  Header="批次">
+                                <GridViewColumn.CellTemplate>
+                                    <DataTemplate>
+                                        <ComboBox
+                                    Style="{StaticResource MaterialDesignDataGridComboBox}"                  
+                                    ItemsSource="{Binding DrugInfo.DrugManuNos}"
+                                    SelectedItem="{Binding drugManuNo,UpdateSourceTrigger=PropertyChanged}"
+                                    DisplayMemberPath="ManuNo" 
+                                    IsEnabled="{Binding Quantity,Converter={StaticResource QuantityCountConverter}}">
+
+
+                                        </ComboBox>
+                                    </DataTemplate>
+                                </GridViewColumn.CellTemplate>
+                            </GridViewColumn>
+                            <GridViewColumn Width="180"
+                            Header="效期"
+                            DisplayMemberBinding="{Binding EffDate}" />
+                            <GridViewColumn Width="80"
+                            Header="库存"
+                            DisplayMemberBinding="{Binding Quantity}" />
+                            <GridViewColumn Width="80"
+                            Header="添加数量">
+                                <GridViewColumn.CellTemplate>
+                                    <DataTemplate>
+                                        <TextBox
+                                        Width="80"
+                                        Padding="10"
+                                        Grid.Column="1"
+                                        Text="{Binding AddQuantity}"
+                                        materialDesign:HintAssist.Hint="添加数量"
+                                        Style="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"/>
+                                    </DataTemplate>
+                                </GridViewColumn.CellTemplate>
+                            </GridViewColumn>
+                        </GridView.Columns>
+                    </GridView>
+                </ListView.View>
+            </ListView>-->
+
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/DM_Weight/Views/DrawerAddDrugWindow.xaml.cs b/DM_Weight/Views/DrawerAddDrugWindow.xaml.cs
new file mode 100644
index 0000000..e6b8416
--- /dev/null
+++ b/DM_Weight/Views/DrawerAddDrugWindow.xaml.cs
@@ -0,0 +1,46 @@
+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>
+    /// DrawerAddDrugWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class DrawerAddDrugWindow : UserControl
+    {
+        public DrawerAddDrugWindow()
+        {
+            InitializeComponent();
+        }
+        //private void btnAdd_Click(object sender, RoutedEventArgs e)
+        //{
+        //    #region 在控件当前选中行下一行追加一行
+        //    int selectIndex = dg.SelectedIndex;// DataGridIndex;
+        //    if (selectIndex == 0)       // 如果没有选中行就默认添加，添加到最后一行
+        //    {
+        //        dg.Items.Add(new DataGridRow() { Item = new { Col1 = selectIndex + 1, Col2 = "2-2", Col3 = "3-3" } });
+        //    }
+        //    else                       // 有选中行，把获取过来的选中索引基础上+1 
+        //    {
+        //        dg.Items.Insert(selectIndex + 1, new DataGridRow() { Item = new { Col1 = selectIndex + 1, Col2 = "2-2", Col3 = "3-3" } });
+        //    }
+        //    //this.CurrentItem = newInstance;
+        //    //MoveScrollbarToCurrentPosition(this.CurrentItem);
+        //    //this.IsEditEnable = true;
+
+        //    #endregion
+        //}
+    }
+}
diff --git a/DM_Weight/Views/DrawerTakeDrugWindow.xaml b/DM_Weight/Views/DrawerTakeDrugWindow.xaml
new file mode 100644
index 0000000..ecfc296
--- /dev/null
+++ b/DM_Weight/Views/DrawerTakeDrugWindow.xaml
@@ -0,0 +1,267 @@
+<!--抽屉取药界面-->
+<UserControl x:Class="DM_Weight.Views.DrawerTakeDrugWindow"
+             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:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+             xmlns:convert="clr-namespace:DM_Weight.Converter"
+             mc:Ignorable="d">
+
+    <UserControl.Resources>
+        <convert:DrawerSelectConverter x:Key="DrawerSelectConverter" />
+        <convert:StatusConverter x:Key="StatusConverter" />
+        <convert:InputQuantityConverter x:Key="InputQuantityConverter" />
+    </UserControl.Resources>
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition />
+        </Grid.ColumnDefinitions>
+        <Grid Margin="0" Grid.Column="0" Width="280" Height="570"  Visibility="{Binding Is8Drawer, Converter={StaticResource BooleanToVisibilityConverter}}">
+            <Grid.Background>
+                <ImageBrush ImageSource="/Images/box.png" />
+            </Grid.Background>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="200" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Grid Grid.Row="1">
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <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>
+                <Button Grid.Row="0" Width="210" Content="1" Command="{Binding UpdateDrawerNo}" CommandParameter="1" />
+                <Button Grid.Row="1" Width="210" Content="2" Command="{Binding UpdateDrawerNo}" CommandParameter="2" />
+                <Button Grid.Row="2" Width="210" Content="3" Command="{Binding UpdateDrawerNo}" CommandParameter="3" />
+                <Button Grid.Row="3" Width="210" Content="4" Command="{Binding UpdateDrawerNo}" CommandParameter="4" />
+                <Button Grid.Row="4" Width="210" Content="5" Command="{Binding UpdateDrawerNo}" CommandParameter="5" />
+                <Button Grid.Row="5" Width="210" Content="6" Command="{Binding UpdateDrawerNo}" CommandParameter="6" />
+                <Button Grid.Row="6" Width="210" Content="7" Command="{Binding UpdateDrawerNo}" CommandParameter="7" />
+                <Button Grid.Row="7" Width="210" Content="8" Command="{Binding UpdateDrawerNo}" CommandParameter="8" />
+                
+            </Grid>
+        </Grid>
+        <Grid Margin="0" Grid.Column="0" Width="300" Height="570" Visibility="{Binding Is16Drawer, Converter={StaticResource BooleanToVisibilityConverter}}">
+            <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.Background>
+                <ImageBrush ImageSource="/Images/box-16.jpg" />
+            </Grid.Background>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="200" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Grid Margin="10 0 0 0"  Visibility="{Binding Is17Drawer, Converter={StaticResource BooleanToVisibilityConverter}}" Grid.Row="0">
+                <Button  Width="110" Content="17" HorizontalAlignment="Left" Command="{Binding UpdateDrawerNo}" CommandParameter="17" />
+            </Grid>
+
+            <Grid Grid.Row="1">
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+
+                <Button Grid.Row="0" Grid.Column="0" Width="120" Content="1" Command="{Binding UpdateDrawerNo}" CommandParameter="1" />
+                <Button Grid.Row="1" Grid.Column="0" Width="120" Content="2" Command="{Binding UpdateDrawerNo}" CommandParameter="2" />
+                <Button Grid.Row="2" Grid.Column="0" Width="120" Content="3" Command="{Binding UpdateDrawerNo}" CommandParameter="3" />
+                <Button Grid.Row="3" Grid.Column="0" Width="120" Content="4" Command="{Binding UpdateDrawerNo}" CommandParameter="4" />
+                <Button Grid.Row="4" Grid.Column="0" Width="120" Content="5" Command="{Binding UpdateDrawerNo}" CommandParameter="5" />
+                <Button Grid.Row="5" Grid.Column="0" Width="120" Content="6" Command="{Binding UpdateDrawerNo}" CommandParameter="6" />
+                <Button Grid.Row="6" Grid.Column="0" Width="120" Content="7" Command="{Binding UpdateDrawerNo}" CommandParameter="7" />
+                <Button Grid.Row="7" Grid.Column="0" Width="120" Content="8" Command="{Binding UpdateDrawerNo}" CommandParameter="8" />
+
+                <Button Grid.Row="0" Grid.Column="1" Width="120" Content="9" Command="{Binding UpdateDrawerNo}" CommandParameter="9" />
+                <Button Grid.Row="1" Grid.Column="1" Width="120" Content="10" Command="{Binding UpdateDrawerNo}" CommandParameter="10" />
+                <Button Grid.Row="2" Grid.Column="1" Width="120" Content="11" Command="{Binding UpdateDrawerNo}" CommandParameter="11" />
+                <Button Grid.Row="3" Grid.Column="1" Width="120" Content="12" Command="{Binding UpdateDrawerNo}" CommandParameter="12" />
+                <Button Grid.Row="4" Grid.Column="1" Width="120" Content="13" Command="{Binding UpdateDrawerNo}" CommandParameter="13" />
+                <Button Grid.Row="5" Grid.Column="1" Width="120" Content="14" Command="{Binding UpdateDrawerNo}" CommandParameter="14" />
+                <Button Grid.Row="6" Grid.Column="1" Width="120" Content="15" Command="{Binding UpdateDrawerNo}" CommandParameter="15" />
+                <Button Grid.Row="7" Grid.Column="1" Width="120" Content="16" Command="{Binding UpdateDrawerNo}" CommandParameter="16" />
+
+            </Grid>
+        </Grid>
+        <Grid Grid.Column="1" Margin="6">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Right">
+                <Button
+                    Margin="0 0 3 0"
+                    VerticalAlignment="Center"
+                    Command="{Binding OpenDrawer}"
+                    Visibility="{Binding Status,Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnVisible}"
+                    materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                    materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    Content="取药" />
+                <Button
+                    Margin="0 0 3 0"
+                    VerticalAlignment="Center"
+                    Command="{Binding TakeFinish}"
+                    Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CompleteBtn}"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    Content="完成" />
+
+                <Button
+                    Margin="0 0 6 0"
+                    VerticalAlignment="Center"
+                    Command="{Binding CancleTake}"
+                    Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CancelBtn}"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    Content="取消" />
+            </StackPanel>
+            <DataGrid
+                Padding="0 6 0 0"
+                Grid.Row="1"
+                materialDesign:DataGridAssist.ColumnHeaderPadding="15"
+                ItemsSource="{Binding ChannelStocks}"
+                materialDesign:DataGridAssist.EnableEditBoxAssist="False"
+                materialDesign:DataGridAssist.CellPadding="13"
+                SelectionUnit="Cell"
+                CanUserAddRows="False"
+                AutoGenerateColumns="False">
+                <DataGrid.Resources>
+                    <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}">
+                        <Setter Property="HorizontalContentAlignment" Value="Center" />
+                        <Setter Property="Background" Value="#31ccec" />
+                        <Setter Property="Foreground" Value="white" />
+                        <Setter Property="Height" Value="56" />
+                        <Setter Property="BorderBrush" Value="white"/>
+                        <Setter Property="BorderThickness" Value="0.6"/>
+                    </Style>
+                    <Style TargetType="{x:Type DataGridCell}" BasedOn="{StaticResource MaterialDesignDataGridCell}">
+                        <Style.Triggers>
+                            <Trigger Property="IsReadOnly" Value="True">
+                                <Setter Property="BorderBrush" Value="Transparent" />
+                                <Setter Property="HorizontalAlignment" Value="Left" />
+                            </Trigger>
+                        </Style.Triggers>
+                    </Style>                    
+                </DataGrid.Resources>
+                <DataGrid.Columns>
+                    <DataGridTextColumn  Width="100"
+                        Binding="{Binding ColNo}"
+                        Header="库位"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                    <DataGridTextColumn  Width="116"
+                        Binding="{Binding DrugInfo.DrugName}"
+                        Header="药品名称"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                    <DataGridTextColumn  Width="100"
+                        Binding="{Binding DrugInfo.DrugSpec}"
+                        Header="规格"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                    <DataGridTextColumn  Width="100"
+                        Binding="{Binding ManuNo}"
+                        Header="批次"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                    <DataGridTextColumn  Width="100"
+                        Binding="{Binding EffDate}"
+                        Header="效期"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                    <DataGridTextColumn  Width="100"
+                        Binding="{Binding Quantity}"
+                        Header="库存"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                    <!--<DataGridTextColumn
+                        Header="取出数量"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}">
+                        <DataGridTextColumn.Binding>
+                            <Binding Path="TakeQuantity" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
+                                <Binding.ValidationRules>
+                                    <ExceptionValidationRule />
+                                </Binding.ValidationRules>
+                            </Binding>
+                        </DataGridTextColumn.Binding>
+                    </DataGridTextColumn>-->
+                    <DataGridTemplateColumn  Width="100"
+                        Header="取出数量">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBox  Style="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}" IsReadOnly="{Binding BoardType, Converter={StaticResource InputQuantityConverter}}">
+                                    <TextBox.Text>
+                                        <Binding Path="TakeQuantity" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
+                                            <Binding.ValidationRules>
+                                                <ExceptionValidationRule />
+                                            </Binding.ValidationRules>
+                                        </Binding>
+                                    </TextBox.Text>
+                                </TextBox>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
+
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/DM_Weight/Views/DrawerTakeDrugWindow.xaml.cs b/DM_Weight/Views/DrawerTakeDrugWindow.xaml.cs
new file mode 100644
index 0000000..192a032
--- /dev/null
+++ b/DM_Weight/Views/DrawerTakeDrugWindow.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>
+    /// DrawerTakeDrugWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class DrawerTakeDrugWindow : UserControl
+    {
+        public DrawerTakeDrugWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/DrugListWindow.xaml b/DM_Weight/Views/DrugListWindow.xaml
new file mode 100644
index 0000000..4d01abb
--- /dev/null
+++ b/DM_Weight/Views/DrugListWindow.xaml
@@ -0,0 +1,219 @@
+<UserControl x:Class="DM_Weight.Views.DrugListWindow"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" 
+             xmlns:pagination="clr-namespace:DM_Weight.Components.pagination"
+             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:i="http://schemas.microsoft.com/xaml/behaviors"
+             xmlns:prism="http://prismlibrary.com/"
+             mc:Ignorable="d">
+
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="3*" />
+            <ColumnDefinition Width="2*" />
+        </Grid.ColumnDefinitions>
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+
+            <Grid Margin="0 6 0 6" Grid.Row="0">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="110" />
+                    <ColumnDefinition Width="180" />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <ComboBox
+                Grid.Column="0"
+                Margin="6 0 0 0"
+                Style="{StaticResource MaterialDesignOutlinedComboBox}"
+                SelectedItem="{Binding SelectedItem}"
+                DisplayMemberPath="Name"
+                ItemsSource="{Binding Selects}"
+                />
+                <TextBox
+                Grid.Column="1"
+                Text="{Binding SearchValue}"
+                materialDesign:HintAssist.Hint="{Binding SelectedItem.Name}"
+                Margin="6 0 0 0"
+                Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
+
+                <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right">
+
+                    <Button
+                Margin="0 0 6 0"
+                VerticalAlignment="Center"
+                Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                ToolTip="刷新" Command="{Binding Query}">
+                        <materialDesign:PackIcon
+                    Kind="Refresh" />
+                    </Button>
+                </StackPanel>
+
+
+            </Grid>
+            <ListView
+                    Grid.Row="1"
+                    ItemsSource="{Binding DrugInfos}"
+                    SelectedItem="{Binding SelectedDrug}"
+                    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>
+                        <!--<GridViewColumn
+                                Header="药品编码"
+                                DisplayMemberBinding="{Binding DrugId}"/>-->
+                        <GridViewColumn
+                                Header="药品名称"
+                                DisplayMemberBinding="{Binding DrugName}"/>
+                        <GridViewColumn
+                                Header="规格"
+                                DisplayMemberBinding="{Binding DrugSpec}"
+                            />
+                        <GridViewColumn
+                                Header="厂家"
+                                DisplayMemberBinding="{Binding Manufactory}"
+                             />
+                        <GridViewColumn
+                                Header="拼音码" 
+                                DisplayMemberBinding="{Binding PyCode}"
+                            />
+                        <GridViewColumn
+                                Header="单位"
+                                DisplayMemberBinding="{Binding PackUnit}"
+                            />
+                        <GridViewColumn
+                                Header="基数"
+                                DisplayMemberBinding="{Binding MaxStock}"
+                            />
+                    </GridView>
+                </ListView.View>
+            </ListView>
+            <pagination:Pagination Grid.Row="2"
+                                   CurrentPage="{Binding PageNum}"
+                                   PageSize="{Binding PageSize}"
+                                   TotalPages="{Binding TotalCount}"
+                                   InfoTextIsEnabel="True"
+                                />
+        </Grid>
+        <materialDesign:Card Grid.Column="1" Margin="6">
+            <TabControl HorizontalContentAlignment="Left" Style="{StaticResource MaterialDesignFilledTabControl}">
+                <TabItem Header="新增/编辑">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="Auto"/>
+                        </Grid.RowDefinitions>
+                        <TextBox
+                            Grid.Row="0"
+                            Text="{Binding SelectedDrug.DrugName, UpdateSourceTrigger=PropertyChanged}"
+                            materialDesign:HintAssist.Hint="药品名称"
+                            Margin="12 12 12 6"
+                            Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
+                        <TextBox
+                            Grid.Row="1"
+                            Text="{Binding SelectedDrug.Manufactory, UpdateSourceTrigger=PropertyChanged}"
+                            materialDesign:HintAssist.Hint="厂家"
+                            Margin="12 6"
+                            Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
+                        <TextBox
+                            Grid.Row="2"
+                            Text="{Binding SelectedDrug.PackUnit, UpdateSourceTrigger=PropertyChanged}"
+                            materialDesign:HintAssist.Hint="单位"
+                            Margin="12 6"
+                            Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
+                        <TextBox
+                            Grid.Row="3"
+                            Text="{Binding SelectedDrug.DrugSpec, UpdateSourceTrigger=PropertyChanged}"
+                            materialDesign:HintAssist.Hint="规格"
+                            Margin="12 6"
+                            Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
+                        <TextBox
+                            Grid.Row="4"
+                            Text="{Binding SelectedDrug.PyCode, UpdateSourceTrigger=PropertyChanged}"
+                            materialDesign:HintAssist.Hint="拼音码"
+                            Margin="12 6"
+                            Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
+                        <TextBox
+                            Grid.Row="5"
+                            Text="{Binding SelectedDrug.MaxStock, UpdateSourceTrigger=PropertyChanged}"
+                            materialDesign:HintAssist.Hint="基数"
+                            Margin="12 6"
+                            Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
+                        <StackPanel Grid.Row="6" Orientation="Horizontal" HorizontalAlignment="Center" Margin="12">
+                            <Button Margin="6" Content="新增" Command="{Binding AddDrugCommand}" />
+                            <Button Margin="6" Content="修改" Command="{Binding EditDrugCommand}"/>
+                        </StackPanel>
+                    </Grid>
+                </TabItem>
+                <TabItem Header="批次信息">
+                    <Grid Grid.Column="0">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <ListBox Grid.Row="1" ItemsSource="{Binding Manunos}" SelectedItem="{Binding SelectedManuno}" Grid.IsSharedSizeScope="True">
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate>
+                                    <StackPanel Margin="8 0 0 0">
+                                        <TextBlock Text="{Binding ManuNo}" FontWeight="Bold" />
+                                        <TextBlock Text="{Binding EffDate, StringFormat=yyyy-MM-dd}" />
+                                    </StackPanel>
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                        </ListBox>
+                        <Border Padding="8" BorderThickness="0 0 0 1" BorderBrush="{DynamicResource MaterialDesignDivider}">
+                            <Grid Grid.Row="0">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="Auto"/>
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+                                <TextBox
+                                    Grid.Row="0"
+                                    Grid.Column="0"
+                                    Text="{Binding SelectedManuno.ManuNo, UpdateSourceTrigger=PropertyChanged}"
+                                    materialDesign:HintAssist.Hint="批号"
+                                    Margin="12 6"
+                                    Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
+                                
+                                <DatePicker
+                                    Grid.Row="0"
+                                    Grid.Column="1"
+                                    SelectedDate="{Binding SelectedManuno.EffDate,UpdateSourceTrigger=PropertyChanged}"
+                                    SelectedDateFormat="Short"
+                                    Margin="6 0 0 0"
+                                    materialDesign:HintAssist.Hint="效期"
+                                    Style="{StaticResource MaterialDesignOutlinedDatePicker}" />
+
+                                <StackPanel Grid.Row="1" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Center" Margin="12">
+                                    <Button Margin="6" Content="新增" Command="{Binding AddManuCommand}" />
+                                    <Button Margin="6" Content="修改" Command="{Binding EditManuCommand}"/>
+                                </StackPanel>
+                            </Grid>
+                        </Border>
+                    </Grid>
+                </TabItem>
+            </TabControl>
+        </materialDesign:Card>
+    </Grid>
+</UserControl>
diff --git a/DM_Weight/Views/DrugListWindow.xaml.cs b/DM_Weight/Views/DrugListWindow.xaml.cs
new file mode 100644
index 0000000..1b81eb1
--- /dev/null
+++ b/DM_Weight/Views/DrugListWindow.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>
+    /// DrugListWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class DrugListWindow : UserControl
+    {
+        public DrugListWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/HomeWindow.xaml b/DM_Weight/Views/HomeWindow.xaml
new file mode 100644
index 0000000..82e894d
--- /dev/null
+++ b/DM_Weight/Views/HomeWindow.xaml
@@ -0,0 +1,142 @@
+<!--布局界面-->
+<UserControl x:Class="DM_Weight.Views.HomeWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+        TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+        TextElement.FontWeight="Regular"
+        TextElement.FontSize="13"
+        TextOptions.TextFormattingMode="Ideal" 
+        TextOptions.TextRenderingMode="Auto"
+        xmlns:prism="http://prismlibrary.com/"
+        FontFamily="{DynamicResource MaterialDesignFont}"
+        xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+        mc:Ignorable="d" Cursor="Hand">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"></RowDefinition>
+            <RowDefinition></RowDefinition>
+            <RowDefinition Height="Auto"></RowDefinition>
+        </Grid.RowDefinitions>
+        <Grid Background="#00bcd4">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <Image Grid.Column="0" Margin="30 0 30 0" HorizontalAlignment="Left" Width="Auto" Height="26"  Source="/Images/logo.png" />
+            <ListBox Name="ListBoxName" Grid.Column="1" ItemsSource="{Binding PremissionDmList}"  HorizontalAlignment="Right" Cursor="Hand">
+                <i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectionCommon}" CommandParameter="{Binding ElementName=ListBoxName}"/>
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>
+                <ListBox.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <WrapPanel Orientation="Horizontal" IsItemsHost="True"/>
+                    </ItemsPanelTemplate>
+                </ListBox.ItemsPanel>
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <StackPanel Width="64" Height="64" >
+                            <Image Width="48" Height="48" Source="{ Binding PremissionImage }" />
+                            <TextBlock Foreground="{DynamicResource MaterialDesignPaper}" HorizontalAlignment="Center" FontSize="15" Text="{Binding PremissionName}" />
+                        </StackPanel>
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
+        </Grid>
+        <Grid Grid.Row="1" Margin="8,6,8,6">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+            <materialDesign:Card Grid.Row="0" Grid.ColumnSpan="2">
+
+                <ListBox ItemsSource="{Binding SelectedMenu.Children}" SelectedItem="{ Binding SelectedChildMenu }" HorizontalAlignment="left" Cursor="Hand">
+
+                    <ListBox.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <WrapPanel Orientation="Horizontal" IsItemsHost="True"/>
+                        </ItemsPanelTemplate>
+                    </ListBox.ItemsPanel>
+                    <ListBox.ItemTemplate>
+                        <DataTemplate>
+                            <Border Padding="0,0,5,0"  BorderThickness="0 0 1 0" BorderBrush="#31ccec">
+                                <TextBlock FontWeight="Black" FontSize="14" FontFamily="楷书" Padding="4" Text="{Binding PremissionName}" />
+                            </Border>
+                        </DataTemplate>
+                    </ListBox.ItemTemplate>
+                </ListBox>
+            </materialDesign:Card>
+
+            <!--<materialDesign:Card Grid.Row="0" Grid.Column="1">-->
+                <!--<Button HorizontalAlignment="Right"
+                                    Grid.Column="1"
+                                    Style="{StaticResource MaterialDesignRaisedButton}"
+                                    materialDesign:ButtonAssist.CornerRadius="5"
+                                    Command="{ Binding ShiftsCommand }"
+                                    Background="#42a5f5"
+                                    BorderBrush="#42a5f5" Cursor="Hand"  IsDefault="True"  Content="交接班"/>-->
+            <!--</materialDesign:Card>-->
+            <materialDesign:Card Grid.Row="1" Margin="0 8 0 8" Grid.ColumnSpan="2">
+                <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Disabled" Focusable="True">
+
+                    <ContentControl prism:RegionManager.RegionName="ContentRegion" />
+                </ScrollViewer>
+            </materialDesign:Card>
+        </Grid>
+        <Grid  Background="#2196f3"  Grid.Row="2">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="70*"/>
+                <ColumnDefinition Width="70*"/>
+                <ColumnDefinition Width="270*"/>
+            </Grid.ColumnDefinitions>
+            <Menu Grid.Column="0">
+                <MenuItem
+                    Foreground="White"
+                    Header="{Binding UserList.Nickname}">
+                    <MenuItem
+                        Command="{Binding OpenFingerDialog}"
+                        CommandParameter="Operator"
+                        Foreground="{DynamicResource MaterialDesignLightForeground}"
+                        Header="录制指纹" />
+                    <MenuItem
+                        Command="{Binding OpenEditPasswordDialog}"
+                        CommandParameter="Operator"
+                        Foreground="{DynamicResource MaterialDesignLightForeground}"
+                        Header="修改密码" />
+                </MenuItem>
+            </Menu>
+            <Menu Grid.Column="1" Visibility="{Binding MultiLogin, Converter={StaticResource BooleanToVisibilityConverter}}">
+                <MenuItem
+                    Foreground="White"
+                    Header="{Binding UserList2.Nickname}">
+                    <MenuItem
+                        Command="{Binding OpenFingerDialog}"
+                        CommandParameter="Reviewer"
+                        Foreground="{DynamicResource MaterialDesignLightForeground}"
+                        Header="录制指纹" />
+                    <MenuItem
+                        Command="{Binding OpenEditPasswordDialog}"
+                        CommandParameter="Reviewer"
+                        Foreground="{DynamicResource MaterialDesignLightForeground}"
+                        Header="修改密码" />
+                </MenuItem>
+            </Menu>
+            <Grid Grid.Column="2">
+                <StackPanel Margin="6" Orientation="Horizontal" HorizontalAlignment="Right">
+                    <Button Content="储物箱" Command="{Binding OpenRecoverCommand}" Visibility="{Binding Is16Drawer, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{StaticResource MaterialDesignFlatSecondaryLightButton}" />
+                </StackPanel>
+            </Grid>
+
+        </Grid>
+
+
+    </Grid>
+</UserControl>
diff --git a/DM_Weight/Views/HomeWindow.xaml.cs b/DM_Weight/Views/HomeWindow.xaml.cs
new file mode 100644
index 0000000..fe2e7d1
--- /dev/null
+++ b/DM_Weight/Views/HomeWindow.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>
+    /// Interaction logic for MainWindow.xaml
+    /// </summary>
+    public partial class HomeWindow : UserControl
+    {
+        public HomeWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/InvoiceInWindow.xaml b/DM_Weight/Views/InvoiceInWindow.xaml
new file mode 100644
index 0000000..53e103d
--- /dev/null
+++ b/DM_Weight/Views/InvoiceInWindow.xaml
@@ -0,0 +1,243 @@
+<UserControl x:Class="DM_Weight.Views.InvoiceInWindow"
+             xmlns:pagination="clr-namespace:DM_Weight.Components.pagination"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" 
+             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:i="http://schemas.microsoft.com/xaml/behaviors"
+             xmlns:prism="http://prismlibrary.com/"
+             xmlns:convert="clr-namespace:DM_Weight.Converter"
+             mc:Ignorable="d">
+    <UserControl.Resources>
+        <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.Resources>
+            <convert:GroupSumConverter x:Key="GroupSumConverter" />
+        </Grid.Resources>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="4*" />
+            <ColumnDefinition Width="6*"/>
+        </Grid.ColumnDefinitions>
+        <Grid Grid.Column="0" >
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid Margin="0 6 0 6" Grid.Row="0">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="3*" />
+                    <ColumnDefinition Width="3*" />
+                    <ColumnDefinition Width="4*" />
+                </Grid.ColumnDefinitions>
+                <ComboBox
+                Grid.Column="0"
+                Margin="6 0 0 0"
+                Style="{StaticResource MaterialDesignOutlinedComboBox}"
+                SelectedItem="{Binding SelectedItem}"
+                DisplayMemberPath="Name"
+                ItemsSource="{Binding OrderTakeSelects}"
+                />
+                <TextBox
+                Grid.Column="1"
+                Text="{Binding SearchValue, UpdateSourceTrigger=PropertyChanged}"
+                materialDesign:HintAssist.Hint="{Binding SelectedItem.Name}"
+                materialDesign:HintAssist.IsFloating="True"
+                Margin="6 0 0 0"
+                Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
+                <DatePicker
+                Grid.Column="2"
+                SelectedDate="{Binding OrderDate, StringFormat=yyyy-MM-dd, TargetNullValue='',UpdateSourceTrigger=PropertyChanged}"
+                SelectedDateFormat="Short"
+                Margin="6 0 0 0"
+                materialDesign:HintAssist.Hint="日期"
+                Style="{StaticResource MaterialDesignOutlinedDatePicker}" />
+                
+            </Grid>
+            <ListView Grid.Row="1"
+                    ItemsSource="{Binding Invoices}"
+                    SelectedItem="{Binding SelectedInvoice}"
+                    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>
+                <i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding RowSelected}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>
+                <ListView.View>
+                    <GridView ColumnHeaderContainerStyle="{StaticResource st}">
+                        <GridViewColumn Width="110"
+                        Header="凭证单号"
+                        DisplayMemberBinding="{Binding InvoiceNo}"/>
+                        <GridViewColumn Width="100"
+                        Header="时间"
+                        DisplayMemberBinding="{Binding InvoiceDate, StringFormat=yyyy-MM-dd}" />
+                        <GridViewColumn Width="100"
+                        DisplayMemberBinding="{Binding Count}"
+                        Header="药品种类"/>
+                        <GridViewColumn Width="100"
+                        DisplayMemberBinding="{Binding Quantity}"
+                        Header="药品总数"/>
+                        <!--<GridViewColumn
+                        DisplayMemberBinding="{Binding Status}"
+                        Header="状态"/>-->
+                    </GridView>
+                </ListView.View>
+            </ListView>
+
+            <pagination:Pagination Grid.Row="2"
+                                   CurrentPage="{Binding PageNum}"
+                                   PageSize="{Binding PageSize}"
+                                   TotalPages="{Binding TotalCount}"
+                                   InfoTextIsEnabel="True"
+                                />
+        </Grid>
+        <Grid Grid.Column="1" Margin="10 0 0 0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="61" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                <Button
+                    Margin="0 0 6 0"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    Command="{Binding OpenInvoiceAdd}"
+                    Content="入库"
+                    />
+                <Button
+                    Margin="0 0 6 0"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    Command="{Binding QueryCommand}"
+                    ToolTip="刷新">
+                    <materialDesign:PackIcon
+                    Kind="Refresh" />
+                </Button>
+            </StackPanel>
+            <DataGrid
+                Grid.Row="1"
+                materialDesign:DataGridAssist.ColumnHeaderPadding="15"
+                ItemsSource="{Binding ChannelStocks}"
+                materialDesign:DataGridAssist.EnableEditBoxAssist="False"
+                IsSynchronizedWithCurrentItem="True"
+                materialDesign:DataGridAssist.CellPadding="13"
+                CanUserAddRows="False"
+                AutoGenerateColumns="False">
+                <DataGrid.Resources>
+                    <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}">
+                        <Setter Property="Background" Value="#31ccec" />
+                        <Setter Property="Foreground" Value="white" />
+                        <Setter Property="Height" Value="56" />
+                        <Setter Property="BorderBrush" Value="white"/>
+                        <Setter Property="BorderThickness" Value="0.6"/>
+                        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                    </Style>
+                    <Style TargetType="{x:Type DataGridCell}" BasedOn="{StaticResource MaterialDesignDataGridCell}">
+                        <Style.Triggers>
+                            <Trigger Property="IsReadOnly" Value="True">
+                                <Setter Property="BorderBrush" Value="Transparent" />
+                                <Setter Property="HorizontalAlignment" Value="Left"/>
+                            </Trigger>
+                        </Style.Triggers>
+                    </Style>
+                </DataGrid.Resources>
+                <!--GroupStyle to group data-->
+                <DataGrid.GroupStyle>
+                    <GroupStyle>
+                        <!--Group DataItems into DataGroup-->
+                        <GroupStyle.ContainerStyle>
+                            <Style TargetType="{x:Type GroupItem}">
+                                <Setter Property="Template">
+                                    <Setter.Value>
+                                        <ControlTemplate TargetType="{x:Type GroupItem}">
+                                            <Expander IsExpanded="True"
+                                                  materialDesign:ExpanderAssist.HeaderBackground="PaleTurquoise">
+                                                <Expander.Header >
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <TextBlock Text="{Binding Path=Name.DrugInfo.DrugName,StringFormat=药品：{0}，}" FontWeight="Bold" />
+                                                        <TextBlock FontWeight="Bold" Text="{Binding Path=Name.DrugInfo.DrugSpec,StringFormat=规格：{0}，}" />
+                                                        <TextBlock FontWeight="Bold" Text="{Binding Path=Name.DrugInfo.Manufactory,StringFormat=厂家：{0}，}" />
+                                                        <TextBlock FontWeight="Bold" Text="{Binding Path=Name.quantity,StringFormat=入库量：{0}，}" />
+                                                        <TextBlock FontWeight="Bold" Text="{Binding Path=Items,Converter={StaticResource GroupSumConverter}}" />
+
+                                                    </StackPanel>
+                                                </Expander.Header>
+                                                <ItemsPresenter/>
+                                            </Expander>
+                                        </ControlTemplate>
+                                    </Setter.Value>
+                                </Setter>
+                            </Style>
+                        </GroupStyle.ContainerStyle>
+
+                    </GroupStyle>
+                </DataGrid.GroupStyle>
+                <DataGrid.Columns>
+                    <DataGridTextColumn Width="100"
+                        Binding="{Binding Location}"
+                        Header="库位"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                    <DataGridTextColumn  Width="147"
+                        Binding="{Binding ManuNo}"
+                        Header="批次"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                    <DataGridTextColumn  Width="147"
+                        Binding="{Binding EffDate}"
+                        Header="效期"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                    <DataGridTextColumn  Width="100"
+                        Binding="{Binding Quantity}"
+                        Header="库存"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                    <!--<DataGridTextColumn
+                        Binding="{Binding AddQuantity, ValidatesOnExceptions=True}"
+                        Header="添加数量"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>-->
+                    <DataGridTemplateColumn Width="100"
+                        Header="添加数量"> 
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBox Style="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}">
+                                    <TextBox.Text>
+                                        <Binding Path="AddQuantity" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
+                                            <Binding.ValidationRules>
+                                                <ExceptionValidationRule />
+                                            </Binding.ValidationRules>
+                                        </Binding>
+                                    </TextBox.Text>
+                                </TextBox>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+        
+    </Grid>
+    
+</UserControl>
diff --git a/DM_Weight/Views/InvoiceInWindow.xaml.cs b/DM_Weight/Views/InvoiceInWindow.xaml.cs
new file mode 100644
index 0000000..c0c3497
--- /dev/null
+++ b/DM_Weight/Views/InvoiceInWindow.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>
+    /// InvoiceInWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class InvoiceInWindow : UserControl
+    {
+        public InvoiceInWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/InvoiceOutWindow.xaml b/DM_Weight/Views/InvoiceOutWindow.xaml
new file mode 100644
index 0000000..18fa7c8
--- /dev/null
+++ b/DM_Weight/Views/InvoiceOutWindow.xaml
@@ -0,0 +1,121 @@
+<UserControl x:Class="DM_Weight.Views.InvoiceOutWindow"
+             xmlns:pagination="clr-namespace:DM_Weight.Components.pagination"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" 
+             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:i="http://schemas.microsoft.com/xaml/behaviors"
+             xmlns:prism="http://prismlibrary.com/"
+             mc:Ignorable="d">
+    <UserControl.Resources>
+        <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 Height="Auto" />
+            <RowDefinition />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Grid Margin="0 6 0 6" Grid.Row="0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="110" />
+                <ColumnDefinition Width="180" />
+                <ColumnDefinition Width="140" />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <ComboBox
+                Grid.Column="0"
+                Margin="6 0 0 0"
+                Style="{StaticResource MaterialDesignOutlinedComboBox}"
+                SelectedItem="{Binding SelectedItem}"
+                DisplayMemberPath="Name"
+                ItemsSource="{Binding OrderTakeSelects}"
+                />
+            <TextBox
+                Grid.Column="1"
+                Text="{Binding SearchValue, UpdateSourceTrigger=PropertyChanged}"
+                materialDesign:HintAssist.Hint="{Binding SelectedItem.Name}"
+                materialDesign:HintAssist.IsFloating="True"
+                Margin="6 0 0 0"
+                Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
+            <DatePicker
+                Grid.Column="2"
+                SelectedDate="{Binding OrderDate, StringFormat=yyyy-MM-dd, TargetNullValue='',UpdateSourceTrigger=PropertyChanged}"
+                SelectedDateFormat="Short"
+                Margin="6 0 0 0"
+                materialDesign:HintAssist.Hint="日期"
+                Style="{StaticResource MaterialDesignOutlinedDatePicker}" />
+            <Grid
+                Grid.Column="3">
+                <Button
+                    HorizontalAlignment="Right"
+                    Margin="0 0 6 0"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    Command="{Binding QueryCommand}"
+                    ToolTip="刷新">
+                    <materialDesign:PackIcon
+                    Kind="Refresh" />
+                </Button>
+            </Grid>
+        </Grid>
+        <ListView
+            Grid.Row="1"
+            ItemsSource="{Binding Invoices}"
+            SelectedItem="{Binding SelectedInvoice}"
+            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>
+            <i:Interaction.Triggers>
+                <i:EventTrigger EventName="SelectionChanged">
+                    <i:InvokeCommandAction Command="{Binding RowSelected}" />
+                </i:EventTrigger>
+            </i:Interaction.Triggers>
+            <ListView.View>
+                <GridView ColumnHeaderContainerStyle="{StaticResource st}">
+                    <GridViewColumn  Width="200"
+                        Header="凭证单号"
+                        DisplayMemberBinding="{Binding InvoiceNo}"/>
+                    <GridViewColumn  Width="200"
+                        Header="时间"
+                        DisplayMemberBinding="{Binding InvoiceDate, StringFormat=yyyy-MM-dd}" />
+                    <GridViewColumn  Width="200"
+                        DisplayMemberBinding="{Binding Count}"
+                        Header="药品种类"/>
+                    <GridViewColumn  Width="200"
+                        DisplayMemberBinding="{Binding Quantity}"
+                        Header="药品总数"/>
+                    <GridViewColumn  Width="200"
+                        DisplayMemberBinding="{Binding Status}"
+                        Header="状态"/>
+                </GridView>
+            </ListView.View>
+        </ListView>
+
+        <pagination:Pagination Grid.Row="2"
+                                   CurrentPage="{Binding PageNum}"
+                                   PageSize="{Binding PageSize}"
+                                   TotalPages="{Binding TotalCount}"
+                                   InfoTextIsEnabel="True"
+                                />
+    </Grid>
+</UserControl>
+
diff --git a/DM_Weight/Views/InvoiceOutWindow.xaml.cs b/DM_Weight/Views/InvoiceOutWindow.xaml.cs
new file mode 100644
index 0000000..69eb742
--- /dev/null
+++ b/DM_Weight/Views/InvoiceOutWindow.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>
+    /// InvoiceOutWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class InvoiceOutWindow : UserControl
+    {
+        public InvoiceOutWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/LoginWindow.xaml b/DM_Weight/Views/LoginWindow.xaml
new file mode 100644
index 0000000..073e261
--- /dev/null
+++ b/DM_Weight/Views/LoginWindow.xaml
@@ -0,0 +1,203 @@
+<!--登录界面-->
+<UserControl x:Class="DM_Weight.Views.LoginWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"     
+        TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+        TextElement.FontWeight="Regular"
+        TextElement.FontSize="13"
+        TextOptions.TextFormattingMode="Ideal"
+        TextOptions.TextRenderingMode="Auto"
+        FontFamily="{DynamicResource MaterialDesignFont}"
+        xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+        mc:Ignorable="d">
+    <UserControl.Background>
+        <ImageBrush ImageSource="/Images/body-bg.jpg" Stretch="Fill"/>
+    </UserControl.Background>
+
+    <Grid>
+        
+        <!--<i:Interaction.Triggers>
+            <i:KeyTrigger Key="Enter">
+                <i:InvokeCommandAction Command="{Binding LoginCommand}" />
+            </i:KeyTrigger>
+        </i:Interaction.Triggers>-->
+        <Grid.RowDefinitions >
+            <RowDefinition Height="2*"></RowDefinition>
+            <RowDefinition Height="*"></RowDefinition>
+            <RowDefinition Height="6*"></RowDefinition>
+            <RowDefinition Height="3*"></RowDefinition>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="17*"/>
+            <ColumnDefinition Width="66*"/>
+            <ColumnDefinition Width="17*"/>
+        </Grid.ColumnDefinitions>
+
+        <materialDesign:Card  Margin="16" Grid.Row="2" Grid.Column="1">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="7*"/>
+                    <ColumnDefinition Width="5*"/>
+                </Grid.ColumnDefinitions>
+                <Grid Grid.Column="0">
+                    <Grid.RowDefinitions >
+                        <RowDefinition Height="*"></RowDefinition>
+                        <RowDefinition Height="2*"></RowDefinition>
+                        <RowDefinition Height="2*"></RowDefinition>
+                        <RowDefinition Height="7*"></RowDefinition>
+                    </Grid.RowDefinitions>
+                    <TextBlock
+                    Grid.Row="1"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="28"
+                    Foreground="#31ccec"
+                    FontWeight="Bold"
+                    Text="欢迎登录毒麻药品管理系统">
+                    </TextBlock>
+                    <TextBlock
+                    Grid.Row="2"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="14"
+                    Foreground="#31ccec"
+                    FontWeight="Bold"
+                    Text="登录方式1：账号密码登录">
+                    </TextBlock>
+                    <Grid Grid.Row="3"  >
+                        <Grid.RowDefinitions >
+                            <RowDefinition Height="*"></RowDefinition>
+                            <RowDefinition Height="*"></RowDefinition>
+                            <RowDefinition Height="*"></RowDefinition>
+                        </Grid.RowDefinitions>
+
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="4*"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+                        <TextBox
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            x:Name="account"
+                            Text="{Binding Username, UpdateSourceTrigger=PropertyChanged}"
+                            Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                            VerticalAlignment="Top"
+                            AcceptsReturn="False"
+                            TextWrapping="Wrap"
+                            materialDesign:HintAssist.Hint="账号" />
+                        <PasswordBox
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            x:Name="PasswordBox"
+                            materialDesign:PasswordBoxAssist.Password="{Binding Password, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                            Style="{StaticResource MaterialDesignOutlinedPasswordBox}"
+                            VerticalAlignment="Top"
+                            materialDesign:HintAssist.Hint="密码" />
+                        <StackPanel Grid.Row="2"
+                            Grid.Column="1">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"></ColumnDefinition>
+                                    <ColumnDefinition Width="2*"></ColumnDefinition>
+                                    <ColumnDefinition Width="*"></ColumnDefinition>
+                                    <ColumnDefinition Width="2*"></ColumnDefinition>
+                                    <ColumnDefinition Width="*"></ColumnDefinition>
+                                </Grid.ColumnDefinitions>
+                                <Button
+                                    Grid.Column="1"
+                                    Style="{StaticResource MaterialDesignRaisedButton}"
+                                    materialDesign:ButtonAssist.CornerRadius="5"
+                                    Command="{ Binding LoginCommand }"
+                                    Background="#42a5f5"
+                                    BorderBrush="#42a5f5" Cursor="Hand"  IsDefault="True"  Content="登录"/>
+                                <Button
+                                Grid.Column="3"
+                                Style="{StaticResource MaterialDesignRaisedLightButton}"
+                                Background="#7986cb"
+                                BorderBrush="#7986cb"
+                                materialDesign:ButtonAssist.CornerRadius="5" Cursor="Hand" IsCancel="true" 
+                                Command="{ Binding ExitCommand }" >
+                                    <TextBlock Foreground="{DynamicResource MaterialDesignPaper}" Text="退出" />
+                                </Button>
+                            </Grid>
+                        </StackPanel>
+                    </Grid>
+
+                </Grid>
+                <Grid Grid.Column="1">
+
+                    <Grid.Background>
+                        <ImageBrush ImageSource="/Images/finger-bg-r.png" Stretch="Fill"/>
+                    </Grid.Background>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="3*"></RowDefinition>
+                        <RowDefinition Height="2*"></RowDefinition>
+                        <RowDefinition Height="7*"></RowDefinition>
+                    </Grid.RowDefinitions>
+                    <StackPanel  Grid.Row="0"></StackPanel>
+                    <TextBlock
+                    Grid.Row="1"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="14"
+                    FontWeight="Bold"
+                    Foreground="{DynamicResource MaterialDesignPaper}"
+                    Text="登录方式2：屏幕外右侧指纹登录">
+                    </TextBlock>
+                    <StackPanel  Grid.Row="2"></StackPanel>
+                    <StackPanel  Grid.Row="3" Visibility="{Binding SingleLogin, Converter={StaticResource BooleanToVisibilityConverter}}">
+                        <materialDesign:PackIcon
+                            Kind="Fingerprint"
+                            Foreground="{DynamicResource MaterialDesignPaper}"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Width="75"
+                            Height="75"
+                        />
+                    </StackPanel>
+                    <Grid  Grid.Row="3" Visibility="{Binding MultiLogin, Converter={StaticResource BooleanToVisibilityConverter}}">
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Grid.Row="0" 
+                            FontSize="14"
+                            FontWeight="Bold"
+                            Foreground="{DynamicResource MaterialDesignPaper}"
+                            Grid.Column="1" Text="发药人：" />
+                        <TextBlock
+                            FontSize="14"
+                            FontWeight="Bold"
+                            Foreground="{DynamicResource MaterialDesignPaper}"
+                            Grid.Row="0" Grid.Column="2" Text="{Binding Operator.Nickname,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" />
+                        <TextBlock
+                            FontSize="14"
+                            FontWeight="Bold"
+                            Foreground="{DynamicResource MaterialDesignPaper}"
+                            Grid.Row="1" Grid.Column="1" Text="审核人：" />
+                        <TextBlock
+                            FontSize="14"
+                            FontWeight="Bold"
+                            Foreground="{DynamicResource MaterialDesignPaper}"
+                            Grid.Row="1" Grid.Column="2" Text="{Binding Reviewer.Nickname,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" />
+                    </Grid>
+                </Grid>
+            </Grid>
+        </materialDesign:Card>
+        <StackPanel Orientation="Vertical" Grid.Row="3" Grid.Column="2">
+            <TextBlock Visibility="{Binding DrawerPortMsg, Converter={StaticResource BooleanToVisibilityConverter}}" Text="抽屉串口连接失败" />
+            <TextBlock Visibility="{Binding CanBusPortMsg, Converter={StaticResource BooleanToVisibilityConverter}}" Text="can总线串口连接失败" /> 
+            <TextBlock Visibility="{Binding FingerMsg, Converter={StaticResource BooleanToVisibilityConverter}}" Text="指纹机连接失败" />
+        </StackPanel>
+    </Grid>
+</UserControl>
diff --git a/DM_Weight/Views/LoginWindow.xaml.cs b/DM_Weight/Views/LoginWindow.xaml.cs
new file mode 100644
index 0000000..19773d4
--- /dev/null
+++ b/DM_Weight/Views/LoginWindow.xaml.cs
@@ -0,0 +1,37 @@
+using MaterialDesignColors;
+using Prism.Events;
+using Prism.Ioc;
+using Prism.Regions;
+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.Shapes;
+using DM_Weight.msg;
+using DM_Weight.util;
+using DM_Weight.ViewModels;
+
+namespace DM_Weight.Views
+{
+    /// <summary>
+    /// LoginWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class LoginWindow : UserControl
+    {
+
+        public LoginWindow()
+        {
+            InitializeComponent();
+            
+        }
+
+    }
+}
diff --git a/DM_Weight/Views/MachineRecordWindow.xaml b/DM_Weight/Views/MachineRecordWindow.xaml
new file mode 100644
index 0000000..c6bfee0
--- /dev/null
+++ b/DM_Weight/Views/MachineRecordWindow.xaml
@@ -0,0 +1,181 @@
+<!--设备记录窗口-->
+<UserControl x:Class="DM_Weight.Views.MachineRecordWindow"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" 
+             xmlns:pagination="clr-namespace:DM_Weight.Components.pagination"
+             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:i="http://schemas.microsoft.com/xaml/behaviors"
+             xmlns:prism="http://prismlibrary.com/"
+             xmlns:convert="clr-namespace:DM_Weight.Converter"
+             mc:Ignorable="d" Loaded="UserControl_Loaded">
+    <UserControl.Resources>
+        <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>
+        <convert:MachineTypeConverter x:Key="MachineTypeConverter"/>
+    </UserControl.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Grid Margin="0 6 0 6" Grid.Row="0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1.5*" />
+                <ColumnDefinition Width="1.5*" />
+                <ColumnDefinition Width="2*" />
+                <ColumnDefinition Width="2*" />
+                <ColumnDefinition Width="5*"/>
+            </Grid.ColumnDefinitions>
+            <DatePicker
+                Grid.Column="0"
+                SelectedDate="{Binding StartDate, TargetNullValue=''}"
+                Margin="6 0 0 0"
+                materialDesign:HintAssist.Hint="开始时间"
+                Style="{StaticResource MaterialDesignOutlinedDatePicker}"
+            />
+            <DatePicker
+                Grid.Column="1"
+                SelectedDate="{Binding EndDate}"
+                Margin="6 0 0 0"
+                materialDesign:HintAssist.Hint="结束时间"
+                Style="{StaticResource MaterialDesignOutlinedDatePicker}"
+            />
+
+            <ComboBox
+                   Margin="6 0 0 0"
+                    Grid.Column="2"
+                    materialDesign:HintAssist.Hint="药品名称/拼音码"
+                    ItemsSource="{Binding DrugInfos}"
+                    SelectedItem="{Binding DrugInfo}"
+                    DisplayMemberPath="DrugName" IsEditable="True" IsTextSearchEnabled="False" KeyUp="ComboBox_KeyUp"
+                    Visibility="{Binding Type, Converter={StaticResource MachineTypeConverter},ConverterParameter=drugNameSearch}"/>
+
+            <StackPanel Grid.Column="4" Orientation="Horizontal" HorizontalAlignment="Right">
+                <Button
+                    Margin="0 0 3 0"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    ToolTip="导出" Command="{Binding DownloadAccountBook}">
+                    <StackPanel Orientation="Horizontal">
+                        <materialDesign:PackIcon Kind="download" />
+                        <TextBlock Text="导出账册" />
+                    </StackPanel>
+                </Button>
+                <Button
+                    Margin="0 0 3 0"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    ToolTip="导出" Command="{Binding Download}">
+                    <StackPanel Orientation="Horizontal">
+                        <materialDesign:PackIcon Kind="download" />
+                        <TextBlock Text="导出记录" />
+                    </StackPanel>
+                </Button>
+
+                <Button
+                Margin="0 0 6 0"
+                VerticalAlignment="Center"
+                Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                ToolTip="刷新" Command="{Binding Query}">
+                    <materialDesign:PackIcon
+                    Kind="Refresh" />
+                </Button>
+
+                <Button Margin="0 0 6 0" VerticalAlignment="Center" Style="{StaticResource MaterialDesignOutlinedLightButton}"  ToolTip="刷新" Visibility="{Binding Type, Converter={StaticResource MachineTypeConverter},ConverterParameter=saveBtn}" Command="{Binding SaveCommand}">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="保存修改" />
+                    </StackPanel>
+                </Button>
+                
+            </StackPanel>
+
+
+        </Grid>
+        <ListView Grid.Row="1" ItemsSource="{Binding MachineRecords}" 
+                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="100"
+                        Header="操作人"
+                        DisplayMemberBinding="{Binding User.Nickname}"/>
+                    <GridViewColumn  Width="100"
+                        Header="时间"
+                        DisplayMemberBinding="{Binding OperationTime, StringFormat='yyyy-MM-dd HH:mm:ss'}" />
+                    <GridViewColumn  Width="180"
+                        DisplayMemberBinding="{Binding DrugInfo.DrugName}"
+                        Header="药品名称"/>
+                    <GridViewColumn  Width="100"
+                        DisplayMemberBinding="{Binding DrugInfo.DrugSpec}"
+                        Header="规格"/>
+                    <GridViewColumn  Width="100"
+                        DisplayMemberBinding="{Binding Quantity}"
+                        Header="数量"/>
+                    <GridViewColumn  Width="180"
+                        DisplayMemberBinding="{Binding ManuNo}"
+                        Header="批次"/>
+                    <GridViewColumn  Width="150"
+                        DisplayMemberBinding="{Binding EffDate, StringFormat=yyyy-MM-dd}"
+                        Header="效期"/>
+                    <GridViewColumn  Width="100"
+                        Header="库位">
+                        <GridViewColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBlock>
+                                    <TextBlock.Text>
+                                        <MultiBinding StringFormat="{}{0}-{1}">
+                                            <Binding Path="DrawerNo"/>
+                                            <Binding Path="ColNo"/>
+                                        </MultiBinding>
+                                    </TextBlock.Text>
+                                </TextBlock>
+                            </DataTemplate>
+                        </GridViewColumn.CellTemplate>
+                    </GridViewColumn>
+                    <GridViewColumn Width="{Binding Type,Converter={StaticResource MachineTypeConverter},ConverterParameter=gridviewColumn}" Header="凭证号">
+                        <GridViewColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBox Width="{Binding Type,Converter={StaticResource MachineTypeConverter},ConverterParameter=gridviewColumn}" Style="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}" Visibility="{Binding Type, Converter={StaticResource MachineTypeConverter},ConverterParameter=drugNameSearch}">
+                                    <TextBox.Text>
+                                        <Binding Path="InvoiceId" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
+                                        </Binding>
+                                    </TextBox.Text>
+                                </TextBox>
+                            </DataTemplate>
+                        </GridViewColumn.CellTemplate>
+                    </GridViewColumn>
+
+                </GridView>
+            </ListView.View>
+        </ListView>
+
+        <pagination:Pagination Grid.Row="2"
+                                   CurrentPage="{Binding PageNum}"
+                                   PageSize="{Binding PageSize}"
+                                   TotalPages="{Binding TotalCount}"
+                                   InfoTextIsEnabel="True"
+                                />
+    </Grid>
+</UserControl>
diff --git a/DM_Weight/Views/MachineRecordWindow.xaml.cs b/DM_Weight/Views/MachineRecordWindow.xaml.cs
new file mode 100644
index 0000000..b52e96e
--- /dev/null
+++ b/DM_Weight/Views/MachineRecordWindow.xaml.cs
@@ -0,0 +1,54 @@
+using DM_Weight.ViewModels;
+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>
+    /// MachineRecordWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class MachineRecordWindow : UserControl
+    {
+        MachineRecordWindowViewModel vms;
+        public MachineRecordWindow()
+        {
+            InitializeComponent();
+        }
+
+        /// <summary>
+        /// 药品名称下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+
+        private void ComboBox_KeyUp(object sender, KeyEventArgs e)
+        {
+            ComboBox comboBox = sender as ComboBox;
+            vms.UpdateComboBoxItems(comboBox.Text);
+            if (this.vms.DrugInfos.Count > 0)
+            {
+                comboBox.IsDropDownOpen = true;
+            }
+            //TextBox textBox = (TextBox)comboBox.Template.FindName("PART_EditableTextBox", comboBox);
+            //textBox.SelectionStart = textBox.Text.Length;
+        }
+
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
+        {
+
+            vms = MachineRecordWindowViewModel.vm;
+        }
+    }
+}
diff --git a/DM_Weight/Views/MainWindow.xaml b/DM_Weight/Views/MainWindow.xaml
new file mode 100644
index 0000000..8de71ab
--- /dev/null
+++ b/DM_Weight/Views/MainWindow.xaml
@@ -0,0 +1,40 @@
+<!--主窗口-->
+<Window x:Class="DM_Weight.Views.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+        TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+        TextElement.FontWeight="Regular"
+        TextElement.FontSize="13"
+        TextOptions.TextFormattingMode="Ideal" 
+        TextOptions.TextRenderingMode="Auto"
+        ResizeMode="NoResize"
+        Background="#eceff1"
+        FontFamily="{DynamicResource MaterialDesignFont}"
+        mc:Ignorable="d"
+        xmlns:prism="http://prismlibrary.com/"
+        WindowStartupLocation="CenterScreen"
+        Topmost="False"
+        prism:ViewModelLocator.AutoWireViewModel="True"
+        Title="主窗口" Height="768" Width="1024" WindowStyle="None" WindowState="Maximized">
+    <WindowChrome.WindowChrome>
+        <WindowChrome CornerRadius="4" GlassFrameThickness="1" />
+    </WindowChrome.WindowChrome>
+    
+    <materialDesign:DialogHost
+        DialogMargin="0"
+        Identifier="RootDialog"
+        DialogTheme="Inherit"
+        SnackbarMessageQueue="{Binding ElementName=SnackbarThree, Path=MessageQueue}">
+        <Grid>
+            <ContentControl prism:RegionManager.RegionName="MainRegion"/>
+            <materialDesign:Snackbar
+                        x:Name="SnackbarThree"
+                        Background="{Binding Background}"
+                        MessageQueue="{Binding SnackbarMessageQueue}"/>
+        </Grid>
+    </materialDesign:DialogHost>
+    
+</Window>
diff --git a/DM_Weight/Views/MainWindow.xaml.cs b/DM_Weight/Views/MainWindow.xaml.cs
new file mode 100644
index 0000000..73ee566
--- /dev/null
+++ b/DM_Weight/Views/MainWindow.xaml.cs
@@ -0,0 +1,47 @@
+using Prism.Events;
+using Prism.Ioc;
+using Prism.Regions;
+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.Shapes;
+using Unity;
+using Unity.Lifetime;
+using DM_Weight.msg;
+using DM_Weight.util;
+
+namespace DM_Weight.Views
+{
+    /// <summary>
+    /// MainWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class MainWindow : Window
+    {
+        //IRegionManager _regionManager;
+        //IUnityContainer _container;
+        public MainWindow()
+        {
+            InitializeComponent();
+            //_regionManager = regionManager;
+            //_container = container;
+            //System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() =>
+            //{
+
+            //    _container.RegisterType<object, LoginWindow>("LoginWindow");
+            //    _regionManager.RequestNavigate("MainRegion", "LoginWindow");
+
+            //}));
+
+        }
+       
+    }
+}
diff --git a/DM_Weight/Views/OrderTakeDrugWindow.xaml b/DM_Weight/Views/OrderTakeDrugWindow.xaml
new file mode 100644
index 0000000..821b3a3
--- /dev/null
+++ b/DM_Weight/Views/OrderTakeDrugWindow.xaml
@@ -0,0 +1,134 @@
+<!--处方取药界面-->
+<UserControl x:Class="DM_Weight.Views.OrderTakeDrugWindow"
+             xmlns:pagination="clr-namespace:DM_Weight.Components.pagination"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" 
+             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:i="http://schemas.microsoft.com/xaml/behaviors"
+             xmlns:prism="http://prismlibrary.com/"
+             xmlns:convert="clr-namespace:DM_Weight.Converter"
+             mc:Ignorable="d">
+    <UserControl.Resources>
+        <convert:OrderStatusConverter x:Key="OrderStatusConverter" />
+        <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 Height="Auto" />
+            <RowDefinition />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Grid Margin="0 6 0 6" Grid.Row="0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1.5*" />
+                <ColumnDefinition Width="2*" />
+                <ColumnDefinition Width="2*" />
+                <ColumnDefinition Width="4.5*"/>
+            </Grid.ColumnDefinitions>
+            <ComboBox
+                Grid.Column="0"
+                Margin="6 0 0 0"
+                Style="{StaticResource MaterialDesignOutlinedComboBox}"
+                SelectedItem="{Binding SelectedItem}"
+                DisplayMemberPath="Name"
+                ItemsSource="{Binding OrderTakeSelects}"
+                />
+            <TextBox
+                Grid.Column="1"
+                Text="{Binding SearchValue, UpdateSourceTrigger=PropertyChanged}"
+                materialDesign:HintAssist.Hint="{Binding SelectedItem.Name}"
+                materialDesign:HintAssist.IsFloating="True"
+                Margin="6 0 0 0"
+                Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
+            <DatePicker
+                Grid.Column="2"
+                SelectedDate="{Binding OrderDate, StringFormat=yyyy-MM-dd, TargetNullValue='',UpdateSourceTrigger=PropertyChanged}"
+                SelectedDateFormat="Short"
+                Margin="6 0 0 0"
+                materialDesign:HintAssist.Hint="开方日期"
+                Style="{StaticResource MaterialDesignOutlinedDatePicker}" />
+            <Grid
+                Grid.Column="3">
+                <Button
+                    HorizontalAlignment="Right"
+                    Margin="0 0 6 0"
+                    VerticalAlignment="Center"
+                    Command="{Binding QueryCommand}"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    ToolTip="刷新" Cursor="Hand" Click="Button_Click">
+                    <materialDesign:PackIcon
+                    Kind="Refresh" />
+                </Button>
+            </Grid>
+        </Grid>
+        <ListView
+            Grid.Row="1"  Grid.ColumnSpan="3"
+            ItemsSource="{Binding OrderInfos}"
+            SelectedItem="{Binding SelectedOrder}"
+            materialDesign:ListViewAssist.HeaderRowBackground="#31ccec">
+                <!--<ListView.Resources>
+                    <Style TargetType="{x:Type GridViewColumnHeader}" BasedOn="{StaticResource {x:Type GridViewColumnHeader}}">
+                    <Setter Property="Foreground" Value="White" />
+                </Style>
+                </ListView.Resources>-->
+                <i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding RowSelected}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>
+            <ListView.ItemContainerStyle>
+                <Style TargetType="ListViewItem" BasedOn="{StaticResource MaterialDesignGridViewItem}">
+                    <Setter Property="ListView.Height" Value="50"/>
+                </Style>
+            </ListView.ItemContainerStyle>
+            <ListView.View>
+                    <GridView ColumnHeaderContainerStyle="{StaticResource st}" >
+                        <GridViewColumn Width="153"
+                        Header="患者ID"
+                        DisplayMemberBinding="{Binding PatientId}"/>
+                        <GridViewColumn Width="153"
+                        Header="姓名"
+                        DisplayMemberBinding="{Binding PName}" />
+                        <GridViewColumn Width="80"
+                        DisplayMemberBinding="{Binding Sex}"
+                        Header="性别"/>
+                        <GridViewColumn  Width="80"
+                        DisplayMemberBinding="{Binding Age}"
+                        Header="年龄"/>
+                        <GridViewColumn Width="153"
+                        DisplayMemberBinding="{Binding IdNumber}"
+                        Header="身份证"/>
+                        <GridViewColumn Width="153"
+                        DisplayMemberBinding="{Binding OrderNo}"
+                        Header="处方号"/>
+                        <GridViewColumn Width="153"
+                        DisplayMemberBinding="{Binding DeptName}"
+                        Header="科室"/>
+                    <GridViewColumn  Width="80"
+                        DisplayMemberBinding="{Binding DmStatus, Converter={StaticResource OrderStatusConverter}}"
+                        Header="状态"/>
+                    </GridView>
+                </ListView.View>
+            </ListView>
+            <pagination:Pagination Grid.Row="2" Grid.ColumnSpan="3"
+                                   CurrentPage="{Binding PageNum}"
+                                   PageSize="{Binding PageSize}"
+                                   TotalPages="{Binding TotalCount}"
+                                   InfoTextIsEnabel="True"
+                                />
+    </Grid>
+</UserControl>
diff --git a/DM_Weight/Views/OrderTakeDrugWindow.xaml.cs b/DM_Weight/Views/OrderTakeDrugWindow.xaml.cs
new file mode 100644
index 0000000..d6df65a
--- /dev/null
+++ b/DM_Weight/Views/OrderTakeDrugWindow.xaml.cs
@@ -0,0 +1,33 @@
+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>
+    /// OrderTakeDrugWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class OrderTakeDrugWindow : UserControl
+    {
+        public OrderTakeDrugWindow()
+        {
+            InitializeComponent();
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+    }
+}
diff --git a/DM_Weight/Views/ReturnDrugWindow.xaml b/DM_Weight/Views/ReturnDrugWindow.xaml
new file mode 100644
index 0000000..3ecbede
--- /dev/null
+++ b/DM_Weight/Views/ReturnDrugWindow.xaml
@@ -0,0 +1,117 @@
+<UserControl x:Class="DM_Weight.Views.ReturnDrugWindow"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" 
+             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:i="http://schemas.microsoft.com/xaml/behaviors"
+             xmlns:prism="http://prismlibrary.com/"
+             mc:Ignorable="d">
+    <UserControl.Resources>
+        <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 Height="Auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <Grid Margin="0 6 0 6" Grid.Row="0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="110" />
+                <ColumnDefinition Width="180" />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <ComboBox
+                Grid.Column="0"
+                Margin="6 0 0 0"
+                Style="{StaticResource MaterialDesignOutlinedComboBox}"
+                SelectedItem="{Binding SelectedItem}"
+                DisplayMemberPath="Name"
+                ItemsSource="{Binding Selects}"
+                />
+            <TextBox
+                Grid.Column="1"
+                Text="{Binding SearchValue}"
+                materialDesign:HintAssist.Hint="{Binding SelectedItem.Name}"
+                Margin="6 0 0 0"
+                Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
+
+            <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right">
+                <Button
+                Margin="0 0 6 0"
+                VerticalAlignment="Center"
+                Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                ToolTip="刷新" Cursor="Hand">
+                    <materialDesign:PackIcon
+                    Kind="Refresh" />
+                </Button>
+            </StackPanel>
+
+
+        </Grid>
+        <ListView
+            Grid.Row="1"
+            ItemsSource="{Binding MachineRecords}"
+            SelectedItem="{Binding SelectedRecord}"
+            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>
+            <i:Interaction.Triggers>
+                <i:EventTrigger EventName="SelectionChanged">
+                    <i:InvokeCommandAction Command="{Binding RowSelected}" />
+                </i:EventTrigger>
+            </i:Interaction.Triggers>
+            <ListView.View>
+                <GridView ColumnHeaderContainerStyle="{StaticResource st}">
+                    <GridViewColumn Width="110"
+                        Header="操作时间"
+                        DisplayMemberBinding="{Binding OperationTime, StringFormat='yyyy-MM-dd HH:mm:ss'}"/>
+                    <GridViewColumn Width="100"
+                        Header="操作人"
+                        DisplayMemberBinding="{Binding User.Nickname}" />
+                    <GridViewColumn Width="150"
+                        DisplayMemberBinding="{Binding DrugInfo.DrugName}"
+                        Header="药品名称"/>
+                    <GridViewColumn Width="150"
+                        DisplayMemberBinding="{Binding DrugInfo.DrugSpec}"
+                        Header="规格"/>
+                    <GridViewColumn Width="100"
+                        DisplayMemberBinding="{Binding ManuNo}"
+                        Header="批次"/>
+                    <GridViewColumn Width="100"
+                        DisplayMemberBinding="{Binding EffDate, StringFormat=yyyy-MM-dd}"
+                        Header="效期"/>
+                    <GridViewColumn Width="100"
+                        DisplayMemberBinding="{Binding Quantity}"
+                        Header="取药数量"/>
+                    <GridViewColumn Width="100"
+                        DisplayMemberBinding="{Binding ReturnQuantity1}"
+                        Header="还药数量"/>
+                    <GridViewColumn Width="80"
+                        DisplayMemberBinding="{Binding ReturnQuantity2}"
+                        Header="还空瓶数量"/>
+                </GridView>
+            </ListView.View>
+        </ListView>
+        
+
+    </Grid>
+</UserControl>
diff --git a/DM_Weight/Views/ReturnDrugWindow.xaml.cs b/DM_Weight/Views/ReturnDrugWindow.xaml.cs
new file mode 100644
index 0000000..4cfb11e
--- /dev/null
+++ b/DM_Weight/Views/ReturnDrugWindow.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>
+    /// ReturnDrugWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class ReturnDrugWindow : UserControl
+    {
+        public ReturnDrugWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/ReturnDrugWindow2.xaml b/DM_Weight/Views/ReturnDrugWindow2.xaml
new file mode 100644
index 0000000..831c6ac
--- /dev/null
+++ b/DM_Weight/Views/ReturnDrugWindow2.xaml
@@ -0,0 +1,127 @@
+<UserControl x:Class="DM_Weight.Views.ReturnDrugWindow2"
+             xmlns:pagination="clr-namespace:DM_Weight.Components.pagination"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" 
+             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:i="http://schemas.microsoft.com/xaml/behaviors"
+             xmlns:prism="http://prismlibrary.com/"
+             mc:Ignorable="d">
+    <UserControl.Resources>
+        <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 Height="Auto" />
+            <RowDefinition />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Grid Margin="0 6 0 6" Grid.Row="0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="110" />
+                <ColumnDefinition Width="180" />
+                <ColumnDefinition Width="140" />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <ComboBox
+                Grid.Column="0"
+                Margin="6 0 0 0"
+                Style="{StaticResource MaterialDesignOutlinedComboBox}"
+                SelectedItem="{Binding SelectedItem}"
+                DisplayMemberPath="Name"
+                ItemsSource="{Binding OrderTakeSelects}"
+                />
+            <TextBox
+                Grid.Column="1"
+                Text="{Binding SearchValue, UpdateSourceTrigger=PropertyChanged}"
+                materialDesign:HintAssist.Hint="{Binding SelectedItem.Name}"
+                materialDesign:HintAssist.IsFloating="True"
+                Margin="6 0 0 0"
+                Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
+            <DatePicker
+                Grid.Column="2"
+                SelectedDate="{Binding OrderDate, StringFormat=yyyy-MM-dd, TargetNullValue='',UpdateSourceTrigger=PropertyChanged}"
+                SelectedDateFormat="Short"
+                Margin="6 0 0 0"
+                materialDesign:HintAssist.Hint="开方日期"
+                Style="{StaticResource MaterialDesignOutlinedDatePicker}" />
+            <Grid
+                Grid.Column="3">
+                <Button
+                    HorizontalAlignment="Right"
+                    Margin="0 0 6 0"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    ToolTip="刷新" Cursor="Hand"
+                    Command="{Binding Query}"
+                    >
+                    <materialDesign:PackIcon
+                    Kind="Refresh" />
+                </Button>
+            </Grid>
+        </Grid>
+        <ListView
+            Grid.Row="1"
+            ItemsSource="{Binding OrderInfos}"
+            SelectedItem="{Binding SelectedOrder}"
+            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>
+            <i:Interaction.Triggers>
+                <i:EventTrigger EventName="SelectionChanged">
+                    <i:InvokeCommandAction Command="{Binding RowSelected}" />
+                </i:EventTrigger>
+            </i:Interaction.Triggers>
+            <ListView.View>
+                <GridView ColumnHeaderContainerStyle="{StaticResource st}">
+                    <GridViewColumn Width="110"
+                        Header="患者ID"
+                        DisplayMemberBinding="{Binding PatientId}"/>
+                    <GridViewColumn Width="130"
+                        Header="姓名"
+                        DisplayMemberBinding="{Binding PName}" />
+                    <GridViewColumn Width="110"
+                        DisplayMemberBinding="{Binding Sex}"
+                        Header="性别"/>
+                    <GridViewColumn Width="200"
+                        DisplayMemberBinding="{Binding Age}"
+                        Header="年龄"/>
+                    <GridViewColumn Width="110"
+                        DisplayMemberBinding="{Binding IdNumber}"
+                        Header="身份证"/>
+                    <GridViewColumn
+                        DisplayMemberBinding="{Binding OrderNo}"
+                        Header="处方号"/>
+                    <GridViewColumn Width="240"
+                        DisplayMemberBinding="{Binding DeptName}"
+                        Header="科室"/>
+                </GridView>
+            </ListView.View>
+        </ListView>
+
+        <pagination:Pagination Grid.Row="2"
+                                   CurrentPage="{Binding PageNum}"
+                                   PageSize="{Binding PageSize}"
+                                   TotalPages="{Binding TotalCount}"
+                                   InfoTextIsEnabel="True"
+                                />
+    </Grid>
+</UserControl>
diff --git a/DM_Weight/Views/ReturnDrugWindow2.xaml.cs b/DM_Weight/Views/ReturnDrugWindow2.xaml.cs
new file mode 100644
index 0000000..813b566
--- /dev/null
+++ b/DM_Weight/Views/ReturnDrugWindow2.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>
+    /// ReturnDrugWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class ReturnDrugWindow2 : UserControl
+    {
+        public ReturnDrugWindow2()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/ReturnEmptyWindow.xaml b/DM_Weight/Views/ReturnEmptyWindow.xaml
new file mode 100644
index 0000000..33c9d3e
--- /dev/null
+++ b/DM_Weight/Views/ReturnEmptyWindow.xaml
@@ -0,0 +1,88 @@
+<UserControl x:Class="DM_Weight.Views.ReturnEmptyWindow"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" 
+             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:i="http://schemas.microsoft.com/xaml/behaviors"
+             xmlns:prism="http://prismlibrary.com/"
+             mc:Ignorable="d">
+    <UserControl.Resources>
+        <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 Height="Auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <Grid Margin="0 6 0 6" Grid.Row="0">
+
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                <Button
+                    Margin="0 0 6 0"
+                    VerticalAlignment="Center"
+                    Command="{Binding Query}"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    ToolTip="刷新"
+                >
+                    <materialDesign:PackIcon
+                    Kind="Refresh" />
+                </Button>
+            </StackPanel>
+        </Grid>
+        <ListView
+            Grid.Row="1"
+            ItemsSource="{Binding Channels}"
+            SelectedItem="{Binding Channel}"
+            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>
+            <i:Interaction.Triggers>
+                <i:EventTrigger EventName="SelectionChanged">
+                    <i:InvokeCommandAction Command="{Binding RowSelected}" />
+                </i:EventTrigger>
+            </i:Interaction.Triggers>
+            <ListView.View>
+                <GridView ColumnHeaderContainerStyle="{StaticResource st}">
+                    <GridViewColumn Width="140"
+                        Header="库位"
+                        DisplayMemberBinding="{Binding Location}"/>
+                    <GridViewColumn  Width="200"
+                        Header="药品名称"
+                        DisplayMemberBinding="{Binding DrugInfo.DrugName}" />
+                    <GridViewColumn  Width="200"
+                        DisplayMemberBinding="{Binding DrugInfo.DrugSpec}"
+                        Header="规格"/>
+                    <GridViewColumn  Width="200"
+                        DisplayMemberBinding="{Binding DrugInfo.Manufactory}"
+                        Header="厂家"/>
+                    <GridViewColumn  Width="100"
+                        DisplayMemberBinding="{Binding CanReturnQuantity}"
+                        Header="可归还数量"/>
+                    <GridViewColumn  Width="150"
+                        DisplayMemberBinding="{Binding Quantity}"
+                        Header="库存"/>
+                </GridView>
+            </ListView.View>
+        </ListView>
+
+    </Grid>
+</UserControl>
diff --git a/DM_Weight/Views/ReturnEmptyWindow.xaml.cs b/DM_Weight/Views/ReturnEmptyWindow.xaml.cs
new file mode 100644
index 0000000..c920d38
--- /dev/null
+++ b/DM_Weight/Views/ReturnEmptyWindow.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>
+    /// ReturnEmptyWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class ReturnEmptyWindow : UserControl
+    {
+        public ReturnEmptyWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/RoleManagerWindow.xaml b/DM_Weight/Views/RoleManagerWindow.xaml
new file mode 100644
index 0000000..dc606c7
--- /dev/null
+++ b/DM_Weight/Views/RoleManagerWindow.xaml
@@ -0,0 +1,193 @@
+<UserControl x:Class="DM_Weight.Views.RoleManagerWindow"
+            xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" 
+            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:i="http://schemas.microsoft.com/xaml/behaviors"
+            xmlns:convert="clr-namespace:DM_Weight.Converter"
+            xmlns:prism="http://prismlibrary.com/"
+            mc:Ignorable="d">
+    <UserControl.Resources>
+        <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.Resources>
+            <convert:NullableToEnabelConverter x:Key="NullableToEnabelConverter" />
+        </Grid.Resources>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Grid Margin="0 6 0 6" Grid.Row="0">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="180" />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+
+                <TextBox
+                    Grid.Column="0"
+                    Text="{Binding SearchValue, UpdateSourceTrigger=PropertyChanged}"
+                    materialDesign:HintAssist.Hint="角色名"
+                    Margin="6 0 0 0"
+                    Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
+
+                <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
+
+                    <Button
+                Margin="0 0 6 0"
+                VerticalAlignment="Center"
+                Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                ToolTip="刷新" Command="{Binding Query}">
+                        <materialDesign:PackIcon
+                    Kind="Refresh" />
+                    </Button>
+                </StackPanel>
+            </Grid>
+            <ListView Grid.Row="1" Grid.Column="0" ItemsSource="{Binding RoleList}" 
+                SelectedItem="{Binding Role}"
+                materialDesign:ListViewAssist.HeaderRowBackground="#31ccec"
+                materialDesign:DataGridAssist.ColumnHeaderPadding="10"
+                materialDesign:ListViewAssist.ListViewItemPadding="13">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding RowSelected}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <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="253"
+                        Header="角色编号"
+                        DisplayMemberBinding="{Binding Id}"/>
+                        <GridViewColumn Width="253"
+                        DisplayMemberBinding="{Binding RoleName}"
+                        Header="角色名"/>
+
+                    </GridView>
+                </ListView.View>
+            </ListView>
+        </Grid>
+        <GroupBox Margin="6"  Grid.Column="1" Header="编辑/新增" materialDesign:ColorZoneAssist.Mode="PrimaryLight">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <Grid Grid.Row="0">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <TextBox
+                         Grid.Column="0" Margin="10"
+                        Text="{Binding Role.RoleName}"
+                        materialDesign:HintAssist.Hint="角色名"
+                        Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
+                    <StackPanel  Grid.Column="1" Orientation="Horizontal" Margin="10" HorizontalAlignment="Right" VerticalAlignment="Center">
+                        <Button
+                            Margin="6" 
+                            Command="{Binding EditRole}"
+                            IsEnabled="{Binding Role.Id, Converter={StaticResource NullableToEnabelConverter}}"
+                            Content="修改" Cursor="Hand" />
+                        <Button
+                            Command="{Binding AddRole}"
+                            Content="新增" />
+                    </StackPanel>
+                </Grid>
+                <Grid Grid.Row="1">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <GroupBox Header="全部菜单"   Grid.Column="0" Margin="10">
+                        <ScrollViewer  Grid.Row="1"  Grid.Column="1">
+                            <TreeView x:Name="LeftTree" MinWidth="220" ItemsSource="{Binding AllPremissions}">
+                                <i:Interaction.Triggers>
+                                    <i:EventTrigger EventName="SelectedItemChanged">
+                                        <i:InvokeCommandAction Command="{Binding Path=LeftSelectedItemChangedCommand}" 
+                                           CommandParameter="{Binding ElementName=LeftTree, Path=SelectedItem}"/>
+                                    </i:EventTrigger>
+                                </i:Interaction.Triggers>
+                                <TreeView.ItemTemplate>
+                                    <HierarchicalDataTemplate ItemsSource="{Binding Children}">
+                                        <TextBlock Text="{Binding PremissionName}" />
+                                    </HierarchicalDataTemplate>
+                                </TreeView.ItemTemplate>
+                            </TreeView>
+                        </ScrollViewer>
+                    </GroupBox>
+                    <StackPanel Grid.Column="1" Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
+                        <Button
+                            Margin="0 4 0 4"
+                            Style="{StaticResource MaterialDesignPaperLightButton}"
+                            ToolTip="右移"
+                            IsEnabled="{Binding LeftPremission, Converter={StaticResource NullableToEnabelConverter}}"
+                            Command="{Binding ToRight}"
+                            Content="{materialDesign:PackIcon ChevronRight}"/>
+                        <Button
+                            Margin="0 4 0 4"
+                            Style="{StaticResource MaterialDesignPaperLightButton}"
+                            ToolTip="左移"
+                            IsEnabled="{Binding RightPremission, Converter={StaticResource NullableToEnabelConverter}}"
+                            Command="{Binding ToLeft}"
+                            Content="{materialDesign:PackIcon ChevronLeft}"/>
+                        <Button
+                            Margin="0 4 0 4"
+                            Style="{StaticResource MaterialDesignPaperLightButton}"
+                            ToolTip="全部右移"
+                            Command="{Binding AllToRight}"
+                            Content="{materialDesign:PackIcon ChevronDoubleRight}"/>
+                        <Button
+                            Margin="0 4 0 4"
+                            Style="{StaticResource MaterialDesignPaperLightButton}"
+                            ToolTip="全部左移"
+                            Command="{Binding AllToLeft}"
+                            Content="{materialDesign:PackIcon ChevronDoubleLeft}" />
+                    </StackPanel>
+                    <GroupBox Header="已选菜单"  Grid.Column="2" Margin="10">
+                        <ScrollViewer  Grid.Row="1"  Grid.Column="1">
+                            <TreeView x:Name="RightTree" MinWidth="220" ItemsSource="{Binding RightPremissions}">
+                                <i:Interaction.Triggers>
+                                    <i:EventTrigger EventName="SelectedItemChanged">
+                                        <i:InvokeCommandAction Command="{Binding Path=RightSelectedItemChangedCommand}" 
+                                           CommandParameter="{Binding ElementName=RightTree, Path=SelectedItem}"/>
+                                    </i:EventTrigger>
+                                </i:Interaction.Triggers>
+                                <TreeView.ItemTemplate>
+                                    <HierarchicalDataTemplate ItemsSource="{Binding Children}">
+                                        <TextBlock Text="{Binding PremissionName}" />
+                                    </HierarchicalDataTemplate>
+                                </TreeView.ItemTemplate>
+                            </TreeView>
+                        </ScrollViewer>
+                    </GroupBox>
+                </Grid>
+                
+            </Grid>
+        </GroupBox>
+    </Grid>
+</UserControl>
diff --git a/DM_Weight/Views/RoleManagerWindow.xaml.cs b/DM_Weight/Views/RoleManagerWindow.xaml.cs
new file mode 100644
index 0000000..cf9e5f3
--- /dev/null
+++ b/DM_Weight/Views/RoleManagerWindow.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>
+    /// RoleManagerWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class RoleManagerWindow : UserControl
+    {
+        public RoleManagerWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/SelfAddWindow.xaml b/DM_Weight/Views/SelfAddWindow.xaml
new file mode 100644
index 0000000..b7880d9
--- /dev/null
+++ b/DM_Weight/Views/SelfAddWindow.xaml
@@ -0,0 +1,238 @@
+<UserControl x:Class="DM_Weight.Views.SelfAddWindow"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" 
+             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:i="http://schemas.microsoft.com/xaml/behaviors"
+             xmlns:convert="clr-namespace:DM_Weight.Converter"
+             xmlns:prism="http://prismlibrary.com/"
+             mc:Ignorable="d">
+    <Grid>
+        <Grid.Resources>
+            <CollectionViewSource x:Key="GroupedDataList" Source="{Binding ChannelStocks}">
+                <CollectionViewSource.GroupDescriptions>
+                    <PropertyGroupDescription PropertyName="DrugInfo" />
+                </CollectionViewSource.GroupDescriptions>
+            </CollectionViewSource>
+            <convert:GroupSumConverter x:Key="GroupSumConverter" />
+        </Grid.Resources>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <Grid Margin="0 6 0 6" Grid.Row="0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1.5*" />
+                <ColumnDefinition Width="1.5*" />
+                <ColumnDefinition Width="7*"/>
+            </Grid.ColumnDefinitions>
+            <ComboBox
+                Grid.Column="0"
+                Margin="6 0 0 0"
+                Style="{StaticResource MaterialDesignOutlinedComboBox}"
+                SelectedItem="{Binding SelectedItem}"
+                DisplayMemberPath="Name"
+                ItemsSource="{Binding Selects}"
+                />
+            <TextBox
+                Grid.Column="1"
+                Text="{Binding SearchValue}"
+                materialDesign:HintAssist.Hint="{Binding SelectedItem.Name}"
+                Margin="6 0 0 0"
+                Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
+
+            <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right">
+                <Button
+                Margin="0 0 3 0"
+                VerticalAlignment="Center"
+                Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                Command="{Binding OpenSelfDialog}"
+                Content="加药" />
+
+                <Button
+                Margin="0 0 6 0"
+                VerticalAlignment="Center"
+                Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                Command="{Binding QueryCommand}"
+                ToolTip="刷新" Cursor="Hand">
+                    <materialDesign:PackIcon
+                    Kind="Refresh" />
+                </Button>
+            </StackPanel>
+
+
+        </Grid>
+        <DataGrid
+                Grid.Row="1"
+                materialDesign:DataGridAssist.ColumnHeaderPadding="15"
+                ItemsSource="{Binding Source={StaticResource GroupedDataList}}"
+                materialDesign:DataGridAssist.EnableEditBoxAssist="False"
+                IsSynchronizedWithCurrentItem="True"
+                materialDesign:DataGridAssist.CellPadding="13"
+                CanUserAddRows="False"
+                AutoGenerateColumns="False">
+            <DataGrid.Resources>
+                <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}">
+                    <Setter Property="Background" Value="#31ccec" />
+                    <Setter Property="Foreground" Value="white" />
+                    <Setter Property="Height" Value="56" />
+                    <Setter Property="BorderBrush" Value="white"/>
+                    <Setter Property="BorderThickness" Value="0.6"/>
+                    <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                </Style>
+                <Style TargetType="{x:Type DataGridCell}" BasedOn="{StaticResource MaterialDesignDataGridCell}">
+                    <Style.Triggers>
+                        <Trigger Property="IsReadOnly" Value="True">
+                            <Setter Property="BorderBrush" Value="Transparent" />
+                            <Setter Property="HorizontalAlignment" Value="Left"/>
+                        </Trigger>
+                    </Style.Triggers>
+                </Style>
+            </DataGrid.Resources>
+            <!--GroupStyle to group data-->
+            <DataGrid.GroupStyle>
+                <GroupStyle>
+                    <!--Group DataItems into DataGroup-->
+                    <GroupStyle.ContainerStyle>
+                        <Style TargetType="{x:Type GroupItem}">
+                            <Setter Property="Template">
+                                <Setter.Value>
+                                    <ControlTemplate TargetType="{x:Type GroupItem}">
+                                        <Expander IsExpanded="True"
+                                                  materialDesign:ExpanderAssist.HeaderBackground="PaleTurquoise">
+                                            <Expander.Header >
+                                                <StackPanel Orientation="Horizontal">
+                                                    <TextBlock Text="{Binding Path=Name.DrugName,StringFormat=药品：{0}，}" FontWeight="Bold" />
+                                                    <TextBlock FontWeight="Bold" Text="{Binding Path=Name.DrugSpec,StringFormat=规格：{0}，}" />
+                                                    <TextBlock FontWeight="Bold" Text="{Binding Path=Name.Manufactory,StringFormat=厂家：{0}，}" />
+                                                    <TextBlock FontWeight="Bold" Text="{Binding Path=Name.MaxStock,StringFormat=基数：{0}，}" />
+                                                    <TextBlock FontWeight="Bold" Text="{Binding Path=Items,Converter={StaticResource GroupSumConverter}}" />
+
+                                                </StackPanel>
+                                            </Expander.Header>
+                                            <ItemsPresenter/>
+                                        </Expander>
+                                    </ControlTemplate>
+                                </Setter.Value>
+                            </Setter>
+                        </Style>
+                    </GroupStyle.ContainerStyle>
+
+                </GroupStyle>
+            </DataGrid.GroupStyle>
+            <DataGrid.Columns>
+                <DataGridTextColumn Width="210"
+                        Binding="{Binding Location}"
+                        Header="库位"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                <DataGridTextColumn Width="210"
+                        Binding="{Binding ManuNo}"
+                        Header="批次"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                <DataGridTextColumn Width="210"
+                        Binding="{Binding EffDate}"
+                        Header="效期"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                <DataGridTextColumn Width="210"
+                        Binding="{Binding Quantity}"
+                        Header="库存"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                <!--<DataGridTextColumn
+                        Binding="{Binding AddQuantity, ValidatesOnExceptions=True}"
+                        Header="添加数量"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>-->
+                <DataGridTemplateColumn Width="151"
+                        Header="添加数量">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <TextBox Style="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}">
+                                <TextBox.Text>
+                                    <Binding Path="AddQuantity" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
+                                        <Binding.ValidationRules>
+                                            <ExceptionValidationRule />
+                                        </Binding.ValidationRules>
+                                    </Binding>
+                                </TextBox.Text>
+                            </TextBox>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+            </DataGrid.Columns>
+        </DataGrid>
+        <!--<Grid Grid.Row="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+
+            <ListView Grid.Column="0" ItemsSource="{Binding DrugInfos}" 
+                  SelectedItem="{Binding SelectedDrug}" materialDesign:ListViewAssist.HeaderRowBackground="#31ccec" materialDesign:ListViewAssist.ListViewItemPadding="12">
+                <i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding RowSelected}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>
+                <ListView.Resources>
+                    <Style TargetType="{x:Type GridViewColumnHeader}" BasedOn="{StaticResource {x:Type GridViewColumnHeader}}">
+                        <Setter Property="Foreground" Value="White" />
+                    </Style>
+                </ListView.Resources>
+                <ListView.View>
+                    <GridView>
+                        <GridViewColumn
+                        Header="药品名称"
+                        DisplayMemberBinding="{Binding DrugName}"/>
+                        <GridViewColumn
+                        Header="规格"
+                        DisplayMemberBinding="{Binding DrugSpec}" />
+                        <GridViewColumn
+                        DisplayMemberBinding="{Binding StockQuantity}"
+                        Header="库存"/>
+
+                    </GridView>
+                </ListView.View>
+            </ListView>
+            <ListView Grid.Column="1" Margin="6 0 0 0" ItemsSource="{Binding ChannelStocks}" 
+                      materialDesign:ListViewAssist.HeaderRowBackground="#31ccec" materialDesign:ListViewAssist.ListViewItemPadding="12">
+
+                <ListView.Resources>
+                    <Style TargetType="{x:Type GridViewColumnHeader}" BasedOn="{StaticResource {x:Type GridViewColumnHeader}}">
+                        <Setter Property="Foreground" Value="White" />
+                    </Style>
+                </ListView.Resources>
+                <ListView.View>
+                    <GridView>
+                        <GridViewColumn
+                        Header="选择"
+                        DisplayMemberBinding="{Binding IsSelected}"/>
+                        <GridViewColumn
+                        Header="库位"
+                        DisplayMemberBinding="{Binding Location}" />
+                        <GridViewColumn
+                        DisplayMemberBinding="{Binding ManuNo}"
+                        Header="批次"/>
+                        <GridViewColumn
+                        DisplayMemberBinding="{Binding EffDate}"
+                        Header="效期"/>
+                        <GridViewColumn
+                        DisplayMemberBinding="{Binding Quantity}"
+                        Header="库存"/>
+                        <GridViewColumn
+                        DisplayMemberBinding="{Binding AddQuantity}"
+                        Header="添加数量"/>
+
+                    </GridView>
+                </ListView.View>
+            </ListView>
+
+        </Grid>-->
+        
+
+    </Grid>
+</UserControl>
diff --git a/DM_Weight/Views/SelfAddWindow.xaml.cs b/DM_Weight/Views/SelfAddWindow.xaml.cs
new file mode 100644
index 0000000..bb722a9
--- /dev/null
+++ b/DM_Weight/Views/SelfAddWindow.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>
+    /// SelfAddWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class SelfAddWindow : UserControl
+    {
+        public SelfAddWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/SelfTakeDrugWindow.xaml b/DM_Weight/Views/SelfTakeDrugWindow.xaml
new file mode 100644
index 0000000..ce4ffba
--- /dev/null
+++ b/DM_Weight/Views/SelfTakeDrugWindow.xaml
@@ -0,0 +1,171 @@
+<!--自选取药界面-->
+<UserControl x:Class="DM_Weight.Views.SelfTakeDrugWindow"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" 
+             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:i="http://schemas.microsoft.com/xaml/behaviors"
+             xmlns:convert="clr-namespace:DM_Weight.Converter"
+             xmlns:prism="http://prismlibrary.com/"
+             mc:Ignorable="d">
+    <Grid>
+        <Grid.Resources>
+            <CollectionViewSource x:Key="GroupedDataList" Source="{Binding ChannelStocks}">
+                <CollectionViewSource.GroupDescriptions>
+                    <PropertyGroupDescription PropertyName="DrugInfo" />
+                </CollectionViewSource.GroupDescriptions>
+            </CollectionViewSource>
+            <convert:GroupSumConverter x:Key="GroupSumConverter" />
+        </Grid.Resources>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <Grid Margin="0 6 0 6" Grid.Row="0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="110" />
+                <ColumnDefinition Width="180" />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <ComboBox
+                Grid.Column="0"
+                Margin="6 0 0 0"
+                Style="{StaticResource MaterialDesignOutlinedComboBox}"
+                SelectedItem="{Binding SelectedItem}"
+                DisplayMemberPath="Name"
+                ItemsSource="{Binding Selects}"
+                />
+            <TextBox
+                Grid.Column="1"
+                Text="{Binding SearchValue}"
+                materialDesign:HintAssist.Hint="{Binding SelectedItem.Name}"
+                Margin="6 0 0 0"
+                Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
+
+            <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right">
+                <Button
+                Margin="0 0 3 0"
+                VerticalAlignment="Center"
+                Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                Command="{Binding OpenSelfDialog}"
+                Content="取药" />
+
+                <Button
+                Margin="0 0 6 0"
+                VerticalAlignment="Center"
+                Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                ToolTip="刷新" Cursor="Hand">
+                    <materialDesign:PackIcon
+                    Kind="Refresh" />
+                </Button>
+            </StackPanel>
+
+
+        </Grid>
+        <DataGrid
+                Grid.Row="1"
+                materialDesign:DataGridAssist.ColumnHeaderPadding="10"
+                ItemsSource="{Binding Source={StaticResource GroupedDataList}}"
+                materialDesign:DataGridAssist.EnableEditBoxAssist="False"
+                IsSynchronizedWithCurrentItem="True"
+                materialDesign:DataGridAssist.CellPadding="13"
+                CanUserAddRows="False"
+                AutoGenerateColumns="False">
+            <DataGrid.Resources>
+                <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}">
+                    <Setter Property="Background" Value="#31ccec" />
+                    <Setter Property="Foreground" Value="white" />
+                    <Setter Property="Height" Value="56" />
+                    <Setter Property="BorderBrush" Value="white"/>
+                    <Setter Property="BorderThickness" Value="0.6"/>
+                    <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                </Style>
+                <Style TargetType="{x:Type DataGridCell}" BasedOn="{StaticResource MaterialDesignDataGridCell}">
+                    <Style.Triggers>
+                        <Trigger Property="IsReadOnly" Value="True">
+                            <Setter Property="BorderBrush" Value="Transparent" />
+                            <Setter Property="HorizontalAlignment" Value="Left"/>
+                        </Trigger>
+                    </Style.Triggers>
+                </Style>
+            </DataGrid.Resources>
+            <!--GroupStyle to group data-->
+            <DataGrid.GroupStyle>
+                <GroupStyle>
+                    <!--Group DataItems into DataGroup-->
+                    <GroupStyle.ContainerStyle>
+                        <Style TargetType="{x:Type GroupItem}">
+                            <Setter Property="Template">
+                                <Setter.Value>
+                                    <ControlTemplate TargetType="{x:Type GroupItem}">
+                                        <Expander IsExpanded="True"
+                                                  materialDesign:ExpanderAssist.HeaderBackground="PaleTurquoise">
+                                            <Expander.Header >
+                                                <StackPanel Orientation="Horizontal">
+                                                    <TextBlock Text="{Binding Path=Name.DrugName,StringFormat=药品：{0}，}" FontWeight="Bold" />
+                                                    <TextBlock FontWeight="Bold" Text="{Binding Path=Name.DrugSpec,StringFormat=规格：{0}，}" />
+                                                    <TextBlock FontWeight="Bold" Text="{Binding Path=Name.Manufactory,StringFormat=厂家：{0}，}" />
+                                                    <TextBlock FontWeight="Bold" Text="{Binding Path=Items,Converter={StaticResource GroupSumConverter}}" />
+
+                                                </StackPanel>
+                                            </Expander.Header>
+                                            <ItemsPresenter/>
+                                        </Expander>
+                                    </ControlTemplate>
+                                </Setter.Value>
+                            </Setter>
+                        </Style>
+                    </GroupStyle.ContainerStyle>
+
+                </GroupStyle>
+            </DataGrid.GroupStyle>
+            <DataGrid.Columns>
+                <DataGridTextColumn Width="150"
+                        Binding="{Binding Location}"
+                        Header="库位"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                <DataGridTextColumn Width="260"
+                        Binding="{Binding ManuNo}"
+                        Header="批次"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                <DataGridTextColumn Width="260"
+                        Binding="{Binding EffDate}"
+                        Header="效期"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                <DataGridTextColumn Width="160"
+                        Binding="{Binding Quantity}"
+                        Header="库存"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                <!--<DataGridTextColumn
+                        Binding="{Binding TakeQuantity, ValidatesOnExceptions=True}"
+                        Header="取出数量"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>-->
+                <DataGridTemplateColumn  Width="160"
+                        Header="取出数量">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <TextBox Style="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}">
+                                <TextBox.Text>
+                                    <Binding Path="TakeQuantity" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
+                                        <!--<Binding.ValidationRules>
+                                            <ExceptionValidationRule />
+
+                                        </Binding.ValidationRules>-->
+                                    </Binding>
+                                </TextBox.Text>
+                            </TextBox>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+            </DataGrid.Columns>
+        </DataGrid>
+
+
+    </Grid>
+</UserControl>
diff --git a/DM_Weight/Views/SelfTakeDrugWindow.xaml.cs b/DM_Weight/Views/SelfTakeDrugWindow.xaml.cs
new file mode 100644
index 0000000..508ca83
--- /dev/null
+++ b/DM_Weight/Views/SelfTakeDrugWindow.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>
+    /// SelfTakeDrugWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class SelfTakeDrugWindow : UserControl
+    {
+        public SelfTakeDrugWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/SettingWindow.xaml b/DM_Weight/Views/SettingWindow.xaml
new file mode 100644
index 0000000..da22f59
--- /dev/null
+++ b/DM_Weight/Views/SettingWindow.xaml
@@ -0,0 +1,38 @@
+<UserControl x:Class="DM_Weight.Views.SettingWindow"
+             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"
+             mc:Ignorable="d" 
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             d:DesignHeight="450" d:DesignWidth="800">
+    <UserControl.Resources>
+        <Style TargetType="TextBlock" BasedOn="{StaticResource MaterialDesignCaptionTextBlock}">
+            <Setter Property="Margin" Value="10 0" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+        </Style>
+    </UserControl.Resources>
+    <UniformGrid Rows="7" Columns="2" Width="400">
+        <TextBlock TextAlignment="Center" Text="登录模式:" />
+        <ToggleButton
+            HorizontalAlignment="Left"
+            x:Name="MaterialDesignFilledTextBoxEnabledComboBox"
+            Style="{StaticResource MaterialDesignActionToggleButton}"
+            IsChecked="{Binding LoginMode}"
+            ToolTip="登录模式"
+            Content="单人"
+            materialDesign:ToggleButtonAssist.OnContent="双人" />
+        <TextBlock TextAlignment="Center" Text="优先登录:" />
+        <ListBox VerticalAlignment="Center"
+                 ItemsSource="{Binding keyValuePairs}"
+                 DisplayMemberPath="Name"
+                 SelectedValuePath="Code"
+                 SelectedValue="{Binding FirstLogin}"
+                 Style="{StaticResource MaterialDesignChoiceChipPrimaryListBox}"
+                 IsEnabled="{Binding Path=IsChecked, ElementName=MaterialDesignFilledTextBoxEnabledComboBox}">
+        </ListBox>
+        <Button Margin="12" Grid.ColumnSpan="2" Content="保存" Command="{Binding ResetConfigCommand}" />
+    </UniformGrid>
+</UserControl>
diff --git a/DM_Weight/Views/SettingWindow.xaml.cs b/DM_Weight/Views/SettingWindow.xaml.cs
new file mode 100644
index 0000000..a35777e
--- /dev/null
+++ b/DM_Weight/Views/SettingWindow.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>
+    /// SystemSetWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class SettingWindow : UserControl
+    {
+        public SettingWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/StockListWindow.xaml b/DM_Weight/Views/StockListWindow.xaml
new file mode 100644
index 0000000..efc4aa7
--- /dev/null
+++ b/DM_Weight/Views/StockListWindow.xaml
@@ -0,0 +1,222 @@
+<UserControl x:Class="DM_Weight.Views.StockListWindow"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" 
+             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:util="clr-namespace:DM_Weight.util"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+             xmlns:convert="clr-namespace:DM_Weight.Converter"
+             xmlns:prism="http://prismlibrary.com/"
+             mc:Ignorable="d">
+    <Grid>
+        <Grid.Resources>
+            <convert:GroupSumConverter x:Key="GroupSumConverter" />
+        </Grid.Resources>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <Grid Margin="0 6 0 6" Grid.Row="0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*" />
+                <ColumnDefinition Width="2*" />
+                <ColumnDefinition Width="7*"/>
+            </Grid.ColumnDefinitions>
+            <ComboBox
+                Grid.Column="0"
+                Margin="6 0 0 0"
+                Style="{StaticResource MaterialDesignOutlinedComboBox}"
+                SelectedItem="{Binding SelectedItem}"
+                DisplayMemberPath="Name"
+                ItemsSource="{Binding Selects}"
+                />
+            <TextBox
+                Grid.Column="1"
+                Text="{Binding SearchValue}"
+                materialDesign:HintAssist.Hint="{Binding SelectedItem.Name}"
+                Margin="6 0 0 0"
+                Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
+
+            <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right">
+                
+                <Button
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    ToolTip="库存导出"
+                    Content="库存导出"
+                    Command="{Binding Download}"/>
+                <Button
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    Margin="6 0 0 0"
+                    ToolTip="库位绑定"
+                    Content="库位绑定"
+                    Command="{Binding BindingChannelDialog}" />
+                <Button
+                    Margin="6 0 6 0"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    ToolTip="刷新" Command="{Binding QueryCommand}">
+                    <materialDesign:PackIcon
+                    Kind="Refresh" />
+                </Button>
+            </StackPanel>
+
+
+        </Grid>
+        <DataGrid
+                Grid.Row="1"
+                materialDesign:DataGridAssist.ColumnHeaderPadding="15"
+                ItemsSource="{Binding ChannelStocks}"
+                SelectedItem="SelectedChannel"
+                materialDesign:DataGridAssist.EnableEditBoxAssist="False"
+                IsSynchronizedWithCurrentItem="True"
+                materialDesign:DataGridAssist.CellPadding="13"
+                CanUserAddRows="False"
+                AutoGenerateColumns="False">
+            <DataGrid.Resources>
+                <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}">
+                    <Setter Property="Background" Value="#31ccec" />
+                    <Setter Property="Foreground" Value="white" />
+                    <Setter Property="Height" Value="56" />
+                    <Setter Property="BorderBrush" Value="white"/>
+                    <Setter Property="BorderThickness" Value="0.6"/>
+                    <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                </Style>
+                <Style TargetType="{x:Type DataGridCell}" BasedOn="{StaticResource MaterialDesignDataGridCell}">
+                    <Style.Triggers>
+                        <Trigger Property="IsReadOnly" Value="True">
+                            <Setter Property="BorderBrush" Value="Transparent" />
+                            <Setter Property="HorizontalAlignment" Value="Left"/>
+                        </Trigger>
+                    </Style.Triggers>
+                </Style>
+            </DataGrid.Resources>
+            <!--GroupStyle to group data-->
+            <DataGrid.GroupStyle>
+                <GroupStyle>
+                    <!--Group DataItems into DataGroup-->
+                    <GroupStyle.ContainerStyle>
+                        <Style TargetType="{x:Type GroupItem}">
+                            <Setter Property="Template">
+                                <Setter.Value>
+                                    <ControlTemplate TargetType="{x:Type GroupItem}">
+                                        <Expander IsExpanded="True"
+                                                  materialDesign:ExpanderAssist.HeaderBackground="PaleTurquoise">
+                                            <Expander.Header >
+
+                                                <StackPanel Orientation="Horizontal">
+                                                    <TextBlock Text="{Binding Path=Name.DrugName,StringFormat=药品：{0}，}" FontWeight="Bold" />
+                                                    <TextBlock FontWeight="Bold" Text="{Binding Path=Name.DrugSpec,StringFormat=规格：{0}，}" />
+                                                    <TextBlock FontWeight="Bold" Text="{Binding Path=Name.Manufactory,StringFormat=厂家：{0}，}" />
+                                                    <TextBlock FontWeight="Bold" Text="{Binding Path=Name.MaxStock,StringFormat=基数：{0}，}" />
+                                                    <TextBlock FontWeight="Bold" Text="{Binding Path=Items,Converter={StaticResource GroupSumConverter}}" />
+
+                                                </StackPanel>
+                                            </Expander.Header>
+                                            <ItemsPresenter/>
+                                        </Expander>
+                                    </ControlTemplate>
+                                </Setter.Value>
+                            </Setter>
+                        </Style>
+                    </GroupStyle.ContainerStyle>
+
+                </GroupStyle>
+            </DataGrid.GroupStyle>
+            <DataGrid.Columns>
+                <DataGridTextColumn Width="250"
+                        Binding="{Binding Location}"
+                        Header="库位"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                <DataGridTextColumn Width="250"
+                        Binding="{Binding ManuNo}"
+                        Header="批次"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                <DataGridTextColumn Width="250"
+                        Binding="{Binding EffDate}"
+                        Header="效期"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                <DataGridTextColumn Width="241"
+                        Binding="{Binding Quantity}"
+                        Header="库存"
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+
+            </DataGrid.Columns>
+        </DataGrid>
+        <!--<ListView Grid.Row="1"
+                  ItemsSource="{Binding DrugList}"
+                  materialDesign:ListViewAssist.HeaderRowBackground="#31ccec"
+                  materialDesign:DataGridAssist.ColumnHeaderPadding="8"
+                  >
+            <ListView.Resources>
+                <Style TargetType="{x:Type GridViewColumnHeader}" BasedOn="{StaticResource {x:Type GridViewColumnHeader}}">
+                    <Setter Property="Foreground" Value="White" />
+                </Style>
+                <Style TargetType="{x:Type ListViewItem}">
+                    <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+                </Style>
+            </ListView.Resources>
+            <ListView.View>
+                <GridView>
+                    <GridViewColumn
+                        Header="药品编码"
+                        DisplayMemberBinding="{Binding DrugId}"/>
+                    <GridViewColumn
+                        Header="药品名称"
+                        DisplayMemberBinding="{Binding DrugName}"/>
+                    <GridViewColumn
+                        DisplayMemberBinding="{Binding DrugSpec}"
+                        Header="规格"/>
+                    <GridViewColumn
+                        DisplayMemberBinding="{Binding ManuFactory}"
+                        Header="厂家"/>
+                    <GridViewColumn
+                        DisplayMemberBinding="{Binding StockQuantity}"
+                        Header="库存"/>
+                    <GridViewColumn
+                        Header="批次" >
+                        <GridViewColumn.CellTemplate>
+                            <DataTemplate>
+                                <ListBox ItemsSource="{Binding channelStocks}" DisplayMemberPath="ManuNo" materialDesign:ListBoxItemAssist.ShowSelection="False">
+                            </ListBox>
+                            </DataTemplate>
+                        </GridViewColumn.CellTemplate>
+                    </GridViewColumn>
+                    <GridViewColumn
+                        Header="效期" >
+                        <GridViewColumn.CellTemplate>
+                            <DataTemplate>
+                                <ListBox ItemsSource="{Binding channelStocks}" DisplayMemberPath="EffDate" materialDesign:ListBoxItemAssist.ShowSelection="False">
+                                </ListBox>
+                            </DataTemplate>
+                        </GridViewColumn.CellTemplate>
+                    </GridViewColumn>
+                    <GridViewColumn
+                        Header="数量" >
+                        <GridViewColumn.CellTemplate>
+                            <DataTemplate>
+                                <ListBox ItemsSource="{Binding channelStocks}" DisplayMemberPath="Quantity" materialDesign:ListBoxItemAssist.ShowSelection="False">
+                                </ListBox>
+                            </DataTemplate>
+                        </GridViewColumn.CellTemplate>
+                    </GridViewColumn>
+                    <GridViewColumn
+                        Header="库位" >
+                        <GridViewColumn.CellTemplate>
+                            <DataTemplate>
+                                <ListBox ItemsSource="{Binding channelStocks}" DisplayMemberPath="Location" materialDesign:ListBoxItemAssist.ShowSelection="False">
+                                </ListBox>
+                            </DataTemplate>
+                        </GridViewColumn.CellTemplate>
+                    </GridViewColumn>
+                </GridView>
+            </ListView.View>
+        </ListView>-->
+
+    </Grid>
+</UserControl>
diff --git a/DM_Weight/Views/StockListWindow.xaml.cs b/DM_Weight/Views/StockListWindow.xaml.cs
new file mode 100644
index 0000000..23788f0
--- /dev/null
+++ b/DM_Weight/Views/StockListWindow.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>
+    /// StockListWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class StockListWindow : UserControl
+    {
+        public StockListWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/TakeDrugControl.xaml b/DM_Weight/Views/TakeDrugControl.xaml
new file mode 100644
index 0000000..eb74a78
--- /dev/null
+++ b/DM_Weight/Views/TakeDrugControl.xaml
@@ -0,0 +1,12 @@
+<UserControl x:Class="DM_Weight.Views.TakeDrugControl"
+             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"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+            
+    </Grid>
+</UserControl>
diff --git a/DM_Weight/Views/TakeDrugControl.xaml.cs b/DM_Weight/Views/TakeDrugControl.xaml.cs
new file mode 100644
index 0000000..17612cb
--- /dev/null
+++ b/DM_Weight/Views/TakeDrugControl.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>
+    /// TakeDrugControl.xaml 的交互逻辑
+    /// </summary>
+    public partial class TakeDrugControl : UserControl
+    {
+        public TakeDrugControl()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/Test.xaml b/DM_Weight/Views/Test.xaml
new file mode 100644
index 0000000..b84ac46
--- /dev/null
+++ b/DM_Weight/Views/Test.xaml
@@ -0,0 +1,138 @@
+<UserControl x:Class="DM_Weight.Views.Test"
+             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:i="http://schemas.microsoft.com/xaml/behaviors"  
+             xmlns:md="http://materialdesigninxaml.net/winfx/xaml/themes"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <UserControl.Resources>
+        <Style x:Key="st" TargetType="GridViewColumnHeader">
+            <Style.Setters>
+                <Setter Property="Height">
+                    <Setter.Value>45</Setter.Value>
+                </Setter>
+            </Style.Setters>
+        </Style>
+    </UserControl.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="8*"/>
+            <RowDefinition Height="1*"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="3*"/>
+            <ColumnDefinition Width="7*"/>
+        </Grid.ColumnDefinitions>
+        <WrapPanel HorizontalAlignment="Left" Margin="50,5,5,5" Grid.Row="0"  Grid.ColumnSpan="2">
+          
+        </WrapPanel>
+        <Border  
+            Grid.Column="0" Grid.Row="1" 
+            Margin="4,8,4,4" 
+            BorderBrush="#D5DFE5" 
+            BorderThickness="1" 
+            CornerRadius="5">
+            <ListView x:Name="OrderInfos"
+                Margin="10,0"
+                ItemsSource="{Binding FakeOrderInfos}"
+                md:ListViewAssist.ListViewItemPadding="25,10,10,10">
+                <i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged" >
+                        <i:InvokeCommandAction Command="{Binding ShowCommand}" CommandParameter="{Binding SelectedItem,ElementName=OrderInfos}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>
+                <ListView.ItemContainerStyle>
+                    <Style TargetType="ListViewItem" BasedOn="{StaticResource MaterialDesignGridViewItem}">
+                        <Setter Property="ListView.Height" Value="50"/>
+                    </Style>
+                </ListView.ItemContainerStyle>
+                <ListView.View>
+                    <GridView AllowsColumnReorder="True"  ColumnHeaderContainerStyle="{StaticResource st}">
+                        <GridViewColumn Width="0"
+                            DisplayMemberBinding="{Binding Id}"
+                            Header="ID" />
+                        <GridViewColumn Width="110"
+                            DisplayMemberBinding="{Binding 是}"
+                            Header="处方号" />
+                        <GridViewColumn Width="110"
+                                        DisplayMemberBinding="{Binding 是}"
+                                        Header="患者姓名" />
+                    </GridView>
+                </ListView.View>
+            </ListView>
+        </Border>
+        <Border  
+            Grid.Column="1" Grid.Row="0" 
+            Margin="4,8,4,4" 
+            BorderBrush="#D5DFE5" 
+            BorderThickness="1" 
+            CornerRadius="5">
+            <ListView   Margin="10,0" md:ListViewAssist.ListViewItemPadding="25,10,10,10"
+            ItemsSource="{Binding OrderInfos}">
+                <!--<ListView.Resources>
+                    <Style TargetType="{x:Type GridViewColumnHeader}" BasedOn="{StaticResource {x:Type GridViewColumnHeader}}">
+                    <Setter Property="Foreground" Value="White" />
+                </Style>
+                </ListView.Resources>-->
+                <i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding RowSelected}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>
+                <ListView.ItemContainerStyle>
+                    <Style TargetType="ListViewItem" BasedOn="{StaticResource MaterialDesignGridViewItem}">
+                        <Setter Property="ListView.Height" Value="50"/>
+                    </Style>
+                </ListView.ItemContainerStyle>
+                <ListView.View>
+                    <GridView  AllowsColumnReorder="True"  ColumnHeaderContainerStyle="{StaticResource st}" >
+                        <GridViewColumn Width="153"
+                        Header="患者ID"
+                        DisplayMemberBinding="{Binding PatientId}"/>
+                        <GridViewColumn Width="153"
+                        Header="姓名"
+                        DisplayMemberBinding="{Binding PName}" />
+                        <GridViewColumn Width="80"
+                        DisplayMemberBinding="{Binding Sex}"
+                        Header="性别"/>
+                        <GridViewColumn  Width="80"
+                        DisplayMemberBinding="{Binding Age}"
+                        Header="年龄"/>
+                    </GridView>
+                </ListView.View>
+            </ListView>
+        </Border>
+        <ListView  Grid.Column="0" Grid.Row="0" 
+                Margin="10,0"
+                ItemsSource="{Binding FakeOrderInfos}"
+                md:ListViewAssist.ListViewItemPadding="25,10,10,10">
+            <i:Interaction.Triggers>
+                <i:EventTrigger EventName="SelectionChanged" >
+                    <i:InvokeCommandAction Command="{Binding ShowCommand}" CommandParameter="{Binding SelectedItem,ElementName=OrderInfos}" />
+                </i:EventTrigger>
+            </i:Interaction.Triggers>
+            <ListView.ItemContainerStyle>
+                <Style TargetType="ListViewItem" BasedOn="{StaticResource MaterialDesignGridViewItem}">
+                    <Setter Property="ListView.Height" Value="50"/>
+                </Style>
+            </ListView.ItemContainerStyle>
+            <ListView.View>
+                <GridView AllowsColumnReorder="True"  ColumnHeaderContainerStyle="{StaticResource st}">
+                    <GridViewColumn Width="0"
+                            DisplayMemberBinding="{Binding Id}"
+                            Header="ID" />
+                    <GridViewColumn Width="110"
+                            DisplayMemberBinding="{Binding 是}"
+                            Header="处方号" />
+                    <GridViewColumn Width="110"
+                                        DisplayMemberBinding="{Binding 是}"
+                                        Header="患者姓名" />
+                </GridView>
+            </ListView.View>
+        </ListView>
+    </Grid>
+</UserControl>
diff --git a/DM_Weight/Views/Test.xaml.cs b/DM_Weight/Views/Test.xaml.cs
new file mode 100644
index 0000000..a9cb968
--- /dev/null
+++ b/DM_Weight/Views/Test.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>
+    /// Test.xaml 的交互逻辑
+    /// </summary>
+    public partial class Test : UserControl
+    {
+        public Test()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/Views/UserManagerWindow.xaml b/DM_Weight/Views/UserManagerWindow.xaml
new file mode 100644
index 0000000..50c33f6
--- /dev/null
+++ b/DM_Weight/Views/UserManagerWindow.xaml
@@ -0,0 +1,123 @@
+<UserControl x:Class="DM_Weight.Views.UserManagerWindow"
+            xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" 
+            xmlns:pagination="clr-namespace:DM_Weight.Components.pagination"
+            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:convert="clr-namespace:DM_Weight.Converter"
+            xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+            xmlns:prism="http://prismlibrary.com/"
+            mc:Ignorable="d">
+    <UserControl.Resources>
+        <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.Resources>
+            <convert:NullableToEnabelConverter x:Key="NullableToEnabelConverter" />
+        </Grid.Resources>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Grid Margin="0 6 0 6" Grid.Row="0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="2*" />
+                <ColumnDefinition Width="8*" />
+            </Grid.ColumnDefinitions>
+            
+            <TextBox
+                Grid.Column="0"
+                Text="{Binding SearchValue}"
+                materialDesign:HintAssist.Hint="姓名"
+                Margin="6 0 0 0"
+                Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
+
+            <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
+                <Button
+                    Margin="0 0 6 0"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    Command="{Binding OpenInsertUserDialog}"
+                    Content="新增"
+                    />
+                <Button
+                    Margin="0 0 6 0"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    IsEnabled="{Binding User, Converter={StaticResource NullableToEnabelConverter}}"
+                    Command="{Binding OpenEditUserDialog}"
+                    Content="编辑"
+                    />
+                <Button
+                    Command="{Binding OpenFingerDialog}"
+                    IsEnabled="{Binding User, Converter={StaticResource NullableToEnabelConverter}}"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    Margin="0 0 6 0"
+                    Content="录入指纹" Cursor="Hand" />
+                <Button
+                    Margin="0 0 6 0"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    ToolTip="刷新" Command="{Binding Query}">
+                    <materialDesign:PackIcon
+                    Kind="Refresh" />
+                </Button>
+            </StackPanel>
+
+
+        </Grid>
+        <ListView Grid.Row="1" ItemsSource="{Binding UserList}" 
+                SelectedItem="{Binding User}"
+                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="200"
+                        Header="用户编号"
+                        DisplayMemberBinding="{Binding Id}"/>
+                    <GridViewColumn Width="305"
+                        Header="用户姓名"
+                        DisplayMemberBinding="{Binding Nickname}" />
+                    <GridViewColumn Width="305"
+                        DisplayMemberBinding="{Binding UserName}"
+                        Header="账号"/>
+                    <GridViewColumn Width="200"
+                        DisplayMemberBinding="{Binding Role.RoleName}"
+                        Header="角色"/>
+
+                </GridView>
+            </ListView.View>
+        </ListView>
+
+        <pagination:Pagination Grid.Row="2"
+                                   CurrentPage="{Binding PageNum}"
+                                   PageSize="{Binding PageSize}"
+                                   TotalPages="{Binding TotalCount}"
+                                   InfoTextIsEnabel="True"
+                                />
+
+
+    </Grid>
+</UserControl>
+
diff --git a/DM_Weight/Views/UserManagerWindow.xaml.cs b/DM_Weight/Views/UserManagerWindow.xaml.cs
new file mode 100644
index 0000000..6ee4c4b
--- /dev/null
+++ b/DM_Weight/Views/UserManagerWindow.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>
+    /// UserManagerWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class UserManagerWindow : UserControl
+    {
+        public UserManagerWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DM_Weight/favicon.ico b/DM_Weight/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..8a22d00e0617de4f53f0f794137426446f9286ef
GIT binary patch
literal 270398
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
Ryl{LyHv@8fzF>U+{{am4pp*ar

literal 0
HcmV?d00001

diff --git a/DM_Weight/log4net.config b/DM_Weight/log4net.config
new file mode 100644
index 0000000..a5c3389
--- /dev/null
+++ b/DM_Weight/log4net.config
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+	<configSections>
+		<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
+	</configSections>
+	<log4net>
+		<!-- 文件存储日志配置 -->
+		<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
+			<!--日志路径(可修改) .\\当前目录-->
+			<param name= "File" value= ".\\Log\\"/>
+			<!--是否是向文件中追加日志-->
+			<param name= "AppendToFile" value= "true"/>
+			<!--log保留天数-->
+			<param name= "MaxSizeRollBackups" value= "10"/>
+			<!--日志文件名是否是固定不变的-->
+			<param name= "StaticLogFileName" value= "false"/>
+			<!--日志文件名格式为:2008-08-31.log-->
+			<param name= "DatePattern" value= "yyyy-MM-dd&quot;.log&quot;"/>
+			<!--日志根据日期滚动-->
+			<param name= "RollingStyle" value= "Date"/>
+			<layout type="log4net.Layout.PatternLayout">
+				<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n %loggername" />
+			</layout>
+		</appender>
+		<!--指定日记记录方式，以滚动文件的方式（文件记录）-->
+		<appender name="FileAppender" type="log4net.Appender.RollingFileAppender">
+			<!--日志路径-->
+			<param name= "File" value= ".\\Log\\"/>
+			<!--是否是向文件中追加日志-->
+			<param name= "AppendToFile" value= "true"/>
+			<!--log保留天数-->
+			<param name= "MaxSizeRollBackups" value= "10"/>
+			<!--每个文件最大1M-->
+			<param name="maximumFileSize" value="1MB" />
+			<!--日志文件名是否是固定不变的-->
+			<param name= "StaticLogFileName" value= "false"/>
+			<!--日志文件名格式为:2008-08-31.log-->
+			<param name= "DatePattern" value= "yyyy-MM-dd&quot;.log&quot;"/>
+			<!--日志根据日期滚动-->
+			<param name= "RollingStyle" value= "Date"/>
+			<!--布局-->
+			<layout type="log4net.Layout.PatternLayout">
+				<param name="ConversionPattern" value="%n记录时间：%d{yyyy-MM-dd HH:mm:ss fff} 线程名：[%t] 级别：%p 类名：%c 信息：%m%n" />
+				<param name="Header" value="----------------------------------------------------------- "/>
+			</layout>
+		</appender>
+
+		<root>
+			<level value="info" />
+			<appender-ref ref="FileAppender" />
+		</root>
+	</log4net>
+</configuration>
\ No newline at end of file
diff --git a/DM_Weight/msg/AddDrugEvent.cs b/DM_Weight/msg/AddDrugEvent.cs
new file mode 100644
index 0000000..757e234
--- /dev/null
+++ b/DM_Weight/msg/AddDrugEvent.cs
@@ -0,0 +1,14 @@
+using DM_Weight.Models;
+using Prism.Events;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.msg
+{
+    internal class AddDrugEvent:PubSubEvent<ChannelList>
+    {
+    }
+}
diff --git a/DM_Weight/msg/FingerprintEvent.cs b/DM_Weight/msg/FingerprintEvent.cs
new file mode 100644
index 0000000..7d76710
--- /dev/null
+++ b/DM_Weight/msg/FingerprintEvent.cs
@@ -0,0 +1,14 @@
+using Prism.Events;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DM_Weight.util;
+
+namespace DM_Weight.msg
+{
+    public class FingerprintEvent : PubSubEvent<FingerprintMsg>
+    {
+    }
+}
diff --git a/DM_Weight/msg/PortUtilEvent.cs b/DM_Weight/msg/PortUtilEvent.cs
new file mode 100644
index 0000000..04457be
--- /dev/null
+++ b/DM_Weight/msg/PortUtilEvent.cs
@@ -0,0 +1,14 @@
+using Prism.Events;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DM_Weight.util;
+
+namespace DM_Weight.msg
+{
+    internal class PortUtilEvent : PubSubEvent<DeviceMsg>
+    {
+    }
+}
diff --git a/DM_Weight/msg/SnackbarEvent.cs b/DM_Weight/msg/SnackbarEvent.cs
new file mode 100644
index 0000000..eefd861
--- /dev/null
+++ b/DM_Weight/msg/SnackbarEvent.cs
@@ -0,0 +1,14 @@
+using Prism.Events;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DM_Weight.util;
+
+namespace DM_Weight.msg
+{
+    internal class SnackbarEvent: PubSubEvent<AlertMsg>
+    {
+    }
+}
diff --git a/DM_Weight/select/OrderTakeSelect.cs b/DM_Weight/select/OrderTakeSelect.cs
new file mode 100644
index 0000000..03b1a3e
--- /dev/null
+++ b/DM_Weight/select/OrderTakeSelect.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.select
+{
+    public class OrderTakeSelect
+    {
+        public string? Code { get; set; }
+        public string? Name { get; set; }
+    }
+}
diff --git a/DM_Weight/util/AlertMsg.cs b/DM_Weight/util/AlertMsg.cs
new file mode 100644
index 0000000..c59d08c
--- /dev/null
+++ b/DM_Weight/util/AlertMsg.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.util
+{
+    internal class AlertMsg
+    {
+        private MsgType _type = MsgType.INFO;
+        private string _message = "";
+
+        public MsgType Type { get => _type; set => _type = value; }
+        public string Message { get => _message; set => _message = value; }
+
+    }
+
+}
diff --git a/DM_Weight/util/BindingProxy.cs b/DM_Weight/util/BindingProxy.cs
new file mode 100644
index 0000000..10b858e
--- /dev/null
+++ b/DM_Weight/util/BindingProxy.cs
@@ -0,0 +1,18 @@
+using System.Windows;
+
+namespace DM_Weight.util
+{
+    public class BindingProxy : Freezable
+    {
+        protected override Freezable CreateInstanceCore() => new BindingProxy();
+
+        public object? Data
+        {
+            get => GetValue(DataProperty);
+            set => SetValue(DataProperty, value);
+        }
+
+        public static readonly DependencyProperty DataProperty =
+            DependencyProperty.Register("Data", typeof(object), typeof(BindingProxy), new UIPropertyMetadata(null));
+    }
+}
\ No newline at end of file
diff --git a/DM_Weight/util/CheckComputerFreeState.cs b/DM_Weight/util/CheckComputerFreeState.cs
new file mode 100644
index 0000000..1c3f789
--- /dev/null
+++ b/DM_Weight/util/CheckComputerFreeState.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.util
+{
+    public class CheckComputerFreeState
+    {
+        /// <summary>
+        /// 创建结构体用于返回捕获时间
+        /// </summary>
+        [StructLayout(LayoutKind.Sequential)]
+        struct LASTINPUTINFO
+        {
+            /// <summary>
+            /// 设置结构体块容量
+            /// </summary>
+            [MarshalAs(UnmanagedType.U4)]
+            public int cbSize;
+
+            /// <summary>
+            /// 抓获的时间
+            /// </summary>
+            [MarshalAs(UnmanagedType.U4)]
+            public uint dwTime;
+        }
+
+        [DllImport("user32.dll")]
+        private static extern bool GetLastInputInfo(ref LASTINPUTINFO plii);
+        /// <summary>
+        /// 获取键盘和鼠标没有操作的时间
+        /// </summary>
+        /// <returns>用户上次使用系统到现在的时间间隔，单位为秒</returns>
+        public static long GetLastInputTime()
+        {
+            LASTINPUTINFO vLastInputInfo = new LASTINPUTINFO();
+            vLastInputInfo.cbSize = Marshal.SizeOf(vLastInputInfo);
+            if (!GetLastInputInfo(ref vLastInputInfo))
+            {
+                return 0;
+            }
+            else
+            {
+                var count = (Environment.TickCount & Int32.MaxValue) - (long)vLastInputInfo.dwTime;
+                var icount = count / 1000;
+                return icount;
+            }
+        }
+    }
+}
diff --git a/DM_Weight/util/DeviceMsg.cs b/DM_Weight/util/DeviceMsg.cs
new file mode 100644
index 0000000..bd74049
--- /dev/null
+++ b/DM_Weight/util/DeviceMsg.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.util
+{
+    public class DeviceMsg
+    {
+        private string _windowName;
+        private int _drawerNo;
+        private EventType _eventType;
+        private int[] _quantitys;
+        private string code;
+        private string _message;
+
+        public string WindowName { get { return _windowName; } set { _windowName = value; } }
+        public int DrawerNo { get { return _drawerNo; } set { _drawerNo = value; } }
+        public EventType EventType { get { return _eventType; } set { _eventType = value; } }
+        public int[] Quantitys { get { return _quantitys; } set { _quantitys = value; } }
+
+        public string Code { get { return code; } set { code = value; } }
+
+        public string Message { get { return _message; } set { _message = value; } }
+    }
+
+    
+    public enum EventType
+    {
+        DRAWEROPEN = 1, DRAWERCLOSE = 2, UPDATEQUANTITY = 3, OPENERROR = 4, CODESCAN = 5
+    }
+}
diff --git a/DM_Weight/util/DialogServiceExtensions.cs b/DM_Weight/util/DialogServiceExtensions.cs
new file mode 100644
index 0000000..e320908
--- /dev/null
+++ b/DM_Weight/util/DialogServiceExtensions.cs
@@ -0,0 +1,55 @@
+using Prism.Services.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.util
+{
+    public static class DialogServiceExtensions
+    {
+        /// <summary>
+        /// Shows a modal dialog using a <see cref="MaterialDesignThemes.Wpf.DialogHost"/>.
+        /// </summary>
+        /// <param name="dialogService"></param>
+        /// <param name="name">The name of the dialog to show.</param>
+        /// <param name="parameters">The parameters to pass to the dialog.</param>
+        /// <param name="callback">The action to perform when the dialog is closed.</param>
+        /// <exception cref="NullReferenceException">Thrown when the dialog service is not a MaterialDialogService</exception>
+        public static void ShowDialogHost(this IDialogService dialogService, string name, IDialogParameters parameters, Action<IDialogResult> callback)
+        {
+            if (!(dialogService is MaterialDialogService materialDialogService))
+                throw new NullReferenceException("DialogService must be a MaterialDialogService");
+
+            materialDialogService.ShowDialogHost(name, parameters, callback);
+        }
+
+        /// <summary>
+        /// Shows a modal dialog using a <see cref="MaterialDesignThemes.Wpf.DialogHost"/>.
+        /// </summary>
+        /// <param name="dialogService"></param>
+        /// <param name="name">The name of the dialog to show.</param>
+        /// <param name="parameters">The parameters to pass to the dialog.</param>
+        /// <param name="callback">The action to perform when the dialog is closed.</param>
+        /// <param name="windowName">The name of the <see cref="MaterialDesignThemes.Wpf.DialogHost"/> that will contain the dialog control</param>
+        /// <exception cref="NullReferenceException">Thrown when the dialog service is not a MaterialDialogService</exception>
+        public static void ShowDialogHost(this IDialogService dialogService, string name,
+            IDialogParameters parameters, Action<IDialogResult> callback, string windowName)
+        {
+            if (!(dialogService is MaterialDialogService materialDialogService))
+                throw new NullReferenceException("DialogService must be a MaterialDialogService");
+
+            materialDialogService.ShowDialogHost(name, windowName, parameters, callback);
+        }
+
+
+        public static void ShowDialogHost(this IDialogService dialogService, string name, IDialogParameters parameters, string windowName)
+        {
+            if (!(dialogService is MaterialDialogService materialDialogService))
+                throw new NullReferenceException("DialogService must be a MaterialDialogService");
+
+            materialDialogService.ShowDialogHost(name, parameters, windowName);
+        }
+    }
+}
diff --git a/DM_Weight/util/FingerprintMsg.cs b/DM_Weight/util/FingerprintMsg.cs
new file mode 100644
index 0000000..9cf3ba6
--- /dev/null
+++ b/DM_Weight/util/FingerprintMsg.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.util
+{
+    public class FingerprintMsg
+    {
+        public string Message { get; set; }
+        public string Username { get; set; }
+        public string Password { get; set; }
+        public int Id { get; set; }
+        public int VerifyMethod { get; set; }
+        public string CardNumber { get; set; }
+        public int FingerIndex { get; set; }
+        public bool Result { get; set; }
+
+        public override string? ToString()
+        {
+            return $"Message: {Message}, Username: {Username}, Password: {Password}, Id: {Id}, VerifyMethod: {VerifyMethod}, CardNumber: {CardNumber}, FingerIndex: {FingerIndex}, Result: {Result}";
+        }
+    }
+}
diff --git a/DM_Weight/util/GridViewExtensions.cs b/DM_Weight/util/GridViewExtensions.cs
new file mode 100644
index 0000000..214f09e
--- /dev/null
+++ b/DM_Weight/util/GridViewExtensions.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+using System.Windows.Threading;
+using System.Windows;
+
+namespace DM_Weight.util
+{
+    public static class GridViewExtensions
+    {
+        #region IsContentCentered
+
+        [Category("Common")]
+        [AttachedPropertyBrowsableForType(typeof(GridViewColumn))]
+        public static bool GetIsContentCentered(GridViewColumn gridViewColumn)
+        {
+            return (bool)gridViewColumn.GetValue(IsContentCenteredProperty);
+        }
+        public static void SetIsContentCentered(GridViewColumn gridViewColumn, bool value)
+        {
+            gridViewColumn.SetValue(IsContentCenteredProperty, value);
+        }
+
+        public static readonly DependencyProperty IsContentCenteredProperty =
+            DependencyProperty.RegisterAttached(
+                "IsContentCentered",
+                typeof(bool), // type
+                typeof(GridViewExtensions), // containing type
+                new PropertyMetadata(default(bool), OnIsContentCenteredChanged)
+                );
+
+        private static void OnIsContentCenteredChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            OnIsContentCenteredChanged((GridViewColumn)d, (bool)e.NewValue);
+        }
+        private static void OnIsContentCenteredChanged(GridViewColumn gridViewColumn, bool isContentCentered)
+        {
+            if (isContentCentered == false) { return; }
+            // must wait a bit otherwise GridViewColumn.DisplayMemberBinding will not yet be initialized, 
+            new DispatcherTimer(TimeSpan.FromMilliseconds(100), DispatcherPriority.Normal, OnColumnLoaded, gridViewColumn.Dispatcher)
+            {
+                Tag = gridViewColumn
+            }.Start();
+        }
+
+        static void OnColumnLoaded(object sender, EventArgs e)
+        {
+            var timer = (DispatcherTimer)sender;
+            timer.Stop();
+
+            var gridViewColumn = (GridViewColumn)timer.Tag;
+            if (gridViewColumn.DisplayMemberBinding == null)
+            {
+                throw new Exception("Only allowed with DisplayMemberBinding.");
+            }
+            var textBlockFactory = new FrameworkElementFactory(typeof(TextBlock));
+            textBlockFactory.SetBinding(TextBlock.TextProperty, gridViewColumn.DisplayMemberBinding);
+            textBlockFactory.SetValue(TextBlock.TextAlignmentProperty, TextAlignment.Center);
+            var cellTemplate = new DataTemplate { VisualTree = textBlockFactory };
+            gridViewColumn.DisplayMemberBinding = null; // must null, otherwise CellTemplate won't be recognized
+            gridViewColumn.CellTemplate = cellTemplate;
+        }
+
+        #endregion IsContentCentered
+    }
+}
diff --git a/DM_Weight/util/MD5.cs b/DM_Weight/util/MD5.cs
new file mode 100644
index 0000000..2d1cdfc
--- /dev/null
+++ b/DM_Weight/util/MD5.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Security.Cryptography;
+
+namespace DM_Weight.util
+{
+    public class MD5
+    {
+        public static string GetMD5Hash(string password)
+        {
+            //就是比string往后一直加要好的优化容器
+            StringBuilder sb = new StringBuilder();
+            using (MD5CryptoServiceProvider md5 = new MD5CryptoServiceProvider())
+            {
+                //将输入字符串转换为字节数组并计算哈希。
+                byte[] data = md5.ComputeHash(Encoding.UTF8.GetBytes(password));
+
+                //X为     十六进制 X都是大写 x都为小写
+                //2为 每次都是两位数
+                //假设有两个数10和26，正常情况十六进制显示0xA、0x1A，这样看起来不整齐，为了好看，可以指定"X2"，这样显示出来就是：0x0A、0x1A。 
+                //遍历哈希数据的每个字节
+                //并将每个字符串格式化为十六进制字符串。
+                int length = data.Length;
+                for (int i = 0; i < length; i++)
+                    sb.Append(data[i].ToString("x2"));
+
+            }
+            return sb.ToString();
+        }
+    }
+}
diff --git a/DM_Weight/util/MaterialDialogService.cs b/DM_Weight/util/MaterialDialogService.cs
new file mode 100644
index 0000000..aaa756e
--- /dev/null
+++ b/DM_Weight/util/MaterialDialogService.cs
@@ -0,0 +1,159 @@
+using MaterialDesignThemes.Wpf;
+using Prism.Ioc;
+using Prism.Mvvm;
+using Prism.Services.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Interop;
+using System.Windows.Threading;
+using System.Windows;
+
+namespace DM_Weight.util
+{
+    internal class MaterialDialogService : DialogService
+    {
+        private readonly IContainerExtension _containerExtension;
+
+        public MaterialDialogService(IContainerExtension containerExtension) : base(containerExtension)
+        {
+            _containerExtension = containerExtension;
+        }
+
+        public void ShowDialogHost(string name, IDialogParameters parameters, Action<IDialogResult> callback) =>
+            ShowDialogHost(name, null, parameters, callback);
+
+        public void ShowDialogHost(string name, string dialogHostName, IDialogParameters parameters, Action<IDialogResult> callback)
+        {
+            if (parameters == null)
+                parameters = new DialogParameters();
+
+            var content = _containerExtension.Resolve<object>(name);
+            if (!(content is FrameworkElement dialogContent))
+            {
+                throw new NullReferenceException("A dialog's content must be a FrameworkElement");
+            }
+
+            AutowireViewModel(dialogContent);
+
+            if (!(dialogContent.DataContext is IDialogAware dialogAware))
+            {
+                throw new ArgumentException("A dialog's ViewModel must implement IDialogAware interface");
+            }
+
+            var openedEventHandler = new DialogOpenedEventHandler((sender, args) =>
+            {
+                dialogAware.OnDialogOpened(parameters);
+            });
+            var closedEventHandler = new DialogClosedEventHandler((sender, args) =>
+            {
+                dialogAware.OnDialogClosed();
+            });
+
+            dialogAware.RequestClose += res =>
+            {
+                if (DialogHost.IsDialogOpen(dialogHostName))
+                {
+                    callback(res);
+                    DialogHost.Close(dialogHostName);
+                }
+            };
+
+            var dispatcherFrame = new DispatcherFrame();
+            if (dialogHostName == null)
+            {
+                _ = DialogHost.Show(dialogContent, openedEventHandler, null, closedEventHandler)
+                    .ContinueWith(_ => dispatcherFrame.Continue = false); ;
+            }
+            else
+            {
+                _ = DialogHost.Show(dialogContent, dialogHostName, openedEventHandler, null, closedEventHandler)
+                    .ContinueWith(_ => dispatcherFrame.Continue = false);
+            }
+
+            try
+            {
+                // tell users we're going modal
+                ComponentDispatcher.PushModal();
+
+                Dispatcher.PushFrame(dispatcherFrame);
+            }
+            finally
+            {
+                // tell users we're going non-modal
+                ComponentDispatcher.PopModal();
+            }
+
+            dialogAware.RequestClose -= callback;
+        }
+
+        private static void AutowireViewModel(object viewOrViewModel)
+        {
+            if (viewOrViewModel is FrameworkElement view && view.DataContext is null && ViewModelLocator.GetAutoWireViewModel(view) is null)
+            {
+                ViewModelLocator.SetAutoWireViewModel(view, true);
+            }
+        }
+
+        public void ShowDialogHost(string name, IDialogParameters parameters, string dialogHostName)
+        {
+            var content = _containerExtension.Resolve<object>(name);
+            if (!(content is FrameworkElement dialogContent))
+            {
+                throw new NullReferenceException("A dialog's content must be a FrameworkElement");
+            }
+
+            AutowireViewModel(dialogContent);
+
+            if (!(dialogContent.DataContext is IDialogAware dialogAware))
+            {
+                throw new ArgumentException("A dialog's ViewModel must implement IDialogAware interface");
+            }
+
+            var openedEventHandler = new DialogOpenedEventHandler((sender, args) =>
+            {
+                dialogAware.OnDialogOpened(parameters);
+            });
+            var closedEventHandler = new DialogClosedEventHandler((sender, args) =>
+            {
+                dialogAware.OnDialogClosed();
+            });
+
+            dialogAware.RequestClose += res =>
+            {
+                if (DialogHost.IsDialogOpen(dialogHostName))
+                {
+                    DialogHost.Close(dialogHostName);
+                }
+            };
+
+            var dispatcherFrame = new DispatcherFrame();
+            if (dialogHostName == null)
+            {
+                _ = DialogHost.Show(dialogContent, openedEventHandler, null, closedEventHandler)
+                    .ContinueWith(_ => dispatcherFrame.Continue = false); ;
+            }
+            else
+            {
+                _ = DialogHost.Show(dialogContent, dialogHostName, openedEventHandler, null, closedEventHandler)
+                    .ContinueWith(_ => dispatcherFrame.Continue = false);
+            }
+
+            try
+            {
+                // tell users we're going modal
+                ComponentDispatcher.PushModal();
+
+                Dispatcher.PushFrame(dispatcherFrame);
+            }
+            finally
+            {
+                // tell users we're going non-modal
+                ComponentDispatcher.PopModal();
+            }
+
+        }
+    }
+}
diff --git a/DM_Weight/util/MsgType.cs b/DM_Weight/util/MsgType.cs
new file mode 100644
index 0000000..318b5b0
--- /dev/null
+++ b/DM_Weight/util/MsgType.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.util
+{
+    enum MsgType
+    {
+        ERROR = 1,
+        INFO = 2,
+        SUCCESS = 3,
+        WARING = 4
+    }
+}
diff --git a/DM_Weight/util/SqlSugarHelper.cs b/DM_Weight/util/SqlSugarHelper.cs
new file mode 100644
index 0000000..b9baf81
--- /dev/null
+++ b/DM_Weight/util/SqlSugarHelper.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Configuration;
+using SqlSugar;
+
+namespace DM_Weight.util
+{
+    public class SqlSugarHelper
+    {
+        public static SqlSugarScope Db = new SqlSugarScope(new ConnectionConfig()
+            {
+                
+                ConnectionString = ConfigurationManager.ConnectionStrings["database"].ToString(),
+                DbType = DbType.MySql,
+                IsAutoCloseConnection = true
+            },
+            db =>
+            {
+                db.Aop.OnLogExecuting = (sql, pars) =>
+                {
+                    Console.WriteLine(sql);
+                };
+            }
+            );
+    }
+}
\ No newline at end of file
diff --git a/DM_Weight/util/TabTip/AnimationHelper.cs b/DM_Weight/util/TabTip/AnimationHelper.cs
new file mode 100644
index 0000000..bd81c30
--- /dev/null
+++ b/DM_Weight/util/TabTip/AnimationHelper.cs
@@ -0,0 +1,328 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Windows;
+using System.Windows.Interop;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using Point = System.Windows.Point;
+
+namespace DM_Weight.util.TabTip
+{
+    internal static class AnimationHelper
+    {
+        private static readonly Dictionary<FrameworkElement, Storyboard> MoveRootVisualStoryboards = new Dictionary<FrameworkElement, Storyboard>();
+
+        private static Point GetCurrentUIElementPoint(Visual element) => element.PointToScreen(new Point(0, 0)).ToPointInLogicalUnits(element);
+
+        internal static event Action<Exception> ExceptionCatched;
+        private static Rectangle ToRectangleInLogicalUnits(this Rectangle rectangleToConvert, DependencyObject element)
+        {
+            const float logicalUnitDpi = 96.0f;
+            // ReSharper disable once AssignNullToNotNullAttribute
+            IntPtr windowHandle = new WindowInteropHelper(Window.GetWindow(element)).EnsureHandle();
+
+            using (Graphics graphics = Graphics.FromHwnd(windowHandle))
+                return Rectangle.FromLTRB(
+                    left: (int) (rectangleToConvert.Left * logicalUnitDpi / graphics.DpiX), 
+                    top: (int) (rectangleToConvert.Top * logicalUnitDpi / graphics.DpiY), 
+                    right: (int) (rectangleToConvert.Right * logicalUnitDpi / graphics.DpiX), 
+                    bottom: (int) (rectangleToConvert.Bottom * logicalUnitDpi / graphics.DpiY));
+        }
+
+        private static Point ToPointInLogicalUnits(this Point point, DependencyObject element)
+        {
+            const float logicalUnitDpi = 96.0f;
+
+            // ReSharper disable once AssignNullToNotNullAttribute
+            IntPtr windowHandle = new WindowInteropHelper(Window.GetWindow(element)).EnsureHandle();
+
+            using (Graphics graphics = Graphics.FromHwnd(windowHandle))
+                return new Point(x: point.X * logicalUnitDpi / graphics.DpiX, y: point.Y * logicalUnitDpi / graphics.DpiY);
+        }
+
+        // ReSharper disable once UnusedMember.Local
+        private static Point GetCurrentUIElementPointRelativeToRoot(UIElement element)
+        {
+            return element.TransformToAncestor(GetRootVisualForAnimation(element)).Transform(new Point(0, 0));
+        }
+
+        private static Rectangle GetUIElementRect(UIElement element)
+        {
+            Rect rect = element.RenderTransform.TransformBounds(new Rect(GetCurrentUIElementPoint(element), element.RenderSize));
+
+            return Rectangle.FromLTRB(
+                left: (int)rect.Left,
+                top: (int)rect.Top,
+                right: (int)rect.Right,
+                bottom: (int)rect.Bottom);
+        }
+
+        private static Rectangle GetCurrentScreenBounds(DependencyObject element) => 
+            new Screen(Window.GetWindow(element)).Bounds.ToRectangleInLogicalUnits(element);
+
+        private static Rectangle GetWorkAreaWithTabTipOpened(DependencyObject element)
+        {
+            Rectangle workAreaWithTabTipClosed = GetWorkAreaWithTabTipClosed(element);
+
+            int tabTipRectangleTop = TabTip.GetWouldBeTabTipRectangle().ToRectangleInLogicalUnits(element).Top;
+
+            int bottom = (tabTipRectangleTop == 0) ? workAreaWithTabTipClosed.Bottom / 2 : tabTipRectangleTop; // in case TabTip is not yet opened
+
+            return Rectangle.FromLTRB(
+                left: workAreaWithTabTipClosed.Left,
+                top: workAreaWithTabTipClosed.Top,
+                right: workAreaWithTabTipClosed.Right,
+                bottom: bottom);
+        }
+
+        private static Rectangle GetWorkAreaWithTabTipClosed(DependencyObject element)
+        {
+            Rectangle currentScreenBounds = GetCurrentScreenBounds(element);
+            Taskbar taskbar = new Taskbar();
+            Rectangle taskbarBounds = taskbar.Bounds.ToRectangleInLogicalUnits(element);
+
+            switch (taskbar.Position)
+            {
+                case TaskbarPosition.Bottom:
+                    return Rectangle.FromLTRB(
+                        left: currentScreenBounds.Left,
+                        top: currentScreenBounds.Top,
+                        right: currentScreenBounds.Right,
+                        bottom: taskbarBounds.Top);
+                case TaskbarPosition.Top:
+                    return Rectangle.FromLTRB(
+                        left: currentScreenBounds.Left, 
+                        top: taskbarBounds.Bottom, 
+                        right: currentScreenBounds.Right, 
+                        bottom: currentScreenBounds.Bottom);
+                default:
+                    return currentScreenBounds;
+            }
+        }
+
+        // ReSharper disable once UnusedMember.Local
+        private static bool IsUIElementInWorkAreaWithTabTipOpened(UIElement element)
+        {
+            return GetWorkAreaWithTabTipOpened(element).Contains(GetUIElementRect(element));
+        }
+
+        // ReSharper disable once UnusedMember.Local
+        private static bool IsUIElementInWorkArea(UIElement element, Rectangle workAreaRectangle)
+        {
+            return workAreaRectangle.Contains(GetUIElementRect(element));
+        }
+
+        private static FrameworkElement GetRootVisualForAnimation(DependencyObject element)
+        {
+            Window rootWindow = Window.GetWindow(element);
+
+            if (rootWindow?.WindowState != WindowState.Maximized)
+                return rootWindow;
+            else
+                return VisualTreeHelper.GetChild(rootWindow, 0) as FrameworkElement;
+        }
+
+        private static double GetYOffsetToMoveUIElementInToWorkArea(Rectangle uiElementRectangle, Rectangle workAreaRectangle)
+        {
+            const double noOffset = 0;
+            const int paddingTop = 30;
+            const int paddingBottom = 10;
+
+            if (uiElementRectangle.Top >= workAreaRectangle.Top &&
+                uiElementRectangle.Bottom <= workAreaRectangle.Bottom)                             // UIElement is in work area
+                return noOffset;
+
+            if (uiElementRectangle.Top < workAreaRectangle.Top)                                    // Top of UIElement higher than work area
+                return workAreaRectangle.Top - uiElementRectangle.Top + paddingTop;                // positive value to move down
+            else                                                                                   // Botom of UIElement lower than work area
+            {
+                int offset = workAreaRectangle.Bottom - uiElementRectangle.Bottom - paddingBottom; // negative value to move up
+                if (uiElementRectangle.Top > (workAreaRectangle.Top - offset))                     // will Top of UIElement be in work area if offset applied?
+                    return offset;                                                                 // negative value to move up
+                else
+                    return workAreaRectangle.Top - uiElementRectangle.Top + paddingTop;            // negative value to move up, but only to the point, where top 
+                                                                                                   // of UIElement is just below top bound of work area
+            }
+        }
+
+        private static Storyboard GetOrCreateMoveRootVisualStoryboard(FrameworkElement visualRoot)
+        {
+            if (MoveRootVisualStoryboards.ContainsKey(visualRoot))
+                return MoveRootVisualStoryboards[visualRoot];
+            else
+                return CreateMoveRootVisualStoryboard(visualRoot);
+        }
+
+        private static Storyboard CreateMoveRootVisualStoryboard(FrameworkElement visualRoot)
+        {
+            Storyboard moveRootVisualStoryboard = new Storyboard
+            {
+                Duration = new Duration(TimeSpan.FromSeconds(0.35))
+            };
+
+            DoubleAnimation moveAnimation = new DoubleAnimation
+            {
+                EasingFunction = new CircleEase {EasingMode = EasingMode.EaseOut},
+                Duration = new Duration(TimeSpan.FromSeconds(0.35)),
+                FillBehavior = (visualRoot is Window) ? FillBehavior.Stop : FillBehavior.HoldEnd
+            };
+
+            moveRootVisualStoryboard.Children.Add(moveAnimation);
+
+            if (!(visualRoot is Window))
+                visualRoot.RenderTransform = new TranslateTransform();
+
+            Storyboard.SetTarget(moveAnimation, visualRoot);
+            Storyboard.SetTargetProperty(
+                element: moveAnimation,
+                path: (visualRoot is Window) ? new PropertyPath("Top") : new PropertyPath("(UIElement.RenderTransform).(TranslateTransform.Y)"));
+
+            MoveRootVisualStoryboards.Add(visualRoot, moveRootVisualStoryboard);
+            SubscribeToWindowStateChangedToMoveRootVisual(visualRoot);
+
+            return moveRootVisualStoryboard;
+        }
+
+        private static void SubscribeToWindowStateChangedToMoveRootVisual(FrameworkElement visualRoot)
+        {
+            // ReSharper disable once CanBeReplacedWithTryCastAndCheckForNull
+            if (visualRoot is Window)
+            {
+                Window window = (Window)visualRoot;
+
+                window.StateChanged += (sender, args) =>
+                {
+                    if (window.WindowState == WindowState.Normal)
+                        MoveRootVisualBy(
+                            rootVisual: window,
+                            moveBy: GetYOffsetToMoveUIElementInToWorkArea(
+                                uiElementRectangle: GetWindowRectangle(window),
+                                workAreaRectangle: GetWorkAreaWithTabTipClosed(window)));
+                };
+            }
+            else
+            {
+                Window window = Window.GetWindow(visualRoot);
+                if (window != null)
+                    window.StateChanged += (sender, args) =>
+                    {
+                        if (window.WindowState == WindowState.Normal)
+                            MoveRootVisualTo(visualRoot, 0);
+                    };
+            }
+        }
+
+        private static void MoveRootVisualBy(FrameworkElement rootVisual, double moveBy)
+        {
+            if (moveBy == 0)
+                return;
+
+            Storyboard moveRootVisualStoryboard = GetOrCreateMoveRootVisualStoryboard(rootVisual);
+
+            DoubleAnimation doubleAnimation = moveRootVisualStoryboard.Children.First() as DoubleAnimation;
+
+            if (doubleAnimation != null)
+            {
+                Window window = rootVisual as Window;
+                if (window != null)
+                {
+                    doubleAnimation.From = window.Top;
+                    doubleAnimation.To = window.Top + moveBy;
+                }
+                else
+                {
+                    doubleAnimation.From = doubleAnimation.To ?? 0;
+                    doubleAnimation.To = (doubleAnimation.To ?? 0) + moveBy;
+                }
+            }
+
+            moveRootVisualStoryboard.Begin();
+        }
+
+        private static void MoveRootVisualTo(FrameworkElement rootVisual, double moveTo)
+        {
+            Storyboard moveRootVisualStoryboard = GetOrCreateMoveRootVisualStoryboard(rootVisual);
+
+            DoubleAnimation doubleAnimation = moveRootVisualStoryboard.Children.First() as DoubleAnimation;
+
+            if (doubleAnimation != null)
+            {
+                Window window = rootVisual as Window;
+                if (window != null)
+                {
+                    doubleAnimation.From = window.Top;
+                    doubleAnimation.To = moveTo;
+                }
+                else
+                {
+                    doubleAnimation.From = doubleAnimation.To ?? 0;
+                    doubleAnimation.To = moveTo;
+                }
+            }
+
+            moveRootVisualStoryboard.Begin();
+        }
+
+        internal static void GetUIElementInToWorkAreaWithTabTipOpened(UIElement element)
+        {
+            try
+            {
+                FrameworkElement rootVisualForAnimation = GetRootVisualForAnimation(element);
+                Rectangle workAreaWithTabTipOpened = GetWorkAreaWithTabTipOpened(element);
+
+                Rectangle uiElementRectangle;
+                Window window = rootVisualForAnimation as Window;
+                if (window != null && workAreaWithTabTipOpened.Height >= window.Height)
+                    uiElementRectangle = GetWindowRectangle(window);
+                else
+                    uiElementRectangle = GetUIElementRect(element);
+
+                MoveRootVisualBy(
+                    rootVisual: rootVisualForAnimation,
+                    moveBy: GetYOffsetToMoveUIElementInToWorkArea(
+                        uiElementRectangle: uiElementRectangle,
+                        workAreaRectangle: workAreaWithTabTipOpened));
+            }
+            catch (Exception ex)
+            {
+                ExceptionCatched?.Invoke(ex);
+            }
+        }
+
+        private static Rectangle GetWindowRectangle(Window window)
+        {
+            return Rectangle.FromLTRB(
+                left: (int)window.Left, 
+                top: (int)window.Top, 
+                right: (int)(window.Left + window.Width), 
+                bottom: (int)(window.Top + window.Height));
+        }
+
+        internal static void GetEverythingInToWorkAreaWithTabTipClosed()
+        {
+            try
+            {
+                foreach (KeyValuePair<FrameworkElement, Storyboard> moveRootVisualStoryboard in MoveRootVisualStoryboards)
+                {
+                    Window window = moveRootVisualStoryboard.Key as Window;
+                    // if window exist also check if it has not been closed
+                    if (window != null && new WindowInteropHelper(window).Handle != IntPtr.Zero)
+                        MoveRootVisualBy(
+                            rootVisual: window,
+                            moveBy: GetYOffsetToMoveUIElementInToWorkArea(
+                                uiElementRectangle: GetWindowRectangle(window),
+                                workAreaRectangle: GetWorkAreaWithTabTipClosed(window)));
+                    else
+                        MoveRootVisualTo(rootVisual: moveRootVisualStoryboard.Key, moveTo: 0);
+                }
+            }
+            catch (Exception ex)
+            {
+                ExceptionCatched?.Invoke(ex);
+            }
+        } 
+
+    }
+}
diff --git a/DM_Weight/util/TabTip/EnvironmentEx.cs b/DM_Weight/util/TabTip/EnvironmentEx.cs
new file mode 100644
index 0000000..49839d9
--- /dev/null
+++ b/DM_Weight/util/TabTip/EnvironmentEx.cs
@@ -0,0 +1,40 @@
+using Microsoft.Win32;
+
+namespace DM_Weight.util.TabTip
+{
+    internal enum OSVersion
+    {
+        Undefined,
+        Win7,
+        Win8Or81,
+        Win10
+    }
+    internal static class EnvironmentEx
+    {
+        private static OSVersion OSVersion = OSVersion.Undefined;
+
+        internal static OSVersion GetOSVersion()
+        {
+            if (OSVersion != OSVersion.Undefined)
+                return OSVersion;
+
+            string OSName = GetOSName();
+
+            if (OSName.Contains("7"))
+                OSVersion = OSVersion.Win7;
+            else if (OSName.Contains("8"))
+                OSVersion = OSVersion.Win8Or81;
+            else if (OSName.Contains("10"))
+                OSVersion = OSVersion.Win10;
+
+            return OSVersion;
+        }
+
+        private static string GetOSName()
+        {
+            RegistryKey rk = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion");
+            if (rk == null) return "";
+            return (string) rk.GetValue("ProductName");
+        }
+    }
+}
diff --git a/DM_Weight/util/TabTip/HardwareKeyboard.cs b/DM_Weight/util/TabTip/HardwareKeyboard.cs
new file mode 100644
index 0000000..ce6c567
--- /dev/null
+++ b/DM_Weight/util/TabTip/HardwareKeyboard.cs
@@ -0,0 +1,111 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Management;
+using System.Threading.Tasks;
+
+namespace DM_Weight.util.TabTip
+{
+    public enum HardwareKeyboardIgnoreOptions
+    {
+        /// <summary>
+        /// Do not ignore any keyboard.
+        /// </summary>
+        DoNotIgnore,
+
+        /// <summary>
+        /// Ignore keyboard, if there is only one, and it's description 
+        /// can be found in ListOfKeyboardsToIgnore.
+        /// </summary>
+        IgnoreIfSingleInstanceOnList,
+
+        /// <summary>
+        /// Ignore keyboard, if there is only one.
+        /// </summary>
+        IgnoreIfSingleInstance,
+
+        /// <summary>
+        /// Ignore all keyboards for which the description 
+        /// can be found in ListOfKeyboardsToIgnore
+        /// </summary>
+        IgnoreIfOnList,
+
+        /// <summary>
+        /// Ignore all keyboards
+        /// </summary>
+        IgnoreAll
+    }
+
+    internal static class HardwareKeyboard
+    {
+        private static bool? _isConnected;
+
+        /// <summary>
+        /// Checks if Hardware Keyboard is Connected
+        /// </summary>
+        /// <returns></returns>
+        internal static async Task<bool> IsConnectedAsync()
+        {
+            Task<bool> KeyboardConnectedCheckTask = Task.Run(() =>
+            {
+                SelectQuery SelectKeyboardsQuery = new SelectQuery("Win32_Keyboard");
+                using (ManagementObjectSearcher Searcher = new ManagementObjectSearcher(SelectKeyboardsQuery))
+                using (ManagementObjectCollection Keyboards = Searcher.Get())
+                {
+                    if (Keyboards.Count == 0)
+                        return false;
+
+                    switch (IgnoreOptions)
+                    {
+                        case HardwareKeyboardIgnoreOptions.IgnoreAll:
+                            return false;
+
+                        case HardwareKeyboardIgnoreOptions.DoNotIgnore:
+                            return Keyboards.Count > 0;
+
+                        case HardwareKeyboardIgnoreOptions.IgnoreIfSingleInstance:
+                            return Keyboards.Count > 1;
+
+                        case HardwareKeyboardIgnoreOptions.IgnoreIfSingleInstanceOnList:
+                            return (Keyboards.Count > 1) ||
+                                   (Keyboards.Count == 1 &&
+                                    !IsIgnoredKeyboard(Keyboards.Cast<ManagementBaseObject>().First()));
+
+                        case HardwareKeyboardIgnoreOptions.IgnoreIfOnList:
+                            return Keyboards.Cast<ManagementBaseObject>().Any(k => !IsIgnoredKeyboard(k));
+
+                        default:
+                            return true;
+                    }
+                }
+            });
+
+#pragma warning disable 4014
+            KeyboardConnectedCheckTask.ContinueWith(t => _isConnected = t.Result);
+#pragma warning restore 4014
+
+            if (_isConnected != null)
+                return _isConnected.Value;
+            else
+                return await KeyboardConnectedCheckTask;
+        }
+
+        private static bool IsIgnoredKeyboard(ManagementBaseObject keyboard)
+        {
+            string description = keyboard.Properties.Cast<PropertyData>()
+                .Where(k => k.Name == "Description")
+                .Select(k => k.Value)
+                .First()
+                .ToString();
+
+            return ListOfKeyboardsToIgnore.Contains(description);
+        }
+
+        internal static HardwareKeyboardIgnoreOptions IgnoreOptions = HardwareKeyboardIgnoreOptions.DoNotIgnore;
+
+        /// <summary>
+        /// Description of keyboards to ignore if there is only one instance of given keyboard.
+        /// If you want to ignore some ghost keyboard, add it's description to this list
+        /// </summary>
+        internal static List<string> ListOfKeyboardsToIgnore { get; } = new List<string>();
+    }
+}
diff --git a/DM_Weight/util/TabTip/PoolingTimer.cs b/DM_Weight/util/TabTip/PoolingTimer.cs
new file mode 100644
index 0000000..5e7e137
--- /dev/null
+++ b/DM_Weight/util/TabTip/PoolingTimer.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Reactive.Linq;
+
+namespace DM_Weight.util.TabTip
+{
+    internal static class PoolingTimer
+    {
+        private static bool Pooling;
+
+        internal static void PoolUntilTrue(Func<bool> PoolingFunc, Action Callback, TimeSpan dueTime, TimeSpan period)
+        {
+            if (Pooling) return;
+
+            Pooling = true;
+
+            Observable.Timer(dueTime, period)
+                .Select(_ => PoolingFunc())
+                .TakeWhile(stop => stop != true)
+                .Where(stop => stop == true)
+                .Finally(() => Pooling = false)
+                .Subscribe(
+                    onNext: _ => { },
+                    onCompleted: Callback);
+        }
+    }
+}
diff --git a/DM_Weight/util/TabTip/Screen.cs b/DM_Weight/util/TabTip/Screen.cs
new file mode 100644
index 0000000..c92c0d6
--- /dev/null
+++ b/DM_Weight/util/TabTip/Screen.cs
@@ -0,0 +1,101 @@
+using System;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Windows;
+using System.Windows.Interop;
+
+namespace DM_Weight.util.TabTip
+{
+    internal class Screen
+    {
+
+        public Rectangle Bounds { get; }
+
+        public Screen(Window window)
+        {
+            IntPtr windowHandle = window != null ? new WindowInteropHelper(window).Handle : IntPtr.Zero;
+
+            IntPtr monitor = window != null ? NativeMethods.MonitorFromWindow(windowHandle, NativeMethods.MONITOR_DEFAULTTONEAREST) : NativeMethods.MonitorFromPoint(new NativeMethods.POINT(0, 0), NativeMethods.MonitorOptions.MONITOR_DEFAULTTOPRIMARY);
+
+            NativeMethods.NativeMonitorInfo monitorInfo = new NativeMethods.NativeMonitorInfo();
+            NativeMethods.GetMonitorInfo(monitor, monitorInfo);
+
+            Bounds = Rectangle.FromLTRB(monitorInfo.Monitor.Left, monitorInfo.Monitor.Top, monitorInfo.Monitor.Right, monitorInfo.Monitor.Bottom);
+
+        }
+
+        private static class NativeMethods
+        {
+            public const Int32 MONITOR_DEFAULTTONEAREST = 0x00000002;
+
+
+            [DllImport("user32.dll")]
+            public static extern IntPtr MonitorFromWindow(IntPtr handle, Int32 flags);
+
+
+            [DllImport("user32.dll")]
+            public static extern bool GetMonitorInfo(IntPtr hMonitor, NativeMonitorInfo lpmi);
+
+
+            [Serializable, StructLayout(LayoutKind.Sequential)]
+            public struct NativeRectangle
+            {
+                public readonly int Left;
+                public readonly int Top;
+                public readonly int Right;
+                public readonly int Bottom;
+            }
+
+            [StructLayout(LayoutKind.Sequential)]
+            public struct POINT
+            {
+                public int X;
+                public int Y;
+
+                public POINT(int x, int y)
+                {
+                    this.X = x;
+                    this.Y = y;
+                }
+
+                public POINT(System.Drawing.Point pt) : this(pt.X, pt.Y) { }
+
+                public static implicit operator System.Drawing.Point(POINT p)
+                {
+                    return new System.Drawing.Point(p.X, p.Y);
+                }
+
+                public static implicit operator POINT(System.Drawing.Point p)
+                {
+                    return new POINT(p.X, p.Y);
+                }
+            }
+
+            [DllImport("user32.dll", SetLastError = true)]
+            internal static extern IntPtr MonitorFromPoint(POINT pt, MonitorOptions dwFlags);
+
+            internal enum MonitorOptions : uint
+            {
+                MONITOR_DEFAULTTONULL = 0x00000000,
+                MONITOR_DEFAULTTOPRIMARY = 0x00000001,
+                MONITOR_DEFAULTTONEAREST = 0x00000002
+            }
+
+#pragma warning disable 169
+
+            [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+            public sealed class NativeMonitorInfo
+            {
+                // ReSharper disable once UnusedMember.Local
+                public Int32 Size = Marshal.SizeOf(typeof(NativeMonitorInfo));
+#pragma warning disable 649
+                public NativeRectangle Monitor;
+#pragma warning restore 649
+                public NativeRectangle Work;
+                public Int32 Flags;
+            }
+#pragma warning restore 169
+
+        }
+    }
+}
diff --git a/DM_Weight/util/TabTip/TabTip.cs b/DM_Weight/util/TabTip/TabTip.cs
new file mode 100644
index 0000000..32ea9b0
--- /dev/null
+++ b/DM_Weight/util/TabTip/TabTip.cs
@@ -0,0 +1,166 @@
+using System;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Threading.Tasks;
+using Microsoft.Win32;
+
+namespace DM_Weight.util.TabTip
+{
+    public static class TabTip
+    {
+        private const string TabTipWindowClassName = "IPTip_Main_Window";
+        private const string TabTipExecPath = @"C:\Program Files\Common Files\microsoft shared\ink\TabTip.exe";
+        private const string TabTipRegistryKeyName = @"HKEY_CURRENT_USER\Software\Microsoft\TabletTip\1.7";
+
+        [DllImport("user32.dll")]
+        private static extern int SendMessage(int hWnd, uint msg, int wParam, int lParam);
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr FindWindow(String sClassName, String sAppName);
+
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool GetWindowRect(HandleRef hWnd, out RECT lpRect);
+
+        [StructLayout(LayoutKind.Sequential)]
+        private struct RECT
+        {
+            public readonly int Left;        // x position of upper-left corner
+            public readonly int Top;         // y position of upper-left corner
+            public readonly int Right;       // x position of lower-right corner
+            public readonly int Bottom;      // y position of lower-right corner
+        }
+
+        [DllImport("user32.dll", SetLastError = true)]
+        private static extern UInt32 GetWindowLong(IntPtr hWnd, int nIndex);
+
+        /// <summary>
+        /// Signals that TabTip was closed after it was opened 
+        /// with a call to StartPoolingForTabTipClosedEvent method
+        /// </summary>
+        internal static event Action Closed;
+
+        private static IntPtr GetTabTipWindowHandle() => FindWindow(TabTipWindowClassName, null);
+        
+        internal static void OpenUndockedAndStartPoolingForClosedEvent()
+        {
+            OpenUndocked();
+            StartPoolingForTabTipClosedEvent();
+        }
+
+        /// <summary>
+        /// Open TabTip
+        /// </summary>
+        public static void Open()
+        {
+            if (EnvironmentEx.GetOSVersion() == OSVersion.Win10)
+                EnableTabTipOpenInDesctopModeOnWin10();
+
+            Process.Start(new ProcessStartInfo(TabTipExecPath) { UseShellExecute = true});
+        }
+
+        private static void EnableTabTipOpenInDesctopModeOnWin10()
+        {
+            const string TabTipAutoInvokeKey = "EnableDesktopModeAutoInvoke";
+
+            int EnableDesktopModeAutoInvoke = (int) (Registry.GetValue(TabTipRegistryKeyName, TabTipAutoInvokeKey, -1) ?? -1);
+            if (EnableDesktopModeAutoInvoke != 1)
+                Registry.SetValue(TabTipRegistryKeyName, TabTipAutoInvokeKey, 1);
+        }
+
+        /// <summary>
+        /// Open TabTip in undocked state
+        /// </summary>
+        public static void OpenUndocked()
+        {
+            const string TabTipDockedKey = "EdgeTargetDockedState";
+            const string TabTipProcessName = "TabTip";
+
+            int docked = (int) (Registry.GetValue(TabTipRegistryKeyName, TabTipDockedKey, 1) ?? 1);
+            if (docked == 1)
+            {
+                Registry.SetValue(TabTipRegistryKeyName, TabTipDockedKey, 0);
+                foreach (Process tabTipProcess in Process.GetProcessesByName(TabTipProcessName))
+                    tabTipProcess.Kill();
+            }
+            Open();
+        }
+
+        /// <summary>
+        /// Close TabTip
+        /// </summary>
+        public static void Close()
+        {
+            const int WM_SYSCOMMAND = 274;
+            const int SC_CLOSE = 61536;
+            SendMessage(GetTabTipWindowHandle().ToInt32(), WM_SYSCOMMAND, SC_CLOSE, 0);
+        }
+
+        private static void StartPoolingForTabTipClosedEvent()
+        {
+            PoolingTimer.PoolUntilTrue(
+                PoolingFunc: TabTipClosed,
+                Callback: () => Closed?.Invoke(),
+                dueTime: TimeSpan.FromMilliseconds(700),
+                period: TimeSpan.FromMilliseconds(50));
+        }
+
+        private static bool TabTipClosed()
+        {
+            const int GWL_STYLE = -16; // Specifies we wish to retrieve window styles.
+            const uint KeyboardClosedStyle = 2617245696;
+            IntPtr KeyboardWnd = GetTabTipWindowHandle();
+            return (KeyboardWnd.ToInt32() == 0 || GetWindowLong(KeyboardWnd, GWL_STYLE) == KeyboardClosedStyle);
+        }
+
+        // ReSharper disable once UnusedMember.Local
+        private static bool IsTabTipProcessRunning => GetTabTipWindowHandle() != IntPtr.Zero;
+
+        /// <summary>
+        /// Gets TabTip Window Rectangle
+        /// </summary>
+        /// <returns></returns>
+        [SuppressMessage("ReSharper", "ConvertIfStatementToReturnStatement")]
+        public static Rectangle GetTabTipRectangle()
+        {
+            if (TabTipClosed())
+                return new Rectangle();
+
+            return GetWouldBeTabTipRectangle();
+        }
+
+        private static Rectangle previousTabTipRectangle;
+
+        /// <summary>
+        /// Gets Window Rectangle which would be occupied by TabTip if TabTip was opened.
+        /// </summary>
+        /// <returns></returns>
+        [SuppressMessage("ReSharper", "ConvertIfStatementToReturnStatement")]
+        internal static Rectangle GetWouldBeTabTipRectangle()
+        {
+            RECT rect;
+
+            if (!GetWindowRect(new HandleRef(null, GetTabTipWindowHandle()), out rect))
+            {
+                if (previousTabTipRectangle.Equals(new Rectangle())) //in case TabTip was closed and previousTabTipRectangle was not set
+                    Task.Delay(TimeSpan.FromSeconds(1)).ContinueWith(TryGetTabTipRectangleToСache);
+
+                return previousTabTipRectangle;
+            }
+
+            Rectangle wouldBeTabTipRectangle = new Rectangle(x: rect.Left, y: rect.Top, width: rect.Right - rect.Left + 1, height: rect.Bottom - rect.Top + 1);
+            previousTabTipRectangle = wouldBeTabTipRectangle;
+
+            return wouldBeTabTipRectangle;
+        }
+
+        private static void TryGetTabTipRectangleToСache(Task task)
+        {
+            RECT rect;
+            if (GetWindowRect(new HandleRef(null, GetTabTipWindowHandle()), out rect))
+                previousTabTipRectangle = new Rectangle(x: rect.Left, y: rect.Top, width: rect.Right - rect.Left + 1, height: rect.Bottom - rect.Top + 1);
+        }
+    }
+}
diff --git a/DM_Weight/util/TabTip/TabTipAutomation.cs b/DM_Weight/util/TabTip/TabTipAutomation.cs
new file mode 100644
index 0000000..fef867e
--- /dev/null
+++ b/DM_Weight/util/TabTip/TabTipAutomation.cs
@@ -0,0 +1,121 @@
+using System;
+using System.Collections.Generic;
+using System.Reactive.Concurrency;
+using System.Reactive.Linq;
+using System.Reactive.Subjects;
+using System.Windows;
+
+namespace DM_Weight.util.TabTip
+{
+    public static class TabTipAutomation
+    {
+        static TabTipAutomation()
+        {
+            if (EnvironmentEx.GetOSVersion() == OSVersion.Win7)
+                return;
+
+            TabTip.Closed += () => TabTipClosedSubject.OnNext(true);
+
+            AutomateTabTipOpen(FocusSubject.AsObservable());
+            AutomateTabTipClose(FocusSubject.AsObservable(), TabTipClosedSubject);
+
+            AnimationHelper.ExceptionCatched += exception => ExceptionCatched?.Invoke(exception);
+        }
+
+        private static readonly Subject<Tuple<UIElement, bool>> FocusSubject = new Subject<Tuple<UIElement, bool>>();
+        private static readonly Subject<bool> TabTipClosedSubject = new Subject<bool>();
+
+        private static readonly List<Type> BindedUIElements = new List<Type>();
+
+        /// <summary>
+        /// By default TabTip automation happens only when no keyboard is connected to device.
+        /// Change IgnoreHardwareKeyboard if you want to automate
+        /// TabTip even if keyboard is connected.
+        /// </summary>
+        public static HardwareKeyboardIgnoreOptions IgnoreHardwareKeyboard
+        {
+            get { return HardwareKeyboard.IgnoreOptions; }
+            set { HardwareKeyboard.IgnoreOptions = value; } 
+        }
+      
+        /// <summary>
+        /// Subscribe to this event if you want to know about exceptions (errors) in this library
+        /// </summary>
+        public static event Action<Exception> ExceptionCatched;
+      
+        /// <summary>
+        /// Description of keyboards to ignore if there is only one instance of given keyboard.
+        /// If you want to ignore some ghost keyboard, add it's description to this list
+        /// </summary>
+        public static List<string> ListOfHardwareKeyboardsToIgnoreIfSingleInstance => HardwareKeyboard.ListOfKeyboardsToIgnore;
+
+        /// <summary>
+        /// Description of keyboards to ignore.
+        /// If you want to ignore some ghost keyboard, add it's description to this list
+        /// </summary>
+        public static List<string> ListOfKeyboardsToIgnore => HardwareKeyboard.ListOfKeyboardsToIgnore;
+
+        private static void AutomateTabTipClose(IObservable<Tuple<UIElement, bool>> focusObservable, Subject<bool> tabTipClosedSubject)
+        {
+            focusObservable
+                .ObserveOn(Scheduler.Default)
+                .Where(_ => IgnoreHardwareKeyboard == HardwareKeyboardIgnoreOptions.IgnoreAll || !HardwareKeyboard.IsConnectedAsync().Result)
+                .Throttle(TimeSpan.FromMilliseconds(100)) // Close only if no other UIElement got focus in 100 ms
+                .Where(tuple => tuple.Item2 == false)
+                .Do(_ => TabTip.Close())
+                .Subscribe(_ => tabTipClosedSubject.OnNext(true));
+
+            tabTipClosedSubject
+                .Subscribe(_ => AnimationHelper.GetEverythingInToWorkAreaWithTabTipClosed());
+        }
+
+        private static void AutomateTabTipOpen(IObservable<Tuple<UIElement, bool>> focusObservable)
+        {
+            focusObservable
+                .ObserveOn(Scheduler.Default)
+                .Where(_ => IgnoreHardwareKeyboard == HardwareKeyboardIgnoreOptions.IgnoreAll || !HardwareKeyboard.IsConnectedAsync().Result)
+                .Where(tuple => tuple.Item2 == true)
+                .Do(_ => TabTip.OpenUndockedAndStartPoolingForClosedEvent())
+                .Subscribe(tuple => AnimationHelper.GetUIElementInToWorkAreaWithTabTipOpened(tuple.Item1));
+        }
+
+        /// <summary>
+        /// Automate TabTip for given UIElement.
+        /// Keyboard opens on GotFocusEvent or TouchDownEvent (if focused already) 
+        /// and closes on LostFocusEvent.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        public static void BindTo<T>() where T : UIElement
+        {
+            if (EnvironmentEx.GetOSVersion() == OSVersion.Win7)
+                return;
+
+            if (BindedUIElements.Contains(typeof(T)))
+                return;
+
+            EventManager.RegisterClassHandler(
+                classType: typeof(T),
+                routedEvent: UIElement.TouchDownEvent,
+                handler: new RoutedEventHandler((s, e) =>
+                {
+                    if (((UIElement)s).IsFocused)
+                        FocusSubject.OnNext(new Tuple<UIElement, bool>((UIElement)s, true));
+                }),
+                handledEventsToo: true);
+
+            EventManager.RegisterClassHandler(
+                classType: typeof(T), 
+                routedEvent: UIElement.GotFocusEvent, 
+                handler: new RoutedEventHandler((s, e) => FocusSubject.OnNext(new Tuple<UIElement, bool>((UIElement) s, true))), 
+                handledEventsToo: true);
+
+            EventManager.RegisterClassHandler(
+                classType: typeof(T), 
+                routedEvent: UIElement.LostFocusEvent, 
+                handler: new RoutedEventHandler((s, e) => FocusSubject.OnNext(new Tuple<UIElement, bool>((UIElement) s, false))), 
+                handledEventsToo: true);
+
+            BindedUIElements.Add(typeof(T));
+        }
+    }
+}
diff --git a/DM_Weight/util/TabTip/Taskbar.cs b/DM_Weight/util/TabTip/Taskbar.cs
new file mode 100644
index 0000000..f5950c7
--- /dev/null
+++ b/DM_Weight/util/TabTip/Taskbar.cs
@@ -0,0 +1,132 @@
+using System;
+using System.Drawing;
+using System.Runtime.InteropServices;
+
+namespace DM_Weight.util.TabTip
+{
+    internal enum TaskbarPosition
+    {
+        Unknown = -1,
+        Left,
+        Top,
+        Right,
+        Bottom,
+    }
+
+    internal sealed class Taskbar
+    {
+        private const string ClassName = "Shell_TrayWnd";
+
+        public Rectangle Bounds { get; }
+
+        public TaskbarPosition Position
+        {
+            get;
+            private set;
+        }
+
+        public Point Location => Bounds.Location;
+
+        public Size Size => Bounds.Size;
+        
+        //Always returns false under Windows 7
+        public bool AlwaysOnTop
+        {
+            get;
+            private set;
+        }
+        public bool AutoHide
+        {
+            get;
+            private set;
+        }
+
+        public Taskbar()
+        {
+            IntPtr taskbarHandle = User32.FindWindow(ClassName, null);
+
+            APPBARDATA data = new APPBARDATA
+            {
+                cbSize = (uint) Marshal.SizeOf(typeof (APPBARDATA)),
+                hWnd = taskbarHandle
+            };
+            IntPtr result = Shell32.SHAppBarMessage(ABM.GetTaskbarPos, ref data);
+            if (result != IntPtr.Zero)
+            {
+                Position = (TaskbarPosition) data.uEdge;
+                Bounds = Rectangle.FromLTRB(data.rc.left, data.rc.top, data.rc.right, data.rc.bottom);
+
+                data.cbSize = (uint) Marshal.SizeOf(typeof(APPBARDATA));
+                result = Shell32.SHAppBarMessage(ABM.GetState, ref data);
+                int state = result.ToInt32();
+                AlwaysOnTop = (state & ABS.AlwaysOnTop) == ABS.AlwaysOnTop;
+                AutoHide = (state & ABS.Autohide) == ABS.Autohide;
+            }
+            else
+            {
+                Position = TaskbarPosition.Unknown;
+            }
+        }
+
+        private enum ABM : uint
+        {
+            New = 0x00000000,
+            Remove = 0x00000001,
+            QueryPos = 0x00000002,
+            SetPos = 0x00000003,
+            GetState = 0x00000004,
+            GetTaskbarPos = 0x00000005,
+            Activate = 0x00000006,
+            GetAutoHideBar = 0x00000007,
+            SetAutoHideBar = 0x00000008,
+            WindowPosChanged = 0x00000009,
+            SetState = 0x0000000A,
+        }
+
+        private enum ABE : uint
+        {
+            Left = 0,
+            Top = 1,
+            Right = 2,
+            Bottom = 3
+        }
+
+        private static class ABS
+        {
+            public const int Autohide = 0x0000001;
+            public const int AlwaysOnTop = 0x0000002;
+        }
+
+        private static class Shell32
+        {
+            [DllImport("shell32.dll", SetLastError = true)]
+            public static extern IntPtr SHAppBarMessage(ABM dwMessage, [In] ref APPBARDATA pData);
+        }
+
+        private static class User32
+        {
+            [DllImport("user32.dll", SetLastError = true)]
+            public static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        private struct APPBARDATA
+        {
+            public uint cbSize;
+            public IntPtr hWnd;
+            public uint uCallbackMessage;
+            public ABE uEdge;
+            public RECT rc;
+            public int lParam;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        private struct RECT
+        {
+            public int left;
+            public int top;
+            public int right;
+            public int bottom;
+        }
+    }
+}
diff --git a/DM_Weight/util/TransExpV2.cs b/DM_Weight/util/TransExpV2.cs
new file mode 100644
index 0000000..e7a2a7a
--- /dev/null
+++ b/DM_Weight/util/TransExpV2.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.util
+{
+    public static class TransExpV2<TIn, TOut>
+    {
+
+        private static readonly Func<TIn, TOut> cache = GetFunc();
+        private static Func<TIn, TOut> GetFunc()
+        {
+            ParameterExpression parameterExpression = Expression.Parameter(typeof(TIn), "p");
+            List<MemberBinding> memberBindingList = new List<MemberBinding>();
+
+            foreach (var item in typeof(TOut).GetProperties())
+            {
+                if (!item.CanWrite)
+                    continue;
+
+                MemberExpression property = Expression.Property(parameterExpression, typeof(TIn).GetProperty(item.Name));
+                MemberBinding memberBinding = Expression.Bind(item, property);
+                memberBindingList.Add(memberBinding);
+            }
+
+            MemberInitExpression memberInitExpression = Expression.MemberInit(Expression.New(typeof(TOut)), memberBindingList.ToArray());
+            Expression<Func<TIn, TOut>> lambda = Expression.Lambda<Func<TIn, TOut>>(memberInitExpression, new ParameterExpression[] { parameterExpression });
+
+            return lambda.Compile();
+        }
+
+        public static TOut Trans(TIn tIn)
+        {
+            return cache(tIn);
+        }
+
+    }
+}
diff --git a/DM_WeightTests/DM_WeightTests.csproj b/DM_WeightTests/DM_WeightTests.csproj
new file mode 100644
index 0000000..ab187c8
--- /dev/null
+++ b/DM_WeightTests/DM_WeightTests.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+    <PackageReference Include="coverlet.collector" Version="3.2.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\DM_Weight\DM_Weight.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/DM_WeightTests/Port/ScreenUtilTests.cs b/DM_WeightTests/Port/ScreenUtilTests.cs
new file mode 100644
index 0000000..43c28d2
--- /dev/null
+++ b/DM_WeightTests/Port/ScreenUtilTests.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_WeightTests.Port
+{
+    internal class ScreenUtilTests
+    {
+    }
+}