|
@@ -98,6 +98,20 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
SnNo = SnNo.TrimEnd('\0');
|
|
|
SnNo = SnNo.Substring(0, 20);
|
|
|
}
|
|
|
+ if(!string.IsNullOrEmpty(MachineNo))
|
|
|
+ {
|
|
|
+ if (MachineNo.Length > 20)
|
|
|
+ {
|
|
|
+ MachineNo = System.Web.HttpUtility.UrlDecode(MachineNo);
|
|
|
+ if (!MachineNo.EndsWith("="))
|
|
|
+ {
|
|
|
+ MachineNo += "=";
|
|
|
+ }
|
|
|
+ MachineNo = dbconn.Decrypt3DES(MachineNo, "l2k0b2#3");
|
|
|
+ MachineNo = MachineNo.TrimEnd('\0');
|
|
|
+ MachineNo = MachineNo.Substring(0, 20);
|
|
|
+ }
|
|
|
+ }
|
|
|
Dictionary<string, object> Obj = new Dictionary<string, object>();
|
|
|
Models.Main1.MerchantQrCode query = MerchantQrCodeService.Query(" SnNo='" + SnNo + "'");
|
|
|
Models.Main1.PosMachinesTwo pos = PosMachinesTwoService.Query(" PosSn='" + SnNo + "'");
|