diff --git a/SlnMesnac.Business/business/DatabaseHandleBusniess.cs b/SlnMesnac.Business/business/DatabaseHandleBusniess.cs
index f4e48c1..b4d71ea 100644
--- a/SlnMesnac.Business/business/DatabaseHandleBusniess.cs
+++ b/SlnMesnac.Business/business/DatabaseHandleBusniess.cs
@@ -106,6 +106,7 @@ namespace SlnMesnac.Business.business
         /// </summary>
         public void InsertPlanExecuteUser(ProdPLanInfo prodPlanInfo,ProdPlanDetail prodPlanDetail,List<RecordStaffRealTime> realTimes)
         {
+            string time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             foreach (var item in realTimes)
             {
                 ProdPlanExecuteUser prodPlanExecuteUser = new ProdPlanExecuteUser()
@@ -119,10 +120,10 @@ namespace SlnMesnac.Business.business
                     PlanBeginDate = prodPlanDetail.BeginTime,
                     PlanEndDate = prodPlanDetail.EndTime,
                     CreatedBy = prodPlanInfo.CreatedBy,
-                    CreatedTime = prodPlanDetail.BeginTime,
+                    CreatedTime = time,
                     UpdatedBy = prodPlanInfo.UpdatedBy,
                     UpdatedTime = prodPlanInfo.UpdatedTime,
-                    BatchNumber = prodPlanDetail.BatchNumber
+                    BatchNumber = prodPlanDetail.BatchNumber,
                 };
                 _prodPlanExecuteUserService.Insert(prodPlanExecuteUser);                
             }
@@ -177,6 +178,25 @@ namespace SlnMesnac.Business.business
             }
         }
 
+        /// <summary>
+        /// 获取班长
+        /// </summary>
+        /// <param name="stationCode"></param>
+        /// <returns></returns>
+        public MonitorInfo GetMonitor(string stationCode)
+        {
+            MonitorInfo monitorInfo = new MonitorInfo();
+            monitorInfo = _recordStaffRealTimeService.GetMonitorInfo(stationCode);
+            return monitorInfo;
+        }
+
+        ///// <summary>
+        ///// 设置员工下班时间
+        ///// </summary>
+        //public void SetOffWorkTime(string staffId,string dateTime)
+        //{
+        //    _prodPlanExecuteUserService.SetExecuterOffWorkTime(staffId, dateTime);
+        //}
         ///// <summary>
         ///// 查询所有计划工位
         ///// </summary>
diff --git a/SlnMesnac.Business/business/RfidHandleBusniess.cs b/SlnMesnac.Business/business/RfidHandleBusniess.cs
index dc8e8a4..43cea51 100644
--- a/SlnMesnac.Business/business/RfidHandleBusniess.cs
+++ b/SlnMesnac.Business/business/RfidHandleBusniess.cs
@@ -21,6 +21,7 @@ namespace SlnMesnac.Business.business
         private IRecordStaffAttendanceService _recordStaffAttendanceService;
         private IRecordStaffCommuteService _recordStaffCommuteService;
         private IRecordStaffRealTimeService _recordStaffRealTimeService;
+        private ProdPlanExecuteUserService _prodPlanExecuteUserService;
         private string currentTime;
         private string teamMembers = null;
         private List<string> members = new List<string>();
@@ -29,11 +30,15 @@ namespace SlnMesnac.Business.business
         public static string staffId = "";
         public static string theNewAmount = "";
 
-        public RfidHandleBusniess(IRecordStaffAttendanceService recordStaffAttendanceService, IRecordStaffCommuteService recordStaffCommuteService, IRecordStaffRealTimeService recordStaffRealTimeService)
+        public RfidHandleBusniess(IRecordStaffAttendanceService recordStaffAttendanceService, 
+            IRecordStaffCommuteService recordStaffCommuteService, 
+            IRecordStaffRealTimeService recordStaffRealTimeService,
+            ProdPlanExecuteUserService prodPlanExecuteUserService)
         {
             this._recordStaffAttendanceService = recordStaffAttendanceService;
             this._recordStaffCommuteService = recordStaffCommuteService;
-            this._recordStaffRealTimeService = recordStaffRealTimeService;            
+            this._recordStaffRealTimeService = recordStaffRealTimeService;
+            _prodPlanExecuteUserService = prodPlanExecuteUserService;
         }
 
 
