From 61a02092690d505f0f5d2b338a40f18e0b1a5bc7 Mon Sep 17 00:00:00 2001
From: thuannd88 <Admin@DESKTOP-FIVUAQ9>
Date: Fri, 4 Oct 2024 18:15:50 +0700
Subject: [PATCH] =?UTF-8?q?m=C3=A1y=20in=20l=E1=BB=97i=20->=20d=E1=BB=ABng?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 UserControl/DepositSMUCv2.xaml.cs | 97 +++++++++++++++++--------------
 UserControl/ErrorUC.xaml          |  2 +-
 appsettings.json                  |  2 +-
 3 files changed, 55 insertions(+), 46 deletions(-)

diff --git a/UserControl/DepositSMUCv2.xaml.cs b/UserControl/DepositSMUCv2.xaml.cs
index 6ae6aa6..2d65964 100644
--- a/UserControl/DepositSMUCv2.xaml.cs
+++ b/UserControl/DepositSMUCv2.xaml.cs
@@ -402,8 +402,8 @@ namespace SafeBagDE70
                     GetCDMStatus();
                     AppData.GetandExecuteCommands();
 
-                    AppData.DeviceStatus.Description = AppData.CDMSTATE.CDMStatus;
-                    AppData.DeviceStatus.DeviceTime = DateTime.Now;
+                    
+                    //AppData.DeviceStatus.DeviceTime = DateTime.Now;
                     APIModels.SendHealthCheck(AppData.DeviceStatus);
                 }
                 if (countSensorTimer%5==0)
