add resetAbnormal Error

This commit is contained in:
Nguyen Dinh Thuan
2024-10-22 16:09:11 +07:00
parent d31c530392
commit d0abb5cca6
3 changed files with 48 additions and 9 deletions
+26 -1
View File
@@ -100,7 +100,32 @@ namespace SafeBagDE70.Admin
private void btnSoftImportantError_Click(object sender, RoutedEventArgs e) 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 = "";
});
});
}
}
} }
} }
} }
-1
View File
@@ -743,7 +743,6 @@ namespace SafeBagDE70
break; break;
} }
Thread.Sleep(1000); Thread.Sleep(1000);
cCmdRsp.SendXXCmd((byte)Command.CMD_DE_CNTSTART); cCmdRsp.SendXXCmd((byte)Command.CMD_DE_CNTSTART);
Thread.Sleep(1000); Thread.Sleep(1000);
+22 -7
View File
@@ -77,9 +77,13 @@ namespace SafeBagDE70
CCmdRsp cCmdRsp = null; CCmdRsp cCmdRsp = null;
bool bInitialized = false; bool bInitialized = false;
bool bOpenPort = true; bool bOpenPort = true;
bool bIsMaintain = false; bool bIsMaintain = false;
MainWindow mainWindow = null; MainWindow mainWindow = null;
Task taskCounting = null; Task taskCounting = null;
bool isSensorActivated = false;
bool isPrinterActivated = false;
public DepositSMUCv2() public DepositSMUCv2()
{ {
InitializeComponent(); InitializeComponent();
@@ -152,7 +156,10 @@ namespace SafeBagDE70
private bool InitSerialPorts() private bool InitSerialPorts()
{ {
var bInitDE70=InitSerialPortDE70(); var bInitDE70=InitSerialPortDE70();
var bInitSensor = InitSerialPortSensor();
if(isSensorActivated)
InitSerialPortSensor();
if (bInitDE70) if (bInitDE70)
return true; return true;
else else
@@ -398,7 +405,9 @@ namespace SafeBagDE70
{ {
if (countSensorTimer % 10 == 0) if (countSensorTimer % 10 == 0)
{ {
GetPrinterStatus(); if(isPrinterActivated)
GetPrinterStatus();
GetCDMStatus(); GetCDMStatus();
AppData.GetandExecuteCommands(); AppData.GetandExecuteCommands();
@@ -416,7 +425,9 @@ namespace SafeBagDE70
} }
countSensorTimer++; countSensorTimer++;
sensorTimer.IsEnabled = false; sensorTimer.IsEnabled = false;
GetSensorValue();
if (isSensorActivated)
GetSensorValue();
sensorTimer.IsEnabled = true; sensorTimer.IsEnabled = true;
} }
catch (Exception ex) catch (Exception ex)
@@ -1300,13 +1311,17 @@ namespace SafeBagDE70
SyncData(data2Send);//Lưu CSDL và đồng bộ SyncData(data2Send);//Lưu CSDL và đồng bộ
//Reset all and ready to next session //Reset all and ready to next session
if (printerFlag == true) if (isPrinterActivated)
{ {
if (double.Parse(totalValue) > 0) if (printerFlag == true)
PrintReceipt(); {
printerFlag = false; 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" 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" + $"SỐ LƯỢNG TỜ: {totalQuantity}\r\n"