diff --git a/src/main/resources/templates/pages/group/group-out.html b/src/main/resources/templates/pages/group/group-out.html
index c3ece2a7..83e15e58 100644
--- a/src/main/resources/templates/pages/group/group-out.html
+++ b/src/main/resources/templates/pages/group/group-out.html
@@ -91,6 +91,7 @@
 </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>
 </script>
 
 
@@ -142,7 +143,7 @@
                     {field: 'quantity', width: 200, title: '物料数量'},
                     {field: 'createTime', width: 200, title: '创建时间'},
                     {field: 'state', title: '状态', minWidth: 100, templet: '#switchTpl'},
-                    {title: '出库', minWidth: 200, toolbar: '#currentTableBarForOut', align: "center"},
+                    {title: '出入库', minWidth: 200, toolbar: '#currentTableBarForOut', align: "center"},
                     {title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"},
 
 
@@ -337,6 +338,22 @@
                     layer.full(index1);
                 });
             }
+            else if (obj.event === 'applicationIn'){
+                let gid = data.id;
+
+                var index2 = layer.open({
+                    title: '组合出库',
+                    type: 2,
+                    shade: 0.2,
+                    maxmin: true,
+                    shadeClose: true,
+                    area: ['100%', '100%'],
+                    content: '/applicationInForGroup?gid='+gid+'&type=one',
+                });
+                $(window).on("resize", function () {
+                    layer.full(index2);
+                });
+            }
         });
 
 
diff --git a/target/classes/templates/pages/group/group-out.html b/target/classes/templates/pages/group/group-out.html
index c3ece2a7..83e15e58 100644
--- a/target/classes/templates/pages/group/group-out.html
+++ b/target/classes/templates/pages/group/group-out.html
@@ -91,6 +91,7 @@
 </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>
 </script>
 
 
@@ -142,7 +143,7 @@
                     {field: 'quantity', width: 200, title: '物料数量'},
                     {field: 'createTime', width: 200, title: '创建时间'},
                     {field: 'state', title: '状态', minWidth: 100, templet: '#switchTpl'},
-                    {title: '出库', minWidth: 200, toolbar: '#currentTableBarForOut', align: "center"},
+                    {title: '出入库', minWidth: 200, toolbar: '#currentTableBarForOut', align: "center"},
                     {title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"},
 
 
@@ -337,6 +338,22 @@
                     layer.full(index1);
                 });
             }
+            else if (obj.event === 'applicationIn'){
+                let gid = data.id;
+
+                var index2 = layer.open({
+                    title: '组合出库',
+                    type: 2,
+                    shade: 0.2,
+                    maxmin: true,
+                    shadeClose: true,
+                    area: ['100%', '100%'],
+                    content: '/applicationInForGroup?gid='+gid+'&type=one',
+                });
+                $(window).on("resize", function () {
+                    layer.full(index2);
+                });
+            }
         });