diff --git a/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html b/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html index 68b4a1ea..f3767d8a 100644 --- a/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html +++ b/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html @@ -112,13 +112,13 @@ }); } else { // 如果出库失败 - layer.msg(res.statusInfo.detail + ",请重试"); - depository = null; - material = null; - place = null; - // 继续扫描 - html5QrCode.start({facingMode: {exact: "environment"}}, config, qrCodeSuccessCallback); // 继续扫描 - + layer.msg(res.statusInfo.detail + ",请重试",{ + icon:0, + time:1000 + },function () { + var index = parent.layer.getFrameIndex(window.name); + parent.layer.close(index); + }); } } diff --git a/target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html b/target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html index 68b4a1ea..e8f388d2 100644 --- a/target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html +++ b/target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html @@ -60,7 +60,7 @@ }else{ wxScan = wxScan.parent.wx; } - wxScan.scanQRCode({ + /*wxScan.scanQRCode({ desc: 'scanQRCode desc', needResult: 1, // 默认为0,扫描结果由企业微信处理,1则直接返回扫描结果, scanType: ["barCode", "qrCode"], // 可以指定扫二维码还是条形码(一维码),默认二者都有 @@ -79,7 +79,11 @@ } - }); + });*/ + var result = "1614903417674964992";//当needResult为1时返回处理结果 + var req = {}; + req.qrCode = result; + outboundLogic(req); }); @@ -112,12 +116,14 @@ }); } else { // 如果出库失败 - layer.msg(res.statusInfo.detail + ",请重试"); - depository = null; - material = null; - place = null; - // 继续扫描 - html5QrCode.start({facingMode: {exact: "environment"}}, config, qrCodeSuccessCallback); // 继续扫描 + layer.msg(res.statusInfo.detail + ",请确认库存数量满足要求",{ + icon:0, + time:1000 + },function() { + var index = parent.layer.getFrameIndex(window.name); + parent.layer.close(index); + }); + }