@@ -169,9 +174,18 @@ namespace SlnMesnac.Business.business
                     && recordStaffRealTime.StationCode == stationCode
                     && recordStaffRealTime.AttendanceType == "0").FirstOrDefault();
                     _recordStaffRealTimeService.Delete(realTime);
+                    SetOffWorkTime(staff.StaffId, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                 }
             }        
             return _recordStaffRealTimeService.GetRecordStaffRealTime(stationCode);
         }
+
+        /// <summary>
+        /// 设置员工下班时间
+        /// </summary>
+        public void SetOffWorkTime(string staffId, string dateTime)
+        {
+            _prodPlanExecuteUserService.SetExecuterOffWorkTime(staffId, dateTime);
+        }
     }
 }
diff --git a/SlnMesnac.Model/domain/MonitorInfo.cs b/SlnMesnac.Model/domain/MonitorInfo.cs
new file mode 100644
index 0000000..00c6949
--- /dev/null
+++ b/SlnMesnac.Model/domain/MonitorInfo.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SlnMesnac.Model.domain
+{
+    
+    public class MonitorInfo
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public string stationCode { get; set; }
+
+        /// <summary>
+        /// 员工Id
+        /// </summary>
+        public string staffId { get; set; }
+
+        /// <summary>
+        /// 员工名
+        /// </summary>
+        public string staffName { get; set; }
+
+        /// <summary>
+        /// 员工类型
+        /// </summary>
+        public string staffType { get; set; }
+    }
+}
diff --git a/SlnMesnac.Model/domain/ProdPlanExecuteUser.cs b/SlnMesnac.Model/domain/ProdPlanExecuteUser.cs
index 1598275..619476c 100644
--- a/SlnMesnac.Model/domain/ProdPlanExecuteUser.cs
+++ b/SlnMesnac.Model/domain/ProdPlanExecuteUser.cs
@@ -93,5 +93,11 @@ namespace SlnMesnac.Model.domain
         /// </summary>
         [SugarColumn(ColumnName = "batch_number")]
         public int BatchNumber { get; set; }
+
+        /// <summary>
+        /// 下班时间
+        /// </summary>
+        [SugarColumn(ColumnName = "off_work_time")]
+        public string OffWorkTime { get; set; }
     }
 }
diff --git a/SlnMesnac.Repository/SlnMesnac.Repository.csproj b/SlnMesnac.Repository/SlnMesnac.Repository.csproj
index b733819..ceb21d7 100644
--- a/SlnMesnac.Repository/SlnMesnac.Repository.csproj
+++ b/SlnMesnac.Repository/SlnMesnac.Repository.csproj
@@ -8,6 +8,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.170" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/SlnMesnac.Repository/service/IRecordStaffRealTimeService.cs b/SlnMesnac.Repository/service/IRecordStaffRealTimeService.cs
index 3bd85a4..5da9ba0 100644
--- a/SlnMesnac.Repository/service/IRecordStaffRealTimeService.cs
+++ b/SlnMesnac.Repository/service/IRecordStaffRealTimeService.cs
@@ -14,5 +14,12 @@ namespace SlnMesnac.Repository.service
         /// <param name="stationCode"></param>
         /// <returns></returns>
         List<RecordStaffRealTime> GetRecordStaffRealTime(string stationCode);
+
+        /// <summary>
+        /// 获取班长信息
+        /// </summary>
+        /// <param name="stationCode"></param>
+        /// <returns></returns>
+        MonitorInfo GetMonitorInfo(string stationCode);
     }
 }
diff --git a/SlnMesnac.Repository/service/Impl/BaseStaffServiceImpl.cs b/SlnMesnac.Repository/service/Impl/BaseStaffServiceImpl.cs
index b745d05..616aa14 100644
--- a/SlnMesnac.Repository/service/Impl/BaseStaffServiceImpl.cs
+++ b/SlnMesnac.Repository/service/Impl/BaseStaffServiceImpl.cs
@@ -48,6 +48,11 @@ namespace SlnMesnac.Repository.service.Impl
             return staffInfo;
         }
 
