Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp =================================================================== diff -u -r17230 -r17459 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 17230) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 17459) @@ -758,7 +758,9 @@ } function loadBarcodeDevice(barcodeTemp){ if(barcodeTemp.length >= 9){ - var barcode = barcodeTemp.substring(barcodeTemp.length-9,barcodeTemp.length); + //var barcode = barcodeTemp.substring(barcodeTemp.length-9,barcodeTemp.length); + //由于条码可能超过9位,所以取全部 + var barcode = barcodeTemp; $.ajax({ type:'get', url:WWWROOT + '/disinfectSystem/recyclingRecordAction!getRecyclingApplicationByUsedTousseBarcode.do?time='+new Date(), Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r17324 -r17459 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 17324) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 17459) @@ -748,7 +748,9 @@ function loadBarcodeDevice(barcodeTemp){ if(barcodeTemp.length >= 9){ - var barcode = barcodeTemp.substring(barcodeTemp.length-9,barcodeTemp.length); + //var barcode = barcodeTemp.substring(barcodeTemp.length-9,barcodeTemp.length); + //由于条码可能超过9位,所以取全部 + var barcode = barcodeTemp; $.ajax({ type:'get', url:WWWROOT + '/disinfectSystem/recyclingRecordAction!getBarcodeInfo.do?time='+new Date()+'&barcode='+barcode+'', @@ -948,6 +950,7 @@ barcodeGloble = ""; }, error:function(msg){ + barcodeGloble = ""; //提示信息输出... } });