From 7fc43565d0346c7b6b40596dbc357d1a461cb700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E5=B7=A7?= <625215135@qq.com> Date: Wed, 2 Jul 2025 16:38:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=BF=9E=E6=8E=A5=E7=AC=94=E8=AE=B0=E6=9C=AC?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DM_Weight/App.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DM_Weight/App.config b/DM_Weight/App.config index 0181f07..f365411 100644 --- a/DM_Weight/App.config +++ b/DM_Weight/App.config @@ -3,7 +3,7 @@ - + @@ -42,7 +42,7 @@ - + From 4768ff39f3186fa8159f5d14c60bfb985ad8f9b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E5=B7=A7?= <625215135@qq.com> Date: Wed, 2 Jul 2025 17:15:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=80=A5=E8=AF=8A=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=B8=AD=E6=8A=A5=E8=A1=A8=E7=A7=91=E5=AE=A4=E5=92=8C=E6=95=88?= =?UTF-8?q?=E6=9C=9F=E4=B8=8D=E9=9C=80=E8=A6=81=EF=BC=8C=E8=8D=AF=E5=93=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA=E7=AE=80?= =?UTF-8?q?=E6=8B=BC=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DM_Weight/ReportTemp/account_book_temp_new.grf | 6 ++++-- DM_Weight/ViewModels/AccountWindowViewModel.cs | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/DM_Weight/ReportTemp/account_book_temp_new.grf b/DM_Weight/ReportTemp/account_book_temp_new.grf index e2f3886..496ee4a 100644 --- a/DM_Weight/ReportTemp/account_book_temp_new.grf +++ b/DM_Weight/ReportTemp/account_book_temp_new.grf @@ -127,10 +127,12 @@ }, { "Name":"效期", - "Width":1.61396 + "Width":1.61396, + "Visible":false }, { - "Name":"科室" + "Name":"科室", + "Visible":false }, { "Name":"患者姓名", diff --git a/DM_Weight/ViewModels/AccountWindowViewModel.cs b/DM_Weight/ViewModels/AccountWindowViewModel.cs index 2e03810..753f30e 100644 --- a/DM_Weight/ViewModels/AccountWindowViewModel.cs +++ b/DM_Weight/ViewModels/AccountWindowViewModel.cs @@ -273,7 +273,7 @@ namespace DM_Weight.ViewModels DrugInfos.Clear(); } - //DrugInfos = SqlSugarHelper.Db.SqlQueryable(str).Where(di => di.DrugName.Contains(text) || di.PyCode.Contains(text) || di.DrugId.Contains(text)).OrderBy(di => di.DrugName).OrderBy(di => di.DrugId).ToList(); + DrugInfos = SqlSugarHelper.Db.SqlQueryable(str).Where(di => di.DrugName.Contains(text) || di.PyCode.Contains(text) || di.DrugId.Contains(text)).OrderBy(di => di.DrugName).OrderBy(di => di.DrugId).ToList(); } 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 3/3] =?UTF-8?q?=E8=8D=AF=E5=93=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=A1=B5=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().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