From b39419bf6592ea7f1db6d585d6cb6530851ca744 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Fri, 16 Aug 2024 17:00:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9drug=5Finfo=E8=A1=A8=E4=B8=AD?=
=?UTF-8?q?drug=5Fid=E4=B8=BA=E5=AD=97=E7=AC=A6=E5=9E=8B=EF=BC=8C=E6=B3=A8?=
=?UTF-8?q?=E9=87=8Ahomewindowviewmodel=E4=B8=AD=E6=B8=A9=E5=BA=A6?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=9A=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
DM_Weight/App.config | 4 +--
DM_Weight/Models/DrugInfo.cs | 2 +-
.../DrawerAddDrugWindowViewModel.cs | 11 +++++---
.../ViewModels/DrugListWindowViewModel.cs | 4 +--
DM_Weight/ViewModels/HomeWindowViewModel.cs | 26 +++++++++----------
5 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index 33ede04..fc8061d 100644
--- a/DM_Weight/App.config
+++ b/DM_Weight/App.config
@@ -3,7 +3,7 @@
-
+
-
+
diff --git a/DM_Weight/Models/DrugInfo.cs b/DM_Weight/Models/DrugInfo.cs
index aeaf7ef..560be6b 100644
--- a/DM_Weight/Models/DrugInfo.cs
+++ b/DM_Weight/Models/DrugInfo.cs
@@ -19,7 +19,7 @@ namespace DM_Weight.Models
/// ҩƷID
///
[SugarColumn(ColumnName = "drug_id", IsPrimaryKey = true)]
- public long DrugId { get; set; }
+ public string DrugId { get; set; }
///
/// ƴ
///
diff --git a/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs b/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs
index a471970..3ba851f 100644
--- a/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs
+++ b/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs
@@ -356,11 +356,14 @@ namespace DM_Weight.ViewModels
.Where(cs => cs.DrugId != null)
.OrderBy(cs => cs.ColNo)
.ToList();
- ChannelStocks = queryData.Select(cs =>
+ if (queryData != null && queryData.Count > 0)
{
- cs.drugManuNo = cs.DrugInfo.DrugManuNos.Find(it => it.ManuNo.Equals(cs.ManuNo));
- return cs;
- }).ToList();
+ ChannelStocks = queryData.Select(cs =>
+ {
+ cs.drugManuNo = cs.DrugInfo.DrugManuNos.Find(it => it.ManuNo.Equals(cs.ManuNo));
+ return cs;
+ }).ToList();
+ }
}
//接收导航传过来的参数 现在是在此处初始化了表格数据
diff --git a/DM_Weight/ViewModels/DrugListWindowViewModel.cs b/DM_Weight/ViewModels/DrugListWindowViewModel.cs
index 331ae97..1d3fcee 100644
--- a/DM_Weight/ViewModels/DrugListWindowViewModel.cs
+++ b/DM_Weight/ViewModels/DrugListWindowViewModel.cs
@@ -201,7 +201,7 @@ namespace DM_Weight.ViewModels
{
SqlSugarHelper.Db.Updateable(SelectedDrug).UpdateColumns(d => new { d.DrugName, d.Manufactory, d.PyCode, d.PackUnit, d.MaxStock, d.DrugSpec }).ExecuteCommand();
RequestData();
- }, () => SelectedDrug.DrugId > 0).ObservesProperty(() => SelectedDrug);
+ }, () => SelectedDrug.DrugId is not null).ObservesProperty(() => SelectedDrug);
}
public DelegateCommand AddManuCommand
@@ -217,7 +217,7 @@ namespace DM_Weight.ViewModels
GetManuNos();
}
- }, () => SelectedDrug.DrugId > 0).ObservesProperty(() => SelectedDrug);
+ }, () => SelectedDrug.DrugId is not null).ObservesProperty(() => SelectedDrug);
}
public DelegateCommand EditManuCommand
diff --git a/DM_Weight/ViewModels/HomeWindowViewModel.cs b/DM_Weight/ViewModels/HomeWindowViewModel.cs
index 83793ce..ac18e6b 100644
--- a/DM_Weight/ViewModels/HomeWindowViewModel.cs
+++ b/DM_Weight/ViewModels/HomeWindowViewModel.cs
@@ -394,20 +394,20 @@ namespace DM_Weight.ViewModels
};
timer.Start();
}
- #region 温度查询定时
- int interval = Convert.ToInt32(ConfigurationManager.AppSettings["Interval"]);
- if (interval > 0)
- {
- WDTimer = new System.Timers.Timer();
+ //#region 温度查询定时
+ //int interval = Convert.ToInt32(ConfigurationManager.AppSettings["Interval"]);
+ //if (interval > 0)
+ //{
+ // WDTimer = new System.Timers.Timer();
- WDTimer.Elapsed += new System.Timers.ElapsedEventHandler(GetWD);
- WDTimer.Interval = interval;
- WDTimer.Start();
- //WDTimer.AutoReset = true;
- //WDTimer.Enabled = true;
- }
- #endregion
- GetWD();
+ // WDTimer.Elapsed += new System.Timers.ElapsedEventHandler(GetWD);
+ // WDTimer.Interval = interval;
+ // WDTimer.Start();
+ // //WDTimer.AutoReset = true;
+ // //WDTimer.Enabled = true;
+ //}
+ //#endregion
+ //GetWD();
}
//每次导航的时候，该实列用不用重新创建，true是不重新创建,false是重新创建