yinq
/
Sln.Mesnac.PayCalculationSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change -显示明细表的执行班长，添加下班或者强退时在执行人员表中给相应人插入下班时间

Browse Source
main
启龙 曹 9 months ago
parent 0d12ea58db 9665fc56eb
commit 56801a2176
15 changed files with 260 additions and 87 deletions
Show Stats Download Patch File Download Diff File

24
SlnMesnac.Business/business/DatabaseHandleBusniess.cs
Unescape Escape View File

@ -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>

16
SlnMesnac.Business/business/RfidHandleBusniess.cs
Unescape Escape View File

@ -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;
_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);
}
}
}

30
SlnMesnac.Model/domain/MonitorInfo.cs
Unescape Escape View File

@ -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; }
}
}

6
SlnMesnac.Model/domain/ProdPlanExecuteUser.cs
Unescape Escape View File

@ -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; }
}
}

1
SlnMesnac.Repository/SlnMesnac.Repository.csproj
Unescape Escape View File

@ -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>

7
SlnMesnac.Repository/service/IRecordStaffRealTimeService.cs
Unescape Escape View File

@ -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);
}
}

5
SlnMesnac.Repository/service/Impl/BaseStaffServiceImpl.cs
Unescape Escape View File

@ -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;

20
SlnMesnac.Repository/service/Impl/ProdPlanExecuteUserServiceImpl.cs
Unescape Escape View File

@ -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;
}
}
}

19
SlnMesnac.Repository/service/Impl/RecordStaffRealTimeServiceImpl.cs
Unescape Escape View File

@ -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;
}
}
}

8
SlnMesnac.Repository/service/ProdPlanExecuteUserService.cs
Unescape Escape View File

@ -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);
}
}

15
SlnMesnac.WPF/UserControls/ExecutePage.xaml
Unescape Escape View File

@ -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}">

73
SlnMesnac.WPF/ViewModel/EmployeeLoginViewModel.cs
Unescape Escape View File

@ -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,33 +368,7 @@ 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 == "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;
@ -405,7 +381,46 @@ namespace SlnMesnac.WPF.ViewModel
{
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
{

17
SlnMesnac.WPF/ViewModel/ExecuteViewModel.cs
Unescape Escape View File

@ -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();

14
SlnMesnac.WPF/ViewModel/ProductionReportViewModel.cs
Unescape Escape View File

@ -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);
@ -160,6 +162,9 @@ namespace SlnMesnac.WPF.ViewModel
if ((DateTime.Now - startTime).TotalMinutes > 15)
{
if (EmployeeLoginViewModel.isOnDuty == true)//是否有班组当班，无当班时操作无效
{
var monitor = _databaseHandleBusniess.GetMonitor(RfidHandleBusniess.stationCode);
if (monitor != null)
{
string newAmount = NewAmountText;
RfidHandleBusniess.theNewAmount = NewAmountText;
@ -181,6 +186,8 @@ namespace SlnMesnac.WPF.ViewModel
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)//第一条明细
@ -222,6 +229,11 @@ namespace SlnMesnac.WPF.ViewModel
}
}
else
{
HintText = "班长未打卡，无法执行此操作！";
}
}
else
{
HintText = "没有班组当班，无法执行此操作！";
}

2
SlnMesnac.WPF/appsettings.json
Unescape Escape View File

@ -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",

Write Preview
Loading…
Cancel
Save