From 8624ff9330e5aa4d7578de03846f130a0fbabb86 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Thu, 10 Jul 2025 09:39:21 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=A3=80=E7=B4=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=8A=A0=E7=89=88=E6=AC=A1=E4=B8=8B=E6=8B=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SlnMesnac.Model/domain/ProdPlanErpInfo.cs     |  2 +
 .../service/Impl/ProdPlanInfoServiceImpl.cs   |  6 ++-
 .../service/ProdPlanInfoService.cs            |  2 +-
 SlnMesnac.WPF/UserControls/ExecutePage.xaml   |  6 +++
 SlnMesnac.WPF/ViewModel/ExecuteViewModel.cs   | 41 +++++++++++++++----
 SlnMesnac.WPF/ViewModel/HandOverViewModel.cs  |  2 +-
 6 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/SlnMesnac.Model/domain/ProdPlanErpInfo.cs b/SlnMesnac.Model/domain/ProdPlanErpInfo.cs
index e171ad7..94cf2db 100644
--- a/SlnMesnac.Model/domain/ProdPlanErpInfo.cs
+++ b/SlnMesnac.Model/domain/ProdPlanErpInfo.cs
@@ -12,5 +12,7 @@ namespace SlnMesnac.Model.domain
         public string SeqNo { get; set; } // seqNo
         [SugarColumn(ColumnName = "workingHours")]
         public string WorkingHours { get; set; } // workingHours
+        [SugarColumn(ColumnName = "classes")]
+        public string classes { get; set; } // classes
     }
 } 
\ No newline at end of file
diff --git a/SlnMesnac.Repository/service/Impl/ProdPlanInfoServiceImpl.cs b/SlnMesnac.Repository/service/Impl/ProdPlanInfoServiceImpl.cs
index 939b887..141a762 100644
--- a/SlnMesnac.Repository/service/Impl/ProdPlanInfoServiceImpl.cs
+++ b/SlnMesnac.Repository/service/Impl/ProdPlanInfoServiceImpl.cs
@@ -25,8 +25,11 @@ namespace SlnMesnac.Repository.service.Impl
         /// <param name="orderCode"></param>
         /// <param name="planCode"></param>
         /// <param name="materialCode"></param>
+        /// <param name="stationCode"></param>
+        /// <param name="planStatus"></param>
+        /// <param name="classes"></param>
         /// <returns></returns>
-        public List<ProdPLanInfo> GetRecordStaffAttendancesByConditions(string? orderCode, string? planCode, string? materialCode, string? stationCode, string? planStatus)
+        public List<ProdPLanInfo> GetRecordStaffAttendancesByConditions(string? orderCode, string? planCode, string? materialCode, string? stationCode, string? planStatus, string? classes)
         {
             var query = _rep.Context.Queryable<ProdPLanInfo>()
                 .LeftJoin<ProdPlanErpInfo>((ppi, ppei) => ppi.PlanCode == ppei.SeqNo)
@@ -35,6 +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)
                 .Select((ppi, ppei) => new ProdPLanInfo
                 {
                     ObjId = ppi.ObjId,
diff --git a/SlnMesnac.Repository/service/ProdPlanInfoService.cs b/SlnMesnac.Repository/service/ProdPlanInfoService.cs
index fe7030f..a068393 100644
--- a/SlnMesnac.Repository/service/ProdPlanInfoService.cs
+++ b/SlnMesnac.Repository/service/ProdPlanInfoService.cs
@@ -18,7 +18,7 @@ namespace SlnMesnac.Repository.service
         /// 根据订单编号、工单编号、物料名称获取工单信息
         /// </summary>
         /// <returns></returns>
-        List<ProdPLanInfo> GetRecordStaffAttendancesByConditions(string orderCode,string planCode,string materialCode, string stationCode, string planStatus);
+        List<ProdPLanInfo> GetRecordStaffAttendancesByConditions(string orderCode,string planCode,string materialCode, string stationCode, string planStatus, string classes);
 
         /// <summary>
         /// 根据订单编号、工单编号、物料名称获取工单信息
diff --git a/SlnMesnac.WPF/UserControls/ExecutePage.xaml b/SlnMesnac.WPF/UserControls/ExecutePage.xaml
index 09572f2..0264770 100644
--- a/SlnMesnac.WPF/UserControls/ExecutePage.xaml
+++ b/SlnMesnac.WPF/UserControls/ExecutePage.xaml
@@ -130,6 +130,12 @@
                             <TextBlock Text="{Binding StationTextBox}" FontSize="15" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Left"/>
                             <!--<ComboBox x:Name="StationComboBox" ItemsSource="{Binding StationList}" SelectedItem="{Binding Station}" Width="180" Height="30" FontSize="15" HorizontalAlignment="Left"/>-->
                         </Border>
+                        <Border Grid.Row="3" Grid.Column="2">
+                            <TextBlock Text="班次：" FontSize="15" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                        </Border>
+                        <Border Grid.Row="4" Grid.Column="3">
+                            <ComboBox x:Name="ShiftComboBox" ItemsSource="{Binding ShiftList}" SelectedItem="{Binding SelectedShift}" Width="170" Height="30" FontSize="15" HorizontalAlignment="Left"/>
+                        </Border>
                         <Border Grid.Row="1" Grid.Column="5">
                             <Button Content="检索工单" x:Name="Select"  Command="{Binding SearchCommand}" CommandParameter="{Binding Name,ElementName=Select}" Style="{StaticResource  BUTTON_AGREE}" FontSize="15" FontWeight="Bold" Background="#009999" BorderBrush="#FF36B5C1"  Margin="20,5,20,5"/>
                         </Border>
diff --git a/SlnMesnac.WPF/ViewModel/ExecuteViewModel.cs b/SlnMesnac.WPF/ViewModel/ExecuteViewModel.cs
index 6c2331a..5d4ce7d 100644
--- a/SlnMesnac.WPF/ViewModel/ExecuteViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/ExecuteViewModel.cs
@@ -146,12 +146,12 @@ namespace SlnMesnac.WPF.ViewModel
             set { materialCodeTextBox = value; OnPropertyChanged("MaterialCodeTextBox"); }
         }
 
-        //private string materialNameTextBox;
-        //public string MaterialNameTextBox
-        //{
-        //    get { return materialNameTextBox; }
-        //    set { materialNameTextBox = value; OnPropertyChanged("MaterialNameTextBox"); }
-        //}
+        private string materialNameTextBox;
+        public string MaterialNameTextBox
+        {
+            get { return materialNameTextBox; }
+            set { materialNameTextBox = value; OnPropertyChanged("MaterialNameTextBox"); }
+        }
 
         /// <summary>
         /// 工位
@@ -163,6 +163,26 @@ namespace SlnMesnac.WPF.ViewModel
             set { stationTextBlock = value; OnPropertyChanged("StationTextBox"); }
         }
 
