合并

SlnMesnac.WPF/ViewModel/ExecuteViewModel.cs

@@ -358,6 +358,15 @@ namespace SlnMesnac.WPF.ViewModel
             StationTextBox = EmployeeLoginViewModel.stationName;
         }
 
+        /// <summary>
+        /// 更新工位名称
+        /// </summary>
+        /// <param name="stationName"></param>
+        private void updateStationName(string stationName)
+        {
+            StationTextBox = EmployeeLoginViewModel.stationName;
+        }
+
         /// <summary>
         /// 换班弹窗
         /// </summary>

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