Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js =================================================================== diff -u -r34431 -r34448 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 34431) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 34448) @@ -1624,11 +1624,13 @@ if(show !== 0){ params = { usbVendorId: 4292, - usbProductId: 60000 + usbProductId: 60000, + isRecyleForTouchScreen:true } }else { params = { - getAllPort:true + getAllPort:true, + isRecyleForTouchScreen:true } } openPort(params, function (value, isData, errorStatus) { Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r34443 -r34448 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 34443) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 34448) @@ -7271,7 +7271,8 @@ if ('serial' in navigator) { var params = { usbVendorId: 4292, - usbProductId: 60000 + usbProductId: 60000, + isRecyleForTouchScreen:true } openPort(params, function (value, isData, errorStatus) { if (isData) { Index: ssts-web/src/main/webapp/disinfectsystem/packing/setPlugInRFID.js =================================================================== diff -u -r34447 -r34448 --- ssts-web/src/main/webapp/disinfectsystem/packing/setPlugInRFID.js (.../setPlugInRFID.js) (revision 34447) +++ ssts-web/src/main/webapp/disinfectsystem/packing/setPlugInRFID.js (.../setPlugInRFID.js) (revision 34448) @@ -47,6 +47,7 @@ var parity = params.parity ? params.parity : 'none'; var getAllData = params.getAllData; var getAllPort = params.getAllPort; + var isRecyleForTouchScreen = params.isRecyleForTouchScreen; var barcode = ''; if (!port) { if (getAllPort) { @@ -80,20 +81,36 @@ var ports = await navigator.serial.getPorts(); if (ports.length == 1) { var { usbProductId, usbVendorId } = ports[0].getInfo(); - if (filters[0].usbProductId == usbProductId && filters[0].usbVendorId == usbVendorId) { - port = ports[0]; + if(usbProductId && usbVendorId){ + if (filters[0].usbProductId == usbProductId && filters[0].usbVendorId == usbVendorId) { + port = ports[0]; + } + }else { + if(isRecyleForTouchScreen){ + port = ports[0]; + usbVendorId = 4292; + usbProductId = 60000; + } } if (!port) { callback(msg1, false, 'msg1'); return; } } else if (ports.length > 1) { - for (var i = 0; i < ports.length; i++) { - var { usbProductId, usbVendorId } = ports[i].getInfo(); - if (filters[0].usbProductId == usbProductId && filters[0].usbVendorId == usbVendorId) { - port = ports[i]; - break; + if(usbProductId && usbVendorId){ + for (var i = 0; i < ports.length; i++) { + var { usbProductId, usbVendorId } = ports[i].getInfo(); + if (filters[0].usbProductId == usbProductId && filters[0].usbVendorId == usbVendorId) { + port = ports[i]; + break; + } } + }else { + if(isRecyleForTouchScreen){ + port = ports[0]; + usbVendorId = 4292; + usbProductId = 60000; + } } if (!port) { callback(msg1, false, 'msg1'); @@ -102,8 +119,15 @@ } else { port = await navigator.serial.requestPort(); var { usbProductId, usbVendorId } = port.getInfo(); - usbVendorId = usbVendorId; - usbProductId = usbProductId; + if(usbProductId && usbVendorId){ + usbVendorId = usbVendorId; + usbProductId = usbProductId; + }else { + if(isRecyleForTouchScreen){ + usbVendorId = 4292; + usbProductId = 60000; + } + } } } await port.open({ baudRate: baudRate }, { dataBits: dataBits }, { stopBits: stopBits }, { parity: parity });