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;