From 2bebf36edbe1fd9e5afd562fcc08d6dd5d87198b Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Fri, 1 Aug 2025 10:16:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E6=AC=A1=E6=B7=BB=E5=8A=A0=E7=A1=AB?=
 =?UTF-8?q?=E5=8C=96=E3=80=81=E7=AD=9B=E9=80=89=E5=85=A8=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/Impl/ProdPlanInfoServiceImpl.cs                 | 2 +-
 SlnMesnac.WPF/SlnMesnac.WPF.csproj                          | 4 ----
 SlnMesnac.WPF/ViewModel/ExecuteViewModel.cs                 | 6 +++---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/SlnMesnac.Repository/service/Impl/ProdPlanInfoServiceImpl.cs b/SlnMesnac.Repository/service/Impl/ProdPlanInfoServiceImpl.cs
index 141a762..c137048 100644
--- a/SlnMesnac.Repository/service/Impl/ProdPlanInfoServiceImpl.cs
+++ b/SlnMesnac.Repository/service/Impl/ProdPlanInfoServiceImpl.cs
@@ -38,7 +38,7 @@ namespace SlnMesnac.Repository.service.Impl
                 .WhereIF(!string.IsNullOrEmpty(materialCode), (ppi, ppei) => ppi.MaterialCode == materialCode)
                 .WhereIF(!string.IsNullOrEmpty(stationCode), (ppi, ppei) => ppi.StationCode == stationCode)
                 .WhereIF(!string.IsNullOrEmpty(planStatus), (ppi, ppei) => ppi.PlanStatus == planStatus || ppi.PlanStatus == "4")
-                .WhereIF(!string.IsNullOrEmpty(classes), (ppi, ppei) => ppei.classes == classes)
+                .WhereIF(!string.IsNullOrEmpty(classes) && classes != "硫化", (ppi, ppei) => ppei.classes == classes)
                 .Select((ppi, ppei) => new ProdPLanInfo
                 {
                     ObjId = ppi.ObjId,
diff --git a/SlnMesnac.WPF/SlnMesnac.WPF.csproj b/SlnMesnac.WPF/SlnMesnac.WPF.csproj
index aaf01d8..91c2688 100644
--- a/SlnMesnac.WPF/SlnMesnac.WPF.csproj
+++ b/SlnMesnac.WPF/SlnMesnac.WPF.csproj
@@ -27,12 +27,8 @@
     <ProjectReference Include="..\SlnMesnac.Ioc\SlnMesnac.Ioc.csproj" />
     <ProjectReference Include="..\SlnMesnac.Model\SlnMesnac.Model.csproj" />
     <ProjectReference Include="..\SlnMesnac.Mqtt\SlnMesnac.Mqtt.csproj" />
-    <ProjectReference Include="..\SlnMesnac.Plc\SlnMesnac.Plc.csproj" />
-    <ProjectReference Include="..\SlnMesnac.Quartz\SlnMesnac.Quartz.csproj" />
     <ProjectReference Include="..\SlnMesnac.Repository\SlnMesnac.Repository.csproj" />
-    <ProjectReference Include="..\SlnMesnac.Rfid\SlnMesnac.Rfid.csproj" />
     <ProjectReference Include="..\SlnMesnac.Serilog\SlnMesnac.Serilog.csproj" />
-    <ProjectReference Include="..\SlnMesnac.TouchSocket\SlnMesnac.TouchSocket.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/SlnMesnac.WPF/ViewModel/ExecuteViewModel.cs b/SlnMesnac.WPF/ViewModel/ExecuteViewModel.cs
index 5d4ce7d..6476597 100644
--- a/SlnMesnac.WPF/ViewModel/ExecuteViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/ExecuteViewModel.cs
@@ -342,9 +342,9 @@ namespace SlnMesnac.WPF.ViewModel
             ProcessCode = configuration.GetSection("AppConfig")["ProcessCode"];
             
             // 初始化班次列表
-            ShiftList = new List<string> { "白班", "小夜", "大夜" };
-            SelectedShift = "白班"; // 默认选择白班
-            
+            ShiftList = new List<string> { "硫化", "白班", "小夜", "大夜" };
+            SelectedShift = "硫化"; // 默认选择硫化
+
             HandoverCommand = new RelayCommand(Handover);
             ProductionReportCommand = new RelayCommand(ProductionReport);
             TechnologicalInformationCommand = new RelayCommand(TechnologicalInformation);