From abae0a0d6122f0dd760094b3a8cf05227481c0ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E5=B7=A7?= <625215135@qq.com>
Date: Fri, 18 Jul 2025 09:36:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8D=AF=E5=93=81=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/Models/DrugBase.cs                    | 4 ++--
 DM_Weight/Models/DrugInfo.cs                    | 2 +-
 DM_Weight/ViewModels/DrugListWindowViewModel.cs | 7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/DM_Weight/Models/DrugBase.cs b/DM_Weight/Models/DrugBase.cs
index 3298824..cf243f3 100644
--- a/DM_Weight/Models/DrugBase.cs
+++ b/DM_Weight/Models/DrugBase.cs
@@ -15,7 +15,7 @@ namespace DM_Weight.Models
     public class DrugBase:BindableBase
     {
         private int _baseId = 0;
-        [SugarColumn(ColumnName = "id", IsPrimaryKey = true)]
+        [SugarColumn(ColumnName = "baseid", IsPrimaryKey = true)]
         public int BaseId { get=> _baseId; set { SetProperty(ref _baseId, value); } }
         private string _drugId;
         [SugarColumn(ColumnName = "drugid")]
@@ -24,7 +24,7 @@ namespace DM_Weight.Models
         [SugarColumn(ColumnName = "machine_id")]
         public string MachineId { get => _machineId; set { SetProperty(ref _machineId, value); } }
         private int _baseQuantity = 0;
-        [SugarColumn(ColumnName = "base_quantity")]
+        [SugarColumn(ColumnName = "basequantity")]
         public int BaseQuantity { get=>_baseQuantity; set{ SetProperty(ref _baseQuantity, value); } }
 
     }
diff --git a/DM_Weight/Models/DrugInfo.cs b/DM_Weight/Models/DrugInfo.cs
index b134d33..5abcbe8 100644
--- a/DM_Weight/Models/DrugInfo.cs
+++ b/DM_Weight/Models/DrugInfo.cs
@@ -84,7 +84,7 @@ namespace DM_Weight.Models
         public int? StockQuantity { get; set; }
 
         private DrugBase _base;
-        [Navigate(NavigateType.OneToOne, nameof(DrugBase.DrugId), nameof(DrugId))]
+        [Navigate(NavigateType.OneToOne, nameof(DrugBase.DrugId), nameof(DrugId),whereSql:" machine_id='DM1'")]
         public DrugBase drugBase
         {
             get=> _base;
diff --git a/DM_Weight/ViewModels/DrugListWindowViewModel.cs b/DM_Weight/ViewModels/DrugListWindowViewModel.cs
index af67eca..ff4b61f 100644
--- a/DM_Weight/ViewModels/DrugListWindowViewModel.cs
+++ b/DM_Weight/ViewModels/DrugListWindowViewModel.cs
@@ -283,7 +283,8 @@ namespace DM_Weight.ViewModels
                         }
                         else
                         {
-                            SqlSugarHelper.Db.Updateable(new DrugBase() { BaseQuantity = SelectedDrug.drugBase.BaseQuantity }).UpdateColumns(bs => new { bs.BaseQuantity }).Where(bs => bs.BaseId == SelectedDrug.drugBase.BaseId).ExecuteCommand();
+                            drugBase.BaseQuantity = SelectedDrug.drugBase.BaseQuantity;
+                            SqlSugarHelper.Db.Updateable(drugBase).UpdateColumns(bs => new { bs.BaseQuantity }).Where(bs => bs.BaseId == SelectedDrug.drugBase.BaseId).ExecuteCommand();
                         }
                     }
                 });
@@ -306,7 +307,7 @@ namespace DM_Weight.ViewModels
                     _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
                 }
                 RequestData();
-            }, () => SelectedDrug.DrugId==null).ObservesProperty(() => SelectedDrug);
+            }, () => SelectedDrug.DrugId!=null).ObservesProperty(() => SelectedDrug);
         }
 
         public DelegateCommand AddManuCommand
@@ -322,7 +323,7 @@ namespace DM_Weight.ViewModels
                     GetManuNos();
                 }
 
-            }, () => SelectedDrug.DrugId == null).ObservesProperty(() => SelectedDrug);
+            }, () => SelectedDrug.DrugId != null).ObservesProperty(() => SelectedDrug);
         }
 
         public DelegateCommand EditManuCommand