From d0abb5cca6d328fef605c771d73a8f5e26c7a518 Mon Sep 17 00:00:00 2001 From: Nguyen Dinh Thuan Date: Tue, 22 Oct 2024 16:09:11 +0700 Subject: [PATCH] add resetAbnormal Error --- Admin/AdminConfigurationUC.xaml.cs | 27 ++++++++++++++++++++++++++- AppData.cs | 1 - UserControl/DepositSMUCv2.xaml.cs | 29 ++++++++++++++++++++++------- 3 files changed, 48 insertions(+), 9 deletions(-) diff --git a/Admin/AdminConfigurationUC.xaml.cs b/Admin/AdminConfigurationUC.xaml.cs index 44014f0..69af356 100644 --- a/Admin/AdminConfigurationUC.xaml.cs +++ b/Admin/AdminConfigurationUC.xaml.cs @@ -100,7 +100,32 @@ namespace SafeBagDE70.Admin private void btnSoftImportantError_Click(object sender, RoutedEventArgs e) { - + var state = AppData.GetCDMState(); + if(state.IsNotesInEscrow>0|| + state.IsNotesInRejectPocket>0|| + state.IsNotesInHopper>0) + { + lblCounterStatus.Text = "Vẫn còn tiền trong máy, đề nghị lấy tiền ra khỏi các ngăn và kiểm tra tiền kẹt"; + } + else + { + Log.Information("[ADMIN] Reset CDM Error"); + var bSuccess = AppData.ResetAbnormalStorage605(); + if(bSuccess) + { + Log.Information("[ADMIN] Reset CDM AbnormalStorage successfully"); + lblCounterStatus.Text = "Reset lỗi thành công"; + ((MainWindow)Application.Current.MainWindow).ShowWelcomeScreen(); + Task.Run(() => + { + Thread.Sleep(10000); + Dispatcher.Invoke(() => + { + lblCounterStatus.Text = ""; + }); + }); + } + } } } } diff --git a/AppData.cs b/AppData.cs index e4fbca9..aa4ff49 100644 --- a/AppData.cs +++ b/AppData.cs @@ -743,7 +743,6 @@ namespace SafeBagDE70 break; } - Thread.Sleep(1000); cCmdRsp.SendXXCmd((byte)Command.CMD_DE_CNTSTART); Thread.Sleep(1000); diff --git a/UserControl/DepositSMUCv2.xaml.cs b/UserControl/DepositSMUCv2.xaml.cs index 9f0048e..d7eecb0 100644 --- a/UserControl/DepositSMUCv2.xaml.cs +++ b/UserControl/DepositSMUCv2.xaml.cs @@ -77,9 +77,13 @@ namespace SafeBagDE70 CCmdRsp cCmdRsp = null; bool bInitialized = false; bool bOpenPort = true; + bool bIsMaintain = false; MainWindow mainWindow = null; Task taskCounting = null; + + bool isSensorActivated = false; + bool isPrinterActivated = false; public DepositSMUCv2() { InitializeComponent(); @@ -152,7 +156,10 @@ namespace SafeBagDE70 private bool InitSerialPorts() { var bInitDE70=InitSerialPortDE70(); - var bInitSensor = InitSerialPortSensor(); + + if(isSensorActivated) + InitSerialPortSensor(); + if (bInitDE70) return true; else @@ -398,7 +405,9 @@ namespace SafeBagDE70 { if (countSensorTimer % 10 == 0) { - GetPrinterStatus(); + if(isPrinterActivated) + GetPrinterStatus(); + GetCDMStatus(); AppData.GetandExecuteCommands(); @@ -416,7 +425,9 @@ namespace SafeBagDE70 } countSensorTimer++; sensorTimer.IsEnabled = false; - GetSensorValue(); + + if (isSensorActivated) + GetSensorValue(); sensorTimer.IsEnabled = true; } catch (Exception ex) @@ -1300,13 +1311,17 @@ namespace SafeBagDE70 SyncData(data2Send);//Lưu CSDL và đồng bộ //Reset all and ready to next session - if (printerFlag == true) + if (isPrinterActivated) { - if (double.Parse(totalValue) > 0) - PrintReceipt(); - printerFlag = false; + if (printerFlag == true) + { + if (double.Parse(totalValue) > 0) + PrintReceipt(); + printerFlag = false; + } } + String strNotify = $"BẠN VỪA THỰC HIỆN NỘP TIỀN VÀO MÁY CDM:\r\n" + $"SỐ LƯỢNG TỜ: {totalQuantity}\r\n"