From 500974a947a29b03d1b70759642504d8c9105b64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E5=B7=A7?= <625215135@qq.com>
Date: Thu, 21 Aug 2025 14:59:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=90=8E=E6=8A=A5=E8=A1=A8?=
=?UTF-8?q?=E7=9A=84=E6=89=B9=E6=AC=A1=E5=BA=93=E5=AD=98=E6=95=B0=EF=BC=88?=
=?UTF-8?q?=E5=AE=9E=E7=89=A9=EF=BC=89=E4=B8=8E=E4=B8=8A=E4=B8=80=E6=AC=A1?=
=?UTF-8?q?=E5=87=BA=E5=BA=93=E5=90=8E=E7=9A=84=E6=89=B9=E6=AC=A1=E5=BA=93?=
=?UTF-8?q?=E5=AD=98=E6=95=B0=E5=B7=AE=E5=88=AB=E5=A4=A7=EF=BC=8C=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E5=8F=AF=E8=83=BD=E5=AD=98=E5=9C=A8=E7=9A=84=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
DM_Weight/App.config | 2 +-
DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs | 4 ++--
DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs | 2 +-
DM_Weight/Views/BindBoxPackageWindow.xaml | 2 +-
DM_Weight/Views/ExchangeWindow.xaml | 2 +-
DM_Weight/Views/MachineRecordWindow.xaml | 6 ++++--
DM_Weight/Views/WSDRecordWindow.xaml | 2 +-
7 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index abc5764..beb969e 100644
--- a/DM_Weight/App.config
+++ b/DM_Weight/App.config
@@ -42,7 +42,7 @@
-
+
diff --git a/DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs b/DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs
index 24618d7..c043393 100644
--- a/DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs
+++ b/DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs
@@ -452,7 +452,7 @@ namespace DM_Weight.ViewModels
int baseQty = 0;
if (int.TryParse(BaseQuantity, out baseQty))
{
- logger.Info($"修改药品基数{_ChannelList.BaseQuantity}改为{baseQty}");
+ logger.Info($"修改药品{DrugInfo.DrugName}基数{_ChannelList.BaseQuantity}改为{baseQty}");
if (baseQty > _ChannelList.BaseQuantity)
{
//基数变大，需要补药
@@ -490,7 +490,7 @@ namespace DM_Weight.ViewModels
OperationTime = DateTime.Now,
Quantity = _ChannelList.channelStocks[0].NeedNum,
Type = 55,
- InvoiceId = $"修改药品基数{oldBaseQty}改为{baseQty},Quantity值为需要加药数量",
+ InvoiceId = $"修改药品{DrugInfo.DrugName}基数{oldBaseQty}改为{baseQty},Quantity值为需要加药数量",
}).ExecuteCommand();
SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#00e676"));
SnackbarMessageQueue.Enqueue("保存修改完成！");
diff --git a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
index 4d776e1..4051b0b 100644
--- a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
+++ b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
@@ -518,7 +518,7 @@ namespace DM_Weight.ViewModels
// 获取更新完库存后的药品库存
List nowChannels = SqlSugarHelper.Db.Queryable()
- .Where(it => it.MachineId.Equals(cs.MachineId) || it.MachineId.Equals(ConfigurationManager.AppSettings["dm_machineId"]))
+ .Where(it => it.MachineId.Equals(ConfigurationManager.AppSettings["machineId"]) || it.MachineId.Equals(ConfigurationManager.AppSettings["dm_machineId"]))
.Where(it => it.DrugId.Equals(cs.DrugId))
.Where(it => it.ManuNo.Equals(cs.ManuNo))
.Where(it => it.DrawerType == 1)
diff --git a/DM_Weight/Views/BindBoxPackageWindow.xaml b/DM_Weight/Views/BindBoxPackageWindow.xaml
index 95f648c..894aba9 100644
--- a/DM_Weight/Views/BindBoxPackageWindow.xaml
+++ b/DM_Weight/Views/BindBoxPackageWindow.xaml
@@ -142,7 +142,7 @@
-
+
-
+