+        /// <summary>
+        /// 通过员工Id查询名
+        /// </summary>
+        /// <param name="staffId"></param>
+        /// <returns></returns>
         public BaseStaffInfo GetStaffInfoByStaffId(string staffId)
         {
             BaseStaffInfo staffInfo = null;
diff --git a/SlnMesnac.Repository/service/Impl/ProdPlanExecuteUserServiceImpl.cs b/SlnMesnac.Repository/service/Impl/ProdPlanExecuteUserServiceImpl.cs
index 65caa51..389fdaa 100644
--- a/SlnMesnac.Repository/service/Impl/ProdPlanExecuteUserServiceImpl.cs
+++ b/SlnMesnac.Repository/service/Impl/ProdPlanExecuteUserServiceImpl.cs
@@ -39,5 +39,25 @@ namespace SlnMesnac.Repository.service.Impl
             }
             return result;
         }
+
+        /// <summary>
+        /// 设置员工下班时间
+        /// </summary>
+        public int SetExecuterOffWorkTime(string staffId,string dateTime)
+        {
+            int executers = 0;
+            try
+            {
+                executers = _rep.Context.Updateable<ProdPlanExecuteUser>()
+                        .SetColumns(x => x.OffWorkTime == dateTime)
+                        .Where(x => x.OffWorkTime == null && x.StaffId == staffId)
+                        .ExecuteCommand();
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError($"设置员工下班时间异常:{ex.Message}");
+            }
+            return executers;
+        }
     }
 }
diff --git a/SlnMesnac.Repository/service/Impl/RecordStaffRealTimeServiceImpl.cs b/SlnMesnac.Repository/service/Impl/RecordStaffRealTimeServiceImpl.cs
index f7b3a48..55a727e 100644
--- a/SlnMesnac.Repository/service/Impl/RecordStaffRealTimeServiceImpl.cs
+++ b/SlnMesnac.Repository/service/Impl/RecordStaffRealTimeServiceImpl.cs
@@ -37,5 +37,24 @@ namespace SlnMesnac.Repository.service.Impl
             }
             return records;
         }
+
+        /// <summary>
+        /// 获取班长信息
+        /// </summary>
+        /// <returns></returns>
+        public MonitorInfo GetMonitorInfo(string stationCode)
+        {
+            var monitorInfo = _rep.Context.Queryable<RecordStaffRealTime>()
+                .LeftJoin<BaseStaffInfo>((srt, si) => srt.StaffId == si.StaffId)
+                .Where((srt, si) => si.StaffType == "1" && srt.StationCode == stationCode)
+                .Select((srt, si) => new MonitorInfo
+                {
+                    stationCode = srt.StationCode, 
+                    staffId = si.StaffId, 
+                    staffName = si.StaffName,
+                    staffType = si.StaffType
+                }).First();
+            return monitorInfo;
+        }
     }
 }
diff --git a/SlnMesnac.Repository/service/ProdPlanExecuteUserService.cs b/SlnMesnac.Repository/service/ProdPlanExecuteUserService.cs
index 7825676..1139381 100644
--- a/SlnMesnac.Repository/service/ProdPlanExecuteUserService.cs
+++ b/SlnMesnac.Repository/service/ProdPlanExecuteUserService.cs
@@ -15,5 +15,13 @@ namespace SlnMesnac.Repository.service
         /// <param name="batch"></param>
         /// <returns></returns>
         bool DeleteByPlanCodeAndTheBatchNumber(string planCode, int batch);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="staffId"></param>
+        /// <param name="dateTime"></param>
+        /// <returns></returns>
+        int SetExecuterOffWorkTime(string staffId, string dateTime);
     }
 }
diff --git a/SlnMesnac.WPF/UserControls/ExecutePage.xaml b/SlnMesnac.WPF/UserControls/ExecutePage.xaml
index a5dfdb5..781ec23 100644
--- a/SlnMesnac.WPF/UserControls/ExecutePage.xaml
+++ b/SlnMesnac.WPF/UserControls/ExecutePage.xaml
@@ -71,7 +71,7 @@
     </UserControl.Resources>
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="7*"/>
+            <ColumnDefinition Width="6*"/>
             <ColumnDefinition Width="4*"/>
         </Grid.ColumnDefinitions>
         <Border Grid.Column="0" >
