From b15002be2d01e94bd469a309eb39c5b103c544c2 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Fri, 21 Mar 2025 14:44:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=85=A5=E8=B4=A6=E5=86=8C(96)?=
 =?UTF-8?q?=E5=8F=96=E8=8D=AF=E5=90=8E=E4=B8=8D=E8=BF=98=E7=A9=BA=E7=93=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs | 3 ++-
 DM_Weight/ViewModels/SelfTakeDialogViewModel.cs       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs b/DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs
index 2916497..2df7f62 100644
--- a/DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs
+++ b/DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs
@@ -285,7 +285,8 @@ namespace DM_Weight.ViewModels
                                     StockQuantity = nowChannels.Sum(it => it.Quantity),
                                     ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity),
                                     SupplierDept = ConfigurationManager.AppSettings["supplierDept"].ToString(),
-                                    ReceiveDept = ConfigurationManager.AppSettings["receiveDept"].ToString()
+                                    ReceiveDept = ConfigurationManager.AppSettings["receiveDept"].ToString(),
+                                    Status = SelectedItemUseFor.UseId == 0 ? 0 : 2   //不入账册(96)取药后不还空瓶
                                 }).ExecuteCommand();
                                 logger.Info("Insert_MachineRecord完成");
 
diff --git a/DM_Weight/ViewModels/SelfTakeDialogViewModel.cs b/DM_Weight/ViewModels/SelfTakeDialogViewModel.cs
index 173f655..71c9566 100644
--- a/DM_Weight/ViewModels/SelfTakeDialogViewModel.cs
+++ b/DM_Weight/ViewModels/SelfTakeDialogViewModel.cs
@@ -341,7 +341,8 @@ namespace DM_Weight.ViewModels
                                 StockQuantity = nowChannels.Sum(it => it.Quantity),
                                 ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity),
                                 SupplierDept = ConfigurationManager.AppSettings["supplierDept"].ToString(),
-                                ReceiveDept = ConfigurationManager.AppSettings["receiveDept"].ToString()
+                                ReceiveDept = ConfigurationManager.AppSettings["receiveDept"].ToString(),
+                                Status = SelectedItem.UseId == 0 ? 0 : 2   //不入账册(96)取药后不还空瓶
                             }).ExecuteCommand();
                         }
                         return true;