diff --git a/SlnMesnac.WPF/ViewModel/ExecuteViewModel.cs b/SlnMesnac.WPF/ViewModel/ExecuteViewModel.cs
index 7df3538..cfe7914 100644
--- a/SlnMesnac.WPF/ViewModel/ExecuteViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/ExecuteViewModel.cs
@@ -358,6 +358,15 @@ namespace SlnMesnac.WPF.ViewModel
StationTextBox = EmployeeLoginViewModel.stationName;
}
+ ///
+ /// 更新工位名称
+ ///
+ ///
+ private void updateStationName(string stationName)
+ {
+ StationTextBox = EmployeeLoginViewModel.stationName;
+ }
+
///
/// 换班弹窗
///
diff --git a/SlnMesnac.WPF/ViewModel/ProductionReportViewModel.cs b/SlnMesnac.WPF/ViewModel/ProductionReportViewModel.cs
index b00ee15..7bad1e2 100644
--- a/SlnMesnac.WPF/ViewModel/ProductionReportViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/ProductionReportViewModel.cs
@@ -58,7 +58,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);