+        /// <summary>
+        /// 班次列表
+        /// </summary>
+        private List<string> shiftList;
+        public List<string> ShiftList
+        {
+            get { return shiftList; }
+            set { shiftList = value; OnPropertyChanged("ShiftList"); }
+        }
+
+        /// <summary>
+        /// 选中的班次
+        /// </summary>
+        private string selectedShift;
+        public string SelectedShift
+        {
+            get { return selectedShift; }
+            set { selectedShift = value; OnPropertyChanged("SelectedShift"); }
+        }
+
         /// <summary>
         /// PlanDataGrid
         /// </summary>
@@ -320,6 +340,11 @@ namespace SlnMesnac.WPF.ViewModel
             ;
             DeviceCode = configuration.GetSection("AppConfig")["DeviceCode"];
             ProcessCode = configuration.GetSection("AppConfig")["ProcessCode"];
+            
+            // 初始化班次列表
+            ShiftList = new List<string> { "白班", "小夜", "大夜" };
+            SelectedShift = "白班"; // 默认选择白班
+            
             HandoverCommand = new RelayCommand(Handover);
             ProductionReportCommand = new RelayCommand(ProductionReport);
             TechnologicalInformationCommand = new RelayCommand(TechnologicalInformation);
@@ -468,7 +493,7 @@ namespace SlnMesnac.WPF.ViewModel
                 //在这里执行其他操作，可以通过InputText获取用户输入的信息
                 //Console.WriteLine("用户输入的信息：" + OrderCodeTextBox + PlanCodeTextBox + MaterialCodeTextBox);
                 //ProductLineNameTextBlock = ConfigurationManager.AppSettings["ProductLineNameTextBlock"];
-                List<ProdPLanInfo> list = _prodPlanInfoService.GetRecordStaffAttendancesByConditions(OrderCodeTextBox, PlanCodeTextBox, MaterialCodeTextBox, RfidHandleBusniess.stationCode, "0");
+                List<ProdPLanInfo> list = _prodPlanInfoService.GetRecordStaffAttendancesByConditions(OrderCodeTextBox, PlanCodeTextBox, MaterialCodeTextBox, RfidHandleBusniess.stationCode, "0", SelectedShift);
                 System.Windows.Application.Current.Dispatcher.Invoke((Action)(async () =>
                 {
                     ProdPLanInfoDataGrid.Clear();
@@ -556,7 +581,7 @@ namespace SlnMesnac.WPF.ViewModel
                         // 将当前记录存为实体，可以通过parameter获取当前记录的信息
                         string orderCode = _selectedRow.OrderCode.ToString();
                         string planCode = _selectedRow.PlanCode.ToString();
-                        pLanInfo = _prodPlanInfoService.GetRecordStaffAttendancesByConditions(orderCode, planCode, "", "", "0").First();
+                        pLanInfo = _prodPlanInfoService.GetRecordStaffAttendancesByConditions(orderCode, planCode, "", "", "0", SelectedShift).First();
                         //RecordStaffAttendance currentRecord = _recordStaffAttendanceService.GetLastestOnRecord();
                         //BaseStaffInfo staffInfo = _baseStaffService.GetMonitorByTeamCode(currentRecord.TeamCode);
                         RecordStaffAttendance nextRecord = _recordStaffAttendanceService.GetLastestOffRecord();
diff --git a/SlnMesnac.WPF/ViewModel/HandOverViewModel.cs b/SlnMesnac.WPF/ViewModel/HandOverViewModel.cs
index 6547332..a73c0b2 100644
--- a/SlnMesnac.WPF/ViewModel/HandOverViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/HandOverViewModel.cs
@@ -40,7 +40,7 @@ namespace SlnMesnac.WPF.ViewModel
             _prodPlanDetailService = App.ServiceProvider.GetService<ProdPlanDetailService>();
             _prodPlanInfoService = App.ServiceProvider.GetService<ProdPlanInfoService>();
             _recordStaffAttendanceService = App.ServiceProvider.GetService<IRecordStaffAttendanceService>();
-            planInfo = _prodPlanInfoService.GetRecordStaffAttendancesByConditions("", "", "", "", "1").FirstOrDefault();
+            planInfo = _prodPlanInfoService.GetRecordStaffAttendancesByConditions("", "", "", "", "1", null).FirstOrDefault();
             HandoverCommand = new RelayCommand(Handover);
             Init();
             _baseStaffService = App.ServiceProvider.GetService<IBaseStaffService>();