diff --git a/src/main/resources/templates/pages/application/application-in.html b/src/main/resources/templates/pages/application/application-in.html
index 3d587778..760e887d 100644
--- a/src/main/resources/templates/pages/application/application-in.html
+++ b/src/main/resources/templates/pages/application/application-in.html
@@ -955,7 +955,15 @@
         };
         // 用于扫码入库
         scanCodeInStorage = function (obj) {
-            parent.wx.scanQRCode({
+            let wxScan = parent;
+
+            if(wxScan.wx === undefined){
+                wxScan = wxScan.parent.wx;
+            }
+            else{
+                wxScan = wxScan.wx;
+            }
+            wxScan.scanQRCode({
                 desc: 'scanQRCode desc',
                 needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
                 scanType: ["qrCode,barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
@@ -1061,7 +1069,15 @@
 
         // 用于扫描条形码
         scanBarCode = function (obj) {
-            parent.wx.scanQRCode({
+            let wxScan = parent;
+
+            if(wxScan.wx === undefined){
+                wxScan = wxScan.parent.wx;
+            }
+            else{
+                wxScan = wxScan.wx;
+            }
+            wxScan.scanQRCode({
                 desc: 'scanQRCode desc',
                 needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
                 scanType: ["barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
@@ -1200,7 +1216,15 @@
 
         // 用于扫描入库位置
         scanLocationByQrCode = function (obj) {
-            parent.wx.scanQRCode({
+            let wxScan = parent;
+
+            if(wxScan.wx === undefined){
+                wxScan = wxScan.parent.wx;
+            }
+            else{
+                wxScan = wxScan.wx;
+            }
+            wxScan.scanQRCode({
                 desc: 'scanQRCode desc',
                 needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
                 scanType: ["qrCode","barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
@@ -1500,7 +1524,15 @@
 
         // 用于扫码功能
         scanCodeByOut = function (obj) {
-            parent.wx.scanQRCode({
+            let wxScan = parent;
+
+            if(wxScan.wx === undefined){
+                wxScan = wxScan.parent.wx;
+            }
+            else{
+                wxScan = wxScan.wx;
+            }
+            wxScan.scanQRCode({
                 desc: 'scanQRCode desc',
                 needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
                 scanType: ["qrCode","barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
diff --git a/src/main/resources/templates/pages/application/application-out.html b/src/main/resources/templates/pages/application/application-out.html
index 97eb29da..4e29340c 100644
--- a/src/main/resources/templates/pages/application/application-out.html
+++ b/src/main/resources/templates/pages/application/application-out.html
@@ -1258,7 +1258,15 @@
 
         // 扫描物料条码
         scanBarCode = function (obj) {
-           parent.wx.scanQRCode({
+            let wxScan = parent;
+
+            if(wxScan.wx === undefined){
+                wxScan = wxScan.parent.wx;
+            }
+            else{
+                wxScan = wxScan.wx;
+            }
+            wxScan.scanQRCode({
                 desc: 'scanQRCode desc',
                 needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
                 scanType: ["barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
@@ -1326,7 +1334,15 @@
 
         // 用于扫码功能
         scanCodeByOut = function (obj) {
-            parent.wx.scanQRCode({
+            let wxScan = parent;
+
+            if(wxScan.wx === undefined){
+                wxScan = wxScan.parent.wx;
+            }
+            else{
+                wxScan = wxScan.wx;
+            }
+            wxScan.scanQRCode({
                 desc: 'scanQRCode desc',
                 needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
                 scanType: ["qrCode","barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
diff --git a/src/main/resources/templates/pages/group/applicationInForGroup.html b/src/main/resources/templates/pages/group/applicationInForGroup.html
index 99c197cf..05b8b186 100644
--- a/src/main/resources/templates/pages/group/applicationInForGroup.html
+++ b/src/main/resources/templates/pages/group/applicationInForGroup.html
@@ -78,9 +78,6 @@
                                     提交申请成功
                                 </div>
                             </div>
-                            <div style="text-align: center;margin-top: 50px;">
-                                <button class="layui-btn next">再申请一次</button>
-                            </div>
                         </form>
                     </div>
                 </div>
@@ -168,7 +165,6 @@
                 },
                 success: function (d) {
                     layer.close(this.layerIndex);
-                    console.log(d)
                     if (d.status >= 300) {
                         layer.msg(d.statusInfo.detail);//失败的表情
 
@@ -200,6 +196,7 @@
         // 页面初始化
         $(function () {
             let req = {};
+            req.type="in";
             for (let i = 0; i < gidList.length; i++) {
                 req.gid = gidList[i];
                 $.ajax({
diff --git a/src/main/resources/templates/pages/group/applicationOutForGroup.html b/src/main/resources/templates/pages/group/applicationOutForGroup.html
index 0fa8ee75..9c0b880e 100644
--- a/src/main/resources/templates/pages/group/applicationOutForGroup.html
+++ b/src/main/resources/templates/pages/group/applicationOutForGroup.html
@@ -78,9 +78,6 @@
                                     提交申请成功
                                 </div>
                             </div>
-                            <div style="text-align: center;margin-top: 50px;">
-                                <button class="layui-btn next">再申请一次</button>
-                            </div>
                         </form>
                     </div>
                 </div>
diff --git a/src/main/resources/templates/pages/group/group-out.html b/src/main/resources/templates/pages/group/group-out.html
index 83e15e58..27e2ff8d 100644
--- a/src/main/resources/templates/pages/group/group-out.html
+++ b/src/main/resources/templates/pages/group/group-out.html
@@ -90,15 +90,17 @@
        lay-event="realDelete">彻底删除</a>
 </script>
 <script type="text/html" id="currentTableBarForOut">
-    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="applicationOut">出库</a>
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="applicationIn">入库</a>
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="applicationOut">出库</a>
 </script>
 
 
 <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
 <script>
     // 用于查看并修改组合中的物料信息
-    function checkSeeGroup(){};
+    function checkSeeGroup(){
+
+    }
     layui.use(['form', 'table', 'laydate'], function () {
         var $ = layui.jquery,
             form = layui.form,
@@ -342,7 +344,7 @@
                 let gid = data.id;
 
                 var index2 = layer.open({
-                    title: '组合出库',
+                    title: '组合入库',
                     type: 2,
                     shade: 0.2,
                     maxmin: true,