diff --git a/DepositSMUCv2.xaml.cs b/DepositSMUCv2.xaml.cs index e2588ed..ef42383 100644 --- a/DepositSMUCv2.xaml.cs +++ b/DepositSMUCv2.xaml.cs @@ -653,27 +653,30 @@ namespace SafeBagDE70 Log.Information($"Serial Idx: {get_num}/{seri_num}"); ret = cCmdRsp.SendGetSerial(get_num); Log.Information($"Serial Status: {cCmdRsp.recv_dat.dat[18]}"); - + byte noteVal = 0; switch (cCmdRsp.recv_dat.dat[18]) { - case 0x00: countSession.TempNotes[0]++;break; + case 0x00: + countSession.TempNotes[0]++; + try + { + Log.Information(cCmdRsp.GetRecvDat()); + if (cCmdRsp.recv_dat.leng > 17) + { + // noteVal = cCmdRsp.recv_dat.dat[17]; + // UpdateCountSession(countSession, noteVal); + } + } + catch(Exception ex) + { + Log.Error(ex, "Serial Status= 0x00"); + } + break; case 0x02: //TempNote[1] ++; - Log.Information($"Serial Value: {cCmdRsp.recv_dat.dat[17]}"); - switch (cCmdRsp.recv_dat.dat[17]) - { - 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; - - } + noteVal = cCmdRsp.recv_dat.dat[17]; + Log.Information($"Serial Value: {noteVal}"); + UpdateCountSession(countSession, noteVal); break; case 0x03: countSession.TempNotes[2]++; break; case 0x0b: countSession.TempNotes[3]++; break; @@ -710,8 +713,24 @@ namespace SafeBagDE70 return 0; } - - + private static void UpdateCountSession(CountSession countSession, byte 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; + } + } + + private string GetShortInforFromCountItems() { return JsonConvert.SerializeObject(lvCountItems); @@ -1048,7 +1067,7 @@ namespace SafeBagDE70 } else { - str = "PHIÊN GIAO DỊCH KHÔNG HỢP LỆ (SỐ TIỀN GIAO DỊCH KHÔNG KHỚP), VUI LÒNG BÁO CÁO LẠI CHI NHÁNH"; + str = $"PHIÊN GIAO DỊCH KHÔNG HỢP LỆ (SỐ TIỀN GIAO DỊCH KHÔNG KHỚP), VUI LÒNG BÁO CÁO LẠI CHI NHÁNH\r\n MÃ GD: {AppData.GetTransactionCode}"; Log.Information(str); ShowError(str); }