@@ -435,15 +435,18 @@ namespace SafeBagDE70
                 {
                     AppData.CDMSTATE.CDMStatus = "CDM: LỖI KẾT NỐI";
                     AppData.DeviceStatus.CDMStatus = (int)CDMStatusCode.DISCONNECT_SERIALPORT;
+                    AppData.DeviceStatus.Description = AppData.CDMSTATE.CDMStatus;
                 }
                 else if (AppData.cCmdRsp.recv_dat.dat[1]==0x1C)
                 {
                     AppData.CDMSTATE.CDMStatus = "CDM: LỖI INITIALIZATION ERROR";
                     AppData.DeviceStatus.CDMStatus = (int)CDMStatusCode.ERROR;
+                    AppData.DeviceStatus.Description = AppData.CDMSTATE.CDMStatus;
                 }    
                 else
                 {
                     AppData.DeviceStatus.CDMStatus = (int)CDMStatusCode.NORMAL;
+                    AppData.DeviceStatus.Description = AppData.CDMSTATE.CDMStatus;
                 }
                 if (AppData.DeviceStatus.CDMStatus != prevCDMState)
                 {
@@ -473,57 +476,63 @@ namespace SafeBagDE70
 
         private void GetPrinterStatus()
         {
-            var status = printerManager.GetStatus();
- 
-            var strPrinterMessage = "";
-
-            if (status != null)
+            if(!AppData.IsInTransaction)
             {
-                bool StsNOPAPER = status.StsNOPAPER;
-                bool StsNEARENDPAP =  status.StsNEARENDPAP;
-                if (StsNOPAPER || (StsNEARENDPAP && AppData.IsStopPrinting()))
+                var status = printerManager.GetStatus();
+                var strPrinterMessage = "";
+
+                if (status != null)
                 {
-                    AppData.DeviceStatus.PrinterStatus = (int)PrinterStatusCode.PAPEROUT;
-                    StopTimers();
-                    strPrinterMessage = "MÁY IN:  HẾT GIẤY! ĐỀ NGHỊ THAY GIẤY";
-                    ShowError(strPrinterMessage);
-                    AppData.ADMINDEVICESTATUS.PrinterStatus = strPrinterMessage;
+                    bool StsNOPAPER = status.StsNOPAPER;
+                    bool StsNEARENDPAP = status.StsNEARENDPAP;
+                    if (StsNOPAPER || (StsNEARENDPAP && AppData.IsStopPrinting()))
+                    {
+                        AppData.DeviceStatus.PrinterStatus = (int)PrinterStatusCode.PAPEROUT;
+                        StopTimers();
+                        strPrinterMessage = "MÁY IN:  HẾT GIẤY! ĐỀ NGHỊ THAY GIẤY";
+                        ShowError(strPrinterMessage);
+                        AppData.ADMINDEVICESTATUS.PrinterStatus = strPrinterMessage;
+                    }
+                    else if (StsNEARENDPAP)
+                    {
+                        AppData.UpdatePrinterStatus(true);
+                        strPrinterMessage = "MÁY IN:  GẦN HẾT GIẤY";
+                        AppData.DeviceStatus.PrinterStatus = (int)PrinterStatusCode.NEARPAPEROUT;
+                        AppData.ADMINDEVICESTATUS.PrinterStatus = strPrinterMessage;
+                    }
+                    else if (status.StsPAPERJAM || status.StsCUTERROR || status.StsOVERTEMP)
+                    {
+                        strPrinterMessage = "MÁY IN:  LỖI";
+                        AppData.DeviceStatus.PrinterStatus = (int)PrinterStatusCode.ERROR;
+                        AppData.ADMINDEVICESTATUS.PrinterStatus = strPrinterMessage;
+                    }
+                    else
+                    {
+                        AppData.UpdatePrinterStatus(false);
+                        strPrinterMessage = "MÁY IN:  OK";
+                        AppData.DeviceStatus.PrinterStatus = (int)PrinterStatusCode.NORMAL;
+                        AppData.ADMINDEVICESTATUS.PrinterStatus = strPrinterMessage;
+                    }
                 }
-                else if (StsNEARENDPAP)
-                {
-                    AppData.UpdatePrinterStatus(true);
-                    strPrinterMessage = "MÁY IN:  GẦN HẾT GIẤY";
-                    AppData.DeviceStatus.PrinterStatus = (int)PrinterStatusCode.NEARPAPEROUT;
-                    AppData.ADMINDEVICESTATUS.PrinterStatus = strPrinterMessage;
-                }
-                else if (status.StsPAPERJAM || status.StsCUTERROR || status.StsOVERTEMP)
+                else
                 {
                     strPrinterMessage = "MÁY IN:  LỖI";
                     AppData.DeviceStatus.PrinterStatus = (int)PrinterStatusCode.ERROR;
                     AppData.ADMINDEVICESTATUS.PrinterStatus = strPrinterMessage;
                 }
-                else
+                if (AppData.DeviceStatus.PrinterStatus != prevPrinterStatus)
                 {
-                    AppData.UpdatePrinterStatus(false);
-
-                    strPrinterMessage = "MÁY IN:  OK";
-                    AppData.DeviceStatus.PrinterStatus = (int)PrinterStatusCode.NORMAL;
-                    AppData.ADMINDEVICESTATUS.PrinterStatus = strPrinterMessage;
-                }    
-            }
-            else
-            {
-                strPrinterMessage = "MÁY IN:  LỖI";
-                AppData.DeviceStatus.PrinterStatus = (int)PrinterStatusCode.ERROR;
-                AppData.ADMINDEVICESTATUS.PrinterStatus = strPrinterMessage;
-            }
-            if (AppData.DeviceStatus.PrinterStatus != prevPrinterStatus)
-            {
-                Log.Information(strPrinterMessage);
-                AppData.DeviceStatus.Description = strPrinterMessage;
-                APIModels.SendEvent(AppData.DeviceStatus);
-                prevPrinterStatus = AppData.DeviceStatus.PrinterStatus;
-            }
+                    if (AppData.DeviceStatus.PrinterStatus == (int)PrinterStatusCode.ERROR)
+                    {
+                        StopTimers();
+                        ShowError(strPrinterMessage);
+                    }
+                    Log.Information(strPrinterMessage);
+                    AppData.DeviceStatus.Description = strPrinterMessage;
+                    APIModels.SendEvent(AppData.DeviceStatus);
+                    prevPrinterStatus = AppData.DeviceStatus.PrinterStatus;
+                }
+            }    
         }
 
         Stopwatch watch = new Stopwatch();
diff --git a/UserControl/ErrorUC.xaml b/UserControl/ErrorUC.xaml
index 82cfb43..f091e2c 100644
--- a/UserControl/ErrorUC.xaml
+++ b/UserControl/ErrorUC.xaml
@@ -12,7 +12,7 @@
         <TextBlock x:Name="lblError" FontSize="30" TextWrapping="Wrap" FontWeight="Bold" Foreground="Blue" HorizontalAlignment="Center"/>
         <Separator/>
         <Grid Margin="10">
-            <Button x:Name="btnRetry" Click="btnRetry_Click" Grid.Column="0"  Content="THỬ LẠI" Height="50"/>
+            <Button x:Name="btnRetry" Click="btnRetry_Click" Grid.Column="0"  Content="THỬ LẠI" Height="50" Visibility="Collapsed"/>
         </Grid>
     </StackPanel>
 </UserControl>
diff --git a/appsettings.json b/appsettings.json
index 48816be..62ae404 100644
--- a/appsettings.json
+++ b/appsettings.json
@@ -4,7 +4,7 @@
       {
         "Name": "File",
         "Args": {
-          "path": "F:\\logs\\log_.txt",
+          "path": "D:\\logs\\log_.txt",
           "rollingInterval": "Day"
         }
       }