From 48b20ad274bab1608ff4cf5ac598b34f968eb1b7 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Wed, 13 Aug 2025 16:48:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=BA=E9=80=80=E5=BC=82=E5=B8=B8=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/RfidHandleBusniess.cs            |  4 +-
 .../ViewModel/EmployeeLoginViewModel.cs       | 71 ++++++++++---------
 SlnMesnac.WPF/appsettings.json                | 10 ++-
 3 files changed, 48 insertions(+), 37 deletions(-)

diff --git a/SlnMesnac.Business/business/RfidHandleBusniess.cs b/SlnMesnac.Business/business/RfidHandleBusniess.cs
index ea015a7..3450a2a 100644
--- a/SlnMesnac.Business/business/RfidHandleBusniess.cs
+++ b/SlnMesnac.Business/business/RfidHandleBusniess.cs
@@ -91,7 +91,7 @@ namespace SlnMesnac.Business.business
         /// </summary>
         public void HandleStaffCommute(BaseStaffInfo staff, int isCheckOn)
         {
-            if(isCheckOn == 0)
+/*            if(isCheckOn == 0)
             {
                 RecordStaffCommute recordStaffCommute = new RecordStaffCommute
                 {
@@ -115,7 +115,7 @@ namespace SlnMesnac.Business.business
                 recordStaffCommute.EndWorkTime = currentTime;
                 recordStaffCommute.ClockingRatio = Convert.ToDecimal((DateTime.Parse(recordStaffCommute.EndWorkTime) - DateTime.Parse(recordStaffCommute.StartWorkTime)).TotalHours);
                 _recordStaffCommuteService.Update(recordStaffCommute);
-            }           
+            }*/           
         }
 
         /// <summary>
diff --git a/SlnMesnac.WPF/ViewModel/EmployeeLoginViewModel.cs b/SlnMesnac.WPF/ViewModel/EmployeeLoginViewModel.cs
index a4970b3..dc221e7 100644
--- a/SlnMesnac.WPF/ViewModel/EmployeeLoginViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/EmployeeLoginViewModel.cs
@@ -316,39 +316,46 @@ namespace SlnMesnac.WPF.ViewModel
         /// </summary>
         private void Remove(string staffId)
         {
-            MainWindowViewModel.wins = 2;
-            if (isUse == false)
-            {               
-                var removeConfirmWin = new RemoveConfirmWin();
-                removeConfirmWin.Owner = Application.Current.MainWindow;
-                removeConfirmWin.WindowStartupLocation = WindowStartupLocation.CenterOwner;
-                removeConfirmWin.ShowDialog();
-                if (RemoveConfirmViewModel.times == 1)
-                {
-                    var theUser = baseStaffService.GetStaffInfoByStaffId(staffId);
-                    _rfidHandleBusniess.HandleAndInsertRemove(theUser, 2);//在打卡记录表里记录强退
-                    var list = _rfidHandleBusniess.HandleAndInsertStaffRealTime(theUser, 2);
-                    if (list.Count>=0)
-                    {
-                        System.Windows.Application.Current.Dispatcher.Invoke((Action)(async () =>
-                        {
-                            RecordStaffRealTimeDataGrid.Clear();
-                            list.ForEach(item => { RecordStaffRealTimeDataGrid.Add(item); });
-                        }));
-                        _rfidHandleBusniess.HandleStaffCommute(user, 1);
-                    }
-                    if(list.Count == 0)
-                    {
-                        isOnDuty = false;
-                        isSelectedStationCode = false;
-                    }
-                }
-                TransmitUserDelegateEvent?.Invoke();
-                EmployeeLoginViewModel._transmitToRemoveConfigAction -= _transmitToRemoveConfigAction;
-            }
-            else
+            try
             {
-                MessageBox.Show("正在打卡不能强退！");
+                MainWindowViewModel.wins = 2;
+                if (isUse == false)
+                {
+                    var removeConfirmWin = new RemoveConfirmWin();
+                    removeConfirmWin.Owner = Application.Current.MainWindow;
+                    removeConfirmWin.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+                    removeConfirmWin.ShowDialog();
+                    if (RemoveConfirmViewModel.times == 1)
+                    {
+                        var theUser = baseStaffService.GetStaffInfoByStaffId(staffId);
+                        _rfidHandleBusniess.HandleAndInsertRemove(theUser, 2);//在打卡记录表里记录强退
+                        var list = _rfidHandleBusniess.HandleAndInsertStaffRealTime(theUser, 2);
+                        if (list.Count >= 0)
+                        {
+                            System.Windows.Application.Current.Dispatcher.Invoke((Action)(async () =>
+                            {
+                                RecordStaffRealTimeDataGrid.Clear();
+                                list.ForEach(item => { RecordStaffRealTimeDataGrid.Add(item); });
+                            }));
+                            _rfidHandleBusniess.HandleStaffCommute(user, 1);
+                        }
+                        if (list.Count == 0)
+                        {
+                            isOnDuty = false;
+                            isSelectedStationCode = false;
+                        }
+                    }
+                    TransmitUserDelegateEvent?.Invoke();
+                    EmployeeLoginViewModel._transmitToRemoveConfigAction -= _transmitToRemoveConfigAction;
+                }
+                else
+                {
+                    MessageBox.Show("正在打卡不能强退！");
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError($"强退异常:{ex.Message}");
             }
         }
 
diff --git a/SlnMesnac.WPF/appsettings.json b/SlnMesnac.WPF/appsettings.json
index 0a7fe82..3cc5827 100644
--- a/SlnMesnac.WPF/appsettings.json
+++ b/SlnMesnac.WPF/appsettings.json
@@ -66,9 +66,13 @@
         // "DeviceCode": "XMGR0004",
         // "ProcessCode": "1002",
         // "ProductLineName": "压延一工位"
-        "StationCode": "1023-硫化十一工位",
+        //"StationCode": "1023-硫化十一工位",
+        //"DeviceCode": "XMGR0030",
+        //"ProcessCode": "1020",
+        //"ProductLineName": "硫化十一工位"
+        "StationCode": "1022-硫化三工位",
         "DeviceCode": "XMGR0030",
-        "ProcessCode": "1023",
-        "ProductLineName": "硫化十一工位"
+        "ProcessCode": "1020",
+        "ProductLineName": "硫化三工位"
     }
 }