@@ -109,19 +109,19 @@
                             <TextBlock Text="ERP订单编号" FontSize="15" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                         </Border>
                         <Border Grid.Row="0" Grid.Column="1">
-                            <TextBox Text="{Binding OrderCodeTextBox}" Height="30" Width="180" FontSize="15" Foreground="White" HorizontalAlignment="Left"/>
+                            <TextBox Text="{Binding OrderCodeTextBox}" Height="30" Width="170" FontSize="15" Foreground="White" HorizontalAlignment="Left"/>
                         </Border>
                         <Border Grid.Row="0" Grid.Column="2">
                             <TextBlock Text="工单编号" FontSize="15" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                         </Border>
                         <Border Grid.Row="0" Grid.Column="3">
-                            <TextBox  Text="{Binding PlanCodeTextBox}" Height="30" Width="180" FontSize="15" Foreground="White" HorizontalAlignment="Left"/>
+                            <TextBox  Text="{Binding PlanCodeTextBox}" Height="30" Width="170" FontSize="15" Foreground="White" HorizontalAlignment="Left"/>
                         </Border>
                         <Border Grid.Row="0" Grid.Column="4">
                             <TextBlock Text="物料名称" FontSize="15" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                         </Border>
                         <Border Grid.Row="0" Grid.Column="5">
-                            <TextBox Text="{Binding MaterialNameTextBox}" Height="30" Width="180" FontSize="15" Foreground="White" HorizontalAlignment="Left"/>
+                            <TextBox Text="{Binding MaterialNameTextBox}" Height="30" Width="170" FontSize="15" Foreground="White" HorizontalAlignment="Left"/>
                         </Border>
                         <Border Grid.Row="1" Grid.Column="0">
                             <TextBlock Text="工位：" FontSize="15" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
@@ -353,8 +353,9 @@
                                 </DataGridTemplateColumn.CellTemplate>
                             </DataGridTemplateColumn>
 
-                            <DataGridTextColumn Binding="{Binding PlanAmount}" Header="计划数量" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
-                            <DataGridTextColumn Binding="{Binding CompleteAmount}" Header="新增数量" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
+                            <DataGridTextColumn Binding="{Binding PlanAmount}" Header="计划数量" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
+                            <DataGridTextColumn Binding="{Binding CompleteAmount}" Header="新增数量" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
+                            <DataGridTextColumn Binding="{Binding CreatedBy}" Header="当前班长" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
                             <DataGridTextColumn Binding="{Binding BeginTime, StringFormat=\{0:yyy-MM-dd HH:mm:ss\}}" Header="实际开始时间" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
 
                             <DataGridTemplateColumn Header="操作" Width="1*" >
@@ -363,7 +364,7 @@
                                         <WrapPanel>
                                             <Button Content="撤回" 
                                                 FontSize="15" 
-                                                Width="60" 
+                                                Width="40" 
                                                 Height="25" 
                                                 Command="{Binding DataContext.WithdrawCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type DataGrid}}}" 
                                                 CommandParameter="{Binding}">
