Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r18579 -r18591 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 18579) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 18591) @@ -73,13 +73,14 @@ /** * 判断条码是不是有效(目前系统支持3位、9位、10位的条码) - * @param barcode 条码 + * @param barcode 条码 + * @param needVirtualBasketBarcode 需不需要虚拟篮筐条码(值为:true和false) */ -function isBarcodeValid(barcode) { +function isBarcodeValid(barcode, needVirtualBasketBarcode) { var barcodeReg_3 = /(\d){3}/; var barcodeReg_9 = /(\d){9}/; var barcodeReg_10 = /(\d){10}/; - if ((barcode.length == 3 && barcodeReg_3.test(barcode)) + if ((needVirtualBasketBarcode ? (barcode.length == 3 && barcodeReg_3.test(barcode)) : false) || (barcode.length == 9 && barcodeReg_9.test(barcode)) || (barcode.length == 10 && barcodeReg_10.test(barcode))) { return true;