From 8e11ab612f5d0a19c49f861263081b2e493c0f59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=AF=E9=BE=99=20=E6=9B=B9?= <1805857645@QQ.com>
Date: Mon, 23 Dec 2024 19:16:31 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=E5=B0=86=E8=AE=BE=E5=A4=87=E8=AF=B7?=
=?UTF-8?q?=E6=B1=82=E5=8F=AB=E6=96=99=E4=BF=A1=E5=8F=B7=E7=AD=89=EF=BC=8C?=
=?UTF-8?q?=E4=BB=8Etrue=E3=80=81false=E6=94=B9=E4=B8=BA=E7=BA=A2=E8=B7=AF?=
=?UTF-8?q?=E6=8C=87=E7=A4=BA=E7=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SlnMesnac.WPF/Page/DevMonitorPage.xaml | 16 ++++++++--------
SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs | 13 ++++++++-----
SlnMesnac.WPF/Page/LocationPage.xaml.cs | 3 ++-
3 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/SlnMesnac.WPF/Page/DevMonitorPage.xaml b/SlnMesnac.WPF/Page/DevMonitorPage.xaml
index 788aa82..dd4b0f7 100644
--- a/SlnMesnac.WPF/Page/DevMonitorPage.xaml
+++ b/SlnMesnac.WPF/Page/DevMonitorPage.xaml
@@ -122,24 +122,24 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs b/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs
index 88924d7..e2ad649 100644
--- a/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs
+++ b/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs
@@ -2165,11 +2165,14 @@ namespace SlnMesnac.WPF.Page
UnpackStatus0.Fill = UnPack_MesUse_Flag ? Brushes.Green : Brushes.Red;
UnpackStatus1.Fill = UnPack_Status ? Brushes.Green : Brushes.Red;
- UnpackStatus2.Text = unPackStatus2.ToString();
- UnpackStatus3.Text = unPackStatus3.ToString();
- UnpackStatus4.Text = unPackStatus4.ToString();
- UnpackStatus5.Text = unPackStatus5.ToString();
-
+ //UnpackStatus2.Text = unPackStatus2.ToString();
+ UnpackStatus2.Fill = unPackStatus2 ? Brushes.Green : Brushes.Red;
+ //UnpackStatus3.Text = unPackStatus3.ToString();
+ UnpackStatus3.Fill = unPackStatus3 ? Brushes.Green : Brushes.Red;
+ //UnpackStatus4.Text = unPackStatus4.ToString();
+ UnpackStatus4.Fill = unPackStatus4 ? Brushes.Green : Brushes.Red;
+ //UnpackStatus5.Text = unPackStatus5.ToString();
+ UnpackStatus5.Fill = unPackStatus5 ? Brushes.Green : Brushes.Red;
UnpackStatus7.Fill = unPackStatus7 ? Brushes.Green : Brushes.Red;
UnpackStatus8.Fill = unPackStatus8 ? Brushes.Red : Brushes.Green;
diff --git a/SlnMesnac.WPF/Page/LocationPage.xaml.cs b/SlnMesnac.WPF/Page/LocationPage.xaml.cs
index f1ce99b..e3924a5 100644
--- a/SlnMesnac.WPF/Page/LocationPage.xaml.cs
+++ b/SlnMesnac.WPF/Page/LocationPage.xaml.cs
@@ -31,7 +31,8 @@ namespace SlnMesnac.WPF.Page
sqlSugarClient = App.ServiceProvider.GetService();
this.WareHouseId.ItemsSource = new List
{
- "二楼仓库","三楼仓库","五楼仓库"
+ "二楼仓库","三楼仓库"
+ //,"五楼仓库"
};
WareHouseId.SelectedItem = "三楼仓库";
loadLocations(GetLocations());