diff --git a/SlnMesnac.WPF/ViewModel/EmployeeLoginViewModel.cs b/SlnMesnac.WPF/ViewModel/EmployeeLoginViewModel.cs
index cacf0df..13ac047 100644
--- a/SlnMesnac.WPF/ViewModel/EmployeeLoginViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/EmployeeLoginViewModel.cs
@@ -30,6 +30,7 @@ namespace SlnMesnac.WPF.ViewModel
     public class EmployeeLoginViewModel : INotifyPropertyChanged
     {
         private readonly ILogger<EmployeeLoginViewModel> _logger;
+        private readonly DatabaseHandleBusniess _databaseHandleBusniess;
         private readonly RfidHandleBusniess _rfidHandleBusniess;
         private IBaseStaffService baseStaffService;
         private IRecordStaffAttendanceService _recordStaffAttendanceService;
@@ -261,6 +262,7 @@ namespace SlnMesnac.WPF.ViewModel
             baseStaffService = App.ServiceProvider.GetService<IBaseStaffService>();
             _recordStaffAttendanceService = App.ServiceProvider.GetService<IRecordStaffAttendanceService>();
             _recordStaffCommuteService = App.ServiceProvider.GetService<IRecordStaffCommuteService>();
+            _databaseHandleBusniess = App.ServiceProvider.GetService<DatabaseHandleBusniess>();
             _rfidHandleBusniess = App.ServiceProvider.GetService<RfidHandleBusniess>();
             IConfigurationBuilder configurationBuilder = new ConfigurationBuilder()
                 .SetBasePath(System.AppContext.BaseDirectory)
@@ -318,7 +320,7 @@ namespace SlnMesnac.WPF.ViewModel
                 if (RemoveConfirmViewModel.times == 1)
                 {
                     var theUser = baseStaffService.GetStaffInfoByStaffId(staffId);
-                    _rfidHandleBusniess.HandleAndInsertRemove(theUser, 2);
+                    _rfidHandleBusniess.HandleAndInsertRemove(theUser, 2);//在打卡记录表里记录强退
                     var list = _rfidHandleBusniess.HandleAndInsertStaffRealTime(theUser, 2);
                     if (list.Count>=0)
                     {
@@ -366,25 +368,9 @@ namespace SlnMesnac.WPF.ViewModel
                                 RecordStaffAttendance recordStaffAttendance = _recordStaffAttendanceService.GetRecordStaffAttendanceByStaffId(user.StaffId, RfidHandleBusniess.stationCode);
                                 if (recordStaffAttendance != null)
                                 {
-                                    var createTime = recordStaffAttendance.CreateTime;
-                                    var nowTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-                                    TimeSpan timeDiff = DateTime.Parse(nowTime) - DateTime.Parse(createTime);
-                                    if (timeDiff.TotalHours >= 10)//
+                                    //判断与上次打卡类型是否重复（主要为上班）
+                                    if (recordStaffAttendance.AttendanceType != status.ToString())
                                     {
-                                        if (recordStaffAttendance.AttendanceType == "1") //下班卡
-                                        {
-                                            if (recordStaffAttendance.AttendanceType == status.ToString() || recordStaffAttendance.AttendanceType == "2")
-                                            {
-                                                StatusText = "未打上班卡，请联系管理员！";
-                                            }
-                                        }
-                                        else if (recordStaffAttendance.AttendanceType == "0")
-                                        {
-                                            if (recordStaffAttendance.AttendanceType == status.ToString())
-                                            {
-                                                StatusText = "未打下班卡，请联系管理员！";
-                                            }
-                                        }
                                         StaffIdText = user.StaffId;
                                         CheckStatus = user.StaffName + " " + user.TeamCode + " 打卡成功！";
                                         _rfidHandleBusniess.HandleAndInsertStaffAttendance(user, isCheckOn);
@@ -393,19 +379,48 @@ namespace SlnMesnac.WPF.ViewModel
                                     }
                                     else
                                     {
-                                        if (recordStaffAttendance.AttendanceType != status.ToString())
-                                        {
-                                            StaffIdText = user.StaffId;
-                                            CheckStatus = user.StaffName + " " + user.TeamCode + " 打卡成功！";
-                                            _rfidHandleBusniess.HandleAndInsertStaffAttendance(user, isCheckOn);
-                                            ShowStaffAttendances(user, isCheckOn);
-                                            _rfidHandleBusniess.HandleStaffCommute(user, isCheckOn);
-                                        }
-                                        else
-                                        {
-                                            StatusText = "请勿重复打卡！";
-                                        }
+                                        StatusText = "请勿重复打卡！";
                                     }
+                                    //var createTime = recordStaffAttendance.CreateTime;
+                                    //var nowTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                                    //TimeSpan timeDiff = DateTime.Parse(nowTime) - DateTime.Parse(createTime);
+                                    //if (timeDiff.TotalHours >= 10)//
+                                    //{
+                                    //    if (recordStaffAttendance.AttendanceType == "1") //下班卡
+                                    //    {
+                                    //        if (recordStaffAttendance.AttendanceType == status.ToString() || recordStaffAttendance.AttendanceType == "2")
+                                    //        {
+                                    //            StatusText = "未打上班卡，请联系管理员！";
+                                    //        }
+                                    //    }
+                                    //    else if (recordStaffAttendance.AttendanceType == "0")
+                                    //    {
+                                    //        if (recordStaffAttendance.AttendanceType == status.ToString())
+                                    //        {
+                                    //            StatusText = "未打下班卡，请联系管理员！";
+                                    //        }
+                                    //    }
+                                    //    StaffIdText = user.StaffId;
+                                    //    CheckStatus = user.StaffName + " " + user.TeamCode + " 打卡成功！";
+                                    //    _rfidHandleBusniess.HandleAndInsertStaffAttendance(user, isCheckOn);
+                                    //    ShowStaffAttendances(user, isCheckOn);
+                                    //    _rfidHandleBusniess.HandleStaffCommute(user, isCheckOn);
+                                    //}
+                                    //else
+                                    //{
+                                    //    if (recordStaffAttendance.AttendanceType != status.ToString())
+                                    //    {
+                                    //        StaffIdText = user.StaffId;
+                                    //        CheckStatus = user.StaffName + " " + user.TeamCode + " 打卡成功！";
+                                    //        _rfidHandleBusniess.HandleAndInsertStaffAttendance(user, isCheckOn);
+                                    //        ShowStaffAttendances(user, isCheckOn);
+                                    //        _rfidHandleBusniess.HandleStaffCommute(user, isCheckOn);
+                                    //    }
+                                    //    else
+                                    //    {
+                                    //        StatusText = "请勿重复打卡！";
+                                    //    }
+                                    //}
                                 }
                                 else
                                 {
diff --git a/SlnMesnac.WPF/ViewModel/ExecuteViewModel.cs b/SlnMesnac.WPF/ViewModel/ExecuteViewModel.cs
index 7df3538..1977c01 100644
--- a/SlnMesnac.WPF/ViewModel/ExecuteViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/ExecuteViewModel.cs
@@ -257,6 +257,16 @@ namespace SlnMesnac.WPF.ViewModel
             get { return batchNumbers; }
             set { batchNumbers = value; OnPropertyChanged("BatchNumbers"); }
         }
+
+        /// <summary>
+        /// 班长名
+        /// </summary>
+        private string currentMonitorName;
+        public string CurrentMonitorName
+        {
+            get { return currentMonitorName; }
+            set { currentMonitorName = value; OnPropertyChanged("CurrentMonitorName"); }
+        }
         #endregion
 
         public ExecuteViewModel()
@@ -358,6 +368,7 @@ namespace SlnMesnac.WPF.ViewModel
             StationTextBox = EmployeeLoginViewModel.stationName;
         }
 
+
         /// <summary>
         /// 换班弹窗
         /// </summary>
@@ -521,6 +532,8 @@ namespace SlnMesnac.WPF.ViewModel
                         //BaseStaffInfo staffInfo = _baseStaffService.GetMonitorByTeamCode(currentRecord.TeamCode);
                         RecordStaffAttendance nextRecord = _recordStaffAttendanceService.GetLastestOffRecord();
                         // 向detail表里插入一条数据
+                        //当前班长
+                        var monitor = _databaseHandleBusniess.GetMonitor(RfidHandleBusniess.stationCode);
                         if (pLanInfo.CompleteAmount == "0.00")
                         {
                             ProdPlanDetail prodPlanDetail = new ProdPlanDetail
@@ -529,7 +542,8 @@ namespace SlnMesnac.WPF.ViewModel
                                 MaterialCode = pLanInfo.MaterialCode,
                                 PlanAmount = pLanInfo.PlanAmount,
                                 CompleteAmount = pLanInfo.CompleteAmount,
-                                BeginTime = DateTime.Now.ToString(),
+                                BeginTime = theStartTime,
+                                CreatedBy = monitor.staffName
                                 //CurrentStaffId = staffInfo.StaffId
                                 //NextStaffId = nextRecord.StaffId,
                             };
@@ -569,6 +583,7 @@ namespace SlnMesnac.WPF.ViewModel
                     OrderCodeText = pLanInfo.OrderCode;
                     MaterialNameText = pLanInfo.MaterialName;
                     StationCodeText = pLanInfo.StationCode;
+                    //CurrentMonitorName = _baseStaffService.GetStaffInfoByStaffId(RfidHandleBusniess.staffId).StaffName;
                     System.Windows.Application.Current.Dispatcher.Invoke((Action)(async () =>
                     {
                         ProdPLanDetailDataGrid.Clear();
diff --git a/SlnMesnac.WPF/ViewModel/ProductionReportViewModel.cs b/SlnMesnac.WPF/ViewModel/ProductionReportViewModel.cs
index b00ee15..fae8d10 100644
--- a/SlnMesnac.WPF/ViewModel/ProductionReportViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/ProductionReportViewModel.cs
@@ -20,6 +20,7 @@ namespace SlnMesnac.WPF.ViewModel
     {
         private ProdPlanInfoService _prodPlanInfoService;
         private ProdPlanDetailService _prodPlanDetailService;
+        private IBaseStaffService _baseStaffService;
         private DatabaseHandleBusniess _databaseHandleBusniess;
         private ProdPLanInfo planInfo;
         private ProdPlanDetail planDetail;
@@ -44,6 +45,7 @@ namespace SlnMesnac.WPF.ViewModel
             _prodPlanDetailService = App.ServiceProvider.GetService<ProdPlanDetailService>();
             _prodPlanInfoService = App.ServiceProvider.GetService<ProdPlanInfoService>();
             _databaseHandleBusniess = App.ServiceProvider.GetService<DatabaseHandleBusniess>();
+            _baseStaffService = App.ServiceProvider.GetService<IBaseStaffService>();
             ConfirmCommand = new RelayCommand(Confirm);
             EndPlanCommand = new RelayCommand(EndPlan);
             ContinueCommand = new RelayCommand(Continue);
@@ -58,7 +60,7 @@ namespace SlnMesnac.WPF.ViewModel
 
         private void Init()
         {
-            planInfo = _prodPlanInfoService.GetPlanInfoByConditions("", "", "", RfidHandleBusniess.stationCode, "1").FirstOrDefault();
+            planInfo = _prodPlanInfoService.GetRecordStaffAttendancesByConditions("", "", "", RfidHandleBusniess.stationCode, "1").FirstOrDefault();
             if (planInfo != null)
             {
                 complateRate = GetComplateRate(Convert.ToDouble(planInfo.CompleteAmount), planInfo.PlanAmount);
@@ -161,64 +163,74 @@ namespace SlnMesnac.WPF.ViewModel
             {
                 if (EmployeeLoginViewModel.isOnDuty == true)//是否有班组当班，无当班时操作无效
                 {
-                    string newAmount = NewAmountText;
-                    RfidHandleBusniess.theNewAmount = NewAmountText;
-                    if (newAmount != "")
+                    var monitor = _databaseHandleBusniess.GetMonitor(RfidHandleBusniess.stationCode);
+                    if (monitor != null)
                     {
-                        bool isNum = true;
-                        foreach (char x in newAmount)
+                        string newAmount = NewAmountText;
+                        RfidHandleBusniess.theNewAmount = NewAmountText;
+                        if (newAmount != "")
                         {
-                            if (!char.IsNumber(x) && x != '.')
+                            bool isNum = true;
+                            foreach (char x in newAmount)
                             {
-                                isNum = false;
+                                if (!char.IsNumber(x) && x != '.')
+                                {
+                                    isNum = false;
+                                }
                             }
-                        }
-                        if (isNum)
-                        {
-                            HintText = "请撤回最新工单明细！";
-                            //将新增产量加到实际产量中
-                            currentAmountDouble = Convert.ToDouble(planInfo.CompleteAmount);
-                            newAmountDouble = Convert.ToDouble(newAmount);
-                            result = currentAmountDouble + newAmountDouble;
-                            //planDetail = new ProdPlanDetail();
-                            planDetail.CompleteAmount = newAmountDouble.ToString();
-                            planInfo.CompleteAmount = result.ToString();
-                            if (planDetail.EndTime == null)//第一条明细
+                            if (isNum)
                             {
-                                planDetail.BeginTime = ExecuteViewModel.theStartTime;
+                                HintText = "请撤回最新工单明细！";
+                                //将新增产量加到实际产量中
+                                currentAmountDouble = Convert.ToDouble(planInfo.CompleteAmount);
+                                newAmountDouble = Convert.ToDouble(newAmount);
+                                result = currentAmountDouble + newAmountDouble;
+                                //planDetail = new ProdPlanDetail();
+                                planDetail.CurrentStaffId = monitor.staffId;//取班长ID
+                                planDetail.CreatedBy = monitor.staffName;//存班长名
+                                planDetail.CompleteAmount = newAmountDouble.ToString();
+                                planInfo.CompleteAmount = result.ToString();
+                                if (planDetail.EndTime == null)//第一条明细
+                                {
+                                    planDetail.BeginTime = ExecuteViewModel.theStartTime;
+                                }
+                                else
+                                {
+                                    planDetail.BeginTime = planDetail.EndTime;
+                                }
+                                planDetail.EndTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                                ExecuteViewModel.intervalvalTime = planDetail.EndTime;
+                                planDetail.BatchNumber += 1;
+                                //ExecuteViewModel.batchNums = planDetail.BatchNumber.ToString();
+                                //保存工单的执行人员
+                                List<RecordStaffRealTime> realTimes = _databaseHandleBusniess.GetRecordStaffRealTimes();
+                                _prodPlanDetailService.Insert(planDetail);
+                                _prodPlanInfoService.Update(planInfo);
+                                _databaseHandleBusniess.InsertPlanExecuteUser(planInfo, planDetail, realTimes);
+                                Refresh();
+                                HintText = "已提交！";
+                                RefreshDelegateEvent?.Invoke(planInfo);
+                                //ExecuteViewModel.isComplete = true;
+                                complateRate = GetComplateRate(result, PlanAmountText);
+                                if (complateRate > 0.9)
+                                {
+                                    EndButtonColor = "#FF11B514";
+                                }
                             }
                             else
                             {
-                                planDetail.BeginTime = planDetail.EndTime;
-                            }
-                            planDetail.EndTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-                            ExecuteViewModel.intervalvalTime = planDetail.EndTime;
-                            planDetail.BatchNumber += 1;
-                            //ExecuteViewModel.batchNums = planDetail.BatchNumber.ToString();
-                            //保存工单的执行人员
-                            List<RecordStaffRealTime> realTimes = _databaseHandleBusniess.GetRecordStaffRealTimes();
-                            _prodPlanDetailService.Insert(planDetail);
-                            _prodPlanInfoService.Update(planInfo);
-                            _databaseHandleBusniess.InsertPlanExecuteUser(planInfo, planDetail, realTimes);
-                            Refresh();
-                            HintText = "已提交！";
-                            RefreshDelegateEvent?.Invoke(planInfo);
-                            //ExecuteViewModel.isComplete = true;
-                            complateRate = GetComplateRate(result, PlanAmountText);
-                            if (complateRate > 0.9)
-                            {
-                                EndButtonColor = "#FF11B514";
+                                //提示框提示错误信息
+                                HintText = "输入有误，请输入阿拉伯数字！";
                             }
                         }
                         else
                         {
-                            //提示框提示错误信息
-                            HintText = "输入有误，请输入阿拉伯数字！";
+                            HintText = "不能为空！";
                         }
                     }
                     else
                     {
-                        HintText = "不能为空！";
+                        HintText = "班长未打卡，无法执行此操作！";
                     }
                 }
                 else
diff --git a/SlnMesnac.WPF/appsettings.json b/SlnMesnac.WPF/appsettings.json
index 0bd2151..319ce99 100644
--- a/SlnMesnac.WPF/appsettings.json
+++ b/SlnMesnac.WPF/appsettings.json
@@ -14,7 +14,7 @@
       {
         "configId": "mes",
         "dbType": 1,
-        "connStr": "server=119.45.202.115;uid=sa;pwd=haiwei@123;database=xmxs_os"
+        "connStr": "server=119.45.202.115;uid=sa;pwd=haiwei@123;database=xmxs_os;Encrypt=True;TrustServerCertificate=True;"
       }
       //{
       //  "configId": "mcs",