diff --git a/Admin/UserManageUC.xaml.cs b/Admin/UserManageUC.xaml.cs index 51099ad..ba97795 100644 --- a/Admin/UserManageUC.xaml.cs +++ b/Admin/UserManageUC.xaml.cs @@ -50,29 +50,9 @@ namespace SafeBagDE70.Admin } else { - var amCustomers = await APIModels.GetAeonMallCustomers(AppData.TenantId); - using (var context = new CDMDbContext()) - { - var customers = context.Customers; - context.Customers.RemoveRange(customers); - context.SaveChanges(); - foreach (var amCustomer in amCustomers) - { - var customer = new Customer - { - AccountNumber = amCustomer.TenantCode, - AccountHolder = amCustomer.TenantName, - TenantName = amCustomer.TenantShortName, - TenantCode = amCustomer.TenantCode, - PinCode = amCustomer.TenantCode, - UpdatedTime = DateTime.Now, - }; - customers.Add(customer); - } - context.SaveChanges(); - } + int nUpdatedCustomers=await AppData.UpdateCustomers(); lblStatus.Foreground = new SolidColorBrush(Colors.Green); - lblStatus.Content = "Updated customers: " + amCustomers.Count; + lblStatus.Content = "Updated customers: " + nUpdatedCustomers; } AppData.InitUsers(); } diff --git a/AppData.cs b/AppData.cs index 6ec0150..2afc816 100644 --- a/AppData.cs +++ b/AppData.cs @@ -347,9 +347,20 @@ namespace SafeBagDE70 bResult = ResetCDMCounter(); } break; + case 3: + if(IsInternetOk && !IsInTransaction) + { + Log.Information("Request update Customers"); + int nCount = await UpdateCustomers(); + Log.Information($"Updated {nCount} users"); + InitUsers(); + if (nCount > 0) bResult = true; + } + break; } // - await APIModels.UpdateDeviceCommand(command.Id, bResult?1:-1); + if(bResult) + await APIModels.UpdateDeviceCommand(command.Id, bResult?1:0); } } } @@ -369,6 +380,39 @@ namespace SafeBagDE70 Log.Error("GetandExecuteCommands error: "+str); } } + public static async Task UpdateCustomers() + { + try + { + var amCustomers = await APIModels.GetAeonMallCustomers(AppData.TenantId); + using (var context = new CDMDbContext()) + { + var customers = context.Customers; + context.Customers.RemoveRange(customers); + context.SaveChanges(); + foreach (var amCustomer in amCustomers) + { + var customer = new Customer + { + AccountNumber = amCustomer.TenantCode, + AccountHolder = amCustomer.TenantName, + TenantName = amCustomer.TenantShortName, + TenantCode = amCustomer.TenantCode, + PinCode = amCustomer.TenantCode, + UpdatedTime = DateTime.Now, + }; + customers.Add(customer); + } + context.SaveChanges(); + } + return amCustomers.Count(); + } + catch(Exception ex) + { + + } + return 0; + } public static bool ResetCDMCounter() { bool bResetOk = false; diff --git a/DepositSMUCv2.xaml.cs b/DepositSMUCv2.xaml.cs index 1e656c7..91109cd 100644 --- a/DepositSMUCv2.xaml.cs +++ b/DepositSMUCv2.xaml.cs @@ -659,7 +659,19 @@ namespace SafeBagDE70 //TempNote[1] ++; noteVal = cCmdRsp.recv_dat.dat[17]; Log.Information($"Serial Value: {noteVal}"); - UpdateCountSession(countSession, noteVal); + switch (noteVal) + { + case 0x00: countSession.QuantityDenomi[0]++; break; + case 0x01: countSession.QuantityDenomi[1]++; break; + case 0x02: countSession.QuantityDenomi[2]++; break; + case 0x03: countSession.QuantityDenomi[3]++; break; + case 0x04: countSession.QuantityDenomi[4]++; break; + case 0x05: countSession.QuantityDenomi[5]++; break; + case 0x06: countSession.QuantityDenomi[6]++; break; + case 0x07: countSession.QuantityDenomi[7]++; break; + case 0x08: countSession.QuantityDenomi[8]++; break; + case 0x09: countSession.QuantityDenomi[9]++; break; + } break; case 0x03: countSession.TempNotes[2]++; break; case 0x0b: countSession.TempNotes[3]++; break; @@ -750,27 +762,27 @@ namespace SafeBagDE70 string currentMethod = MethodBase.GetCurrentMethod().Name; try { - if(bOpenPort) - { - serialPortDE70.DiscardInBuffer(); - serialPortDE70.DiscardOutBuffer(); - - cCmdRsp.SendXXCmd((byte)Command.CMD_DE_CNTSTART); - //if (cCmdRsp.recv_dat != null && cCmdRsp.recv_dat.dat[2] != 43) { - //} - - //do - //{ - // serialPortDE70.DiscardInBuffer(); - // serialPortDE70.DiscardOutBuffer(); - // cCmdRsp.SendXXCmd((byte)Command.CMD_SENSE); - //} - //while (cCmdRsp.recv_dat != null && cCmdRsp.recv_dat.dat[1] == 0x09); //SR2 = 0x09 : Counting Status - } - - taskCounting = Task.Run(() => { + if (bOpenPort) + { + serialPortDE70.DiscardInBuffer(); + serialPortDE70.DiscardOutBuffer(); + + cCmdRsp.SendXXCmd((byte)Command.CMD_DE_CNTSTART); + if (cCmdRsp.recv_dat != null && cCmdRsp.recv_dat.dat[2] != 43) + { + } + + do + { + serialPortDE70.DiscardInBuffer(); + serialPortDE70.DiscardOutBuffer(); + cCmdRsp.SendXXCmd((byte)Command.CMD_SENSE); + } + while (cCmdRsp.recv_dat != null && cCmdRsp.recv_dat.dat[1] == 0x09); //SR2 = 0x09 : Counting Status + } + var str = "BEFORE COUNT"; str+="\r\nSTORED: "+ GetQuantityFromSessions(sessions,true); str += "\r\nSTACKER: " + GetQuantityFromSessions(sessions, false); @@ -790,8 +802,6 @@ namespace SafeBagDE70 APIModels.SendEvent(AppData.DeviceStatus); }); - - } catch (Exception ex) {