From 02beb7e58ebc961fef4da95eff5ff0ef2d0c1bda Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Fri, 24 Feb 2023 12:59:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E5=86=99=E5=88=A0=E9=99=A4=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/scanQrCode/ScanBarOrQrCodeOut.html  | 14 ++++++------
 .../pages/scanQrCode/ScanBarOrQrCodeOut.html  | 22 ++++++++++++-------
 2 files changed, 21 insertions(+), 15 deletions(-)

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);
+                            });
+
 
                         }