diff --git a/SlnMesnac.Business/business/DatabaseHandleBusniess.cs b/SlnMesnac.Business/business/DatabaseHandleBusniess.cs index 3e0c41e..a3369fb 100644 --- a/SlnMesnac.Business/business/DatabaseHandleBusniess.cs +++ b/SlnMesnac.Business/business/DatabaseHandleBusniess.cs @@ -131,12 +131,12 @@ namespace SlnMesnac.Business.business } /// - /// 查询所有工单执行人员信息 + /// 查询某工位所有工单执行人员信息 /// /// - public List GetRecordStaffRealTimes() + public List GetRecordStaffRealTimes(string stationCode) { - var list = _recordStaffRealTimeService.Query(); + var list = _recordStaffRealTimeService.Query().Where(x => x.StationCode == stationCode).ToList(); return list; } diff --git a/SlnMesnac.Business/business/RfidHandleBusniess.cs b/SlnMesnac.Business/business/RfidHandleBusniess.cs index 43cea51..ea015a7 100644 --- a/SlnMesnac.Business/business/RfidHandleBusniess.cs +++ b/SlnMesnac.Business/business/RfidHandleBusniess.cs @@ -101,7 +101,8 @@ namespace SlnMesnac.Business.business StartWorkTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), Remark = staff.Remark, CreateBy = staff.StaffName, - CreateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + CreateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), + StationCode = stationCode }; _recordStaffCommuteService.Insert(recordStaffCommute); } diff --git a/SlnMesnac.Model/domain/RecordStaffCommute.cs b/SlnMesnac.Model/domain/RecordStaffCommute.cs index a8bd6d5..ac00bb2 100644 --- a/SlnMesnac.Model/domain/RecordStaffCommute.cs +++ b/SlnMesnac.Model/domain/RecordStaffCommute.cs @@ -94,5 +94,11 @@ namespace SlnMesnac.Model.domain /// [SugarColumn(ColumnName = "machine_code")] public string MachineCode { get; set; } + + /// + /// 工位编号 + /// + [SugarColumn(ColumnName = "station_code")] + public string StationCode { get; set; } } } diff --git a/SlnMesnac.WPF/ViewModel/ProductionReportViewModel.cs b/SlnMesnac.WPF/ViewModel/ProductionReportViewModel.cs index 26a4bcf..2882f7d 100644 --- a/SlnMesnac.WPF/ViewModel/ProductionReportViewModel.cs +++ b/SlnMesnac.WPF/ViewModel/ProductionReportViewModel.cs @@ -229,7 +229,7 @@ namespace SlnMesnac.WPF.ViewModel planDetail.BatchNumber += 1; // 保存数据 - var realTimes = _databaseHandleBusniess.GetRecordStaffRealTimes(); + var realTimes = _databaseHandleBusniess.GetRecordStaffRealTimes(planInfo.StationCode); _prodPlanDetailService.Insert(planDetail); _prodPlanInfoService.Update(planInfo); _databaseHandleBusniess.InsertPlanExecuteUser(planInfo, planDetail, realTimes);