diff --git a/src/main/java/com/dreamchaser/depository_manage/utils/CreateQrCodeUtil.java b/src/main/java/com/dreamchaser/depository_manage/utils/CreateQrCodeUtil.java
index 0aebb318..a155a1f8 100644
--- a/src/main/java/com/dreamchaser/depository_manage/utils/CreateQrCodeUtil.java
+++ b/src/main/java/com/dreamchaser/depository_manage/utils/CreateQrCodeUtil.java
@@ -169,7 +169,7 @@ public class CreateQrCodeUtil {
             Color color = new Color(0, 0, 0);
             g2d.setColor(color);
             // 字体、字型、字号
-            g2d.setFont(new Font("微软雅黑", Font.PLAIN, 16));
+            g2d.setFont(new Font("Arial Unicode MS", Font.PLAIN, 16));
             //文字长度
             int strWidth = g2d.getFontMetrics().stringWidth(code);
             //总长度减去文字长度的一半  （居中显示）
diff --git a/src/main/resources/templates/pages/warehouse/depository-out.html b/src/main/resources/templates/pages/warehouse/depository-out.html
index 669b17ee..be333505 100644
--- a/src/main/resources/templates/pages/warehouse/depository-out.html
+++ b/src/main/resources/templates/pages/warehouse/depository-out.html
@@ -102,7 +102,7 @@
                     "data": res.data //解析数据列表
                 };
             },
-            height: 'full-265',//固定高度-即固定表头固定第一行首行
+            height: 'full-165',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'size' //每页数据量的参数名，默认：limit
@@ -155,7 +155,7 @@
             if (data.depositoryId !== '') {
                 req.depositoryId = data.depositoryId;
             }
-            if (data.state != '') {
+            if (data.state !== '') {
                 req.state = data.state;
             }
             req.parentId = parentId;
diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/RoleMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/RoleMapper.xml
index a2a85f1d..cc46c6c5 100644
--- a/target/classes/com/dreamchaser/depository_manage/mapper/RoleMapper.xml
+++ b/target/classes/com/dreamchaser/depository_manage/mapper/RoleMapper.xml
@@ -93,7 +93,7 @@
 
 
     <select id="findUserIdByDid" parameterType="int" resultType="int">
-        select userid from postoruserrole  where 1 = 1 and did = #{did}
+        select userid from postoruserrole  where 1 = 1 and did = #{did}  and classes in (1,2) group by userid
     </select>
 
     <select id="findRoleAndDepositoryByCondition" parameterType="map" resultMap="depositoryAndrole">
diff --git a/target/classes/templates/pages/application/application-in_back.html b/target/classes/templates/pages/application/application-in_back.html
index 242de9f4..bc9bbd97 100644
--- a/target/classes/templates/pages/application/application-in_back.html
+++ b/target/classes/templates/pages/application/application-in_back.html
@@ -104,7 +104,7 @@
                                         </div>
                                     </div>
                                     <div class="layui-form-item">
-                                        <div class="layui-input-block" style="bottom: 15px">
+                                        <div class="layui-input-block" >
                                             <button class="layui-btn" lay-submit lay-filter="formStep" style="margin-left: 15%">
                                                 &emsp;提交&emsp;
                                             </button>
diff --git a/target/classes/templates/pages/application/application-in_scanQrCode.html b/target/classes/templates/pages/application/application-in_scanQrCode.html
index 2441b01a..48a39e96 100644
--- a/target/classes/templates/pages/application/application-in_scanQrCode.html
+++ b/target/classes/templates/pages/application/application-in_scanQrCode.html
@@ -181,6 +181,19 @@
 
         });
 
+        // 用于分步表单加载
+        step.render({
+            elem: '#stepForm',
+            filter: 'stepForm',
+            width: '100%', //设置容器宽度
+            height: '600px',
+            stepItems: [{
+                title: '填写信息'
+            }, {
+                title: '提交成功'
+            }]
+        });
+
         //用于页面初始化时的卡片构造
         initForm = function (num, obj) {
             var parent = $("#cardParent");
@@ -194,7 +207,7 @@
                                                 <label class="layui-form-label"  style="height: 40px;">仓库：</label>
                                                 <div class="layui-input-block">
                                                 <div class="inputdiv">
-                                                    <input type="text" placeholder="请选择仓库" class="layui-input"
+                                                    <input type="text" placeholder="请选择仓库" class="layui-input" style="border: none"
                                                            id="openSonByDepository" readonly onclick="openDepositoryTree(this)"
                                                            lay-verify="required"/>
                                                     <input type="text" name=` + "depositoryId" + NewIdNumber + ` class="layui-input" id="depositoryId"
@@ -216,8 +229,8 @@
                                                 <label class="layui-form-label"  style="height: 40px;">仓库：</label>
                                                 <div class="layui-input-block">
                                                 <div class="inputdiv">
-                                                    <input type="text" placeholder="请选择仓库" class="layui-input" value=` + depository.dname + `
-                                                           id="openSonByDepository" readonly onclick="openDepositoryTree(this)"
+                                                    <input style="border: none" type="text" placeholder="请选择仓库" class="layui-input" value=` + depository.dname + `
+                                                            id="openSonByDepository" readonly onclick="openDepositoryTree(this)"
                                                            lay-verify="required"/>
                                                     <input type="text" name=` + "depositoryId" + NewIdNumber + ` class="layui-input" id="depositoryId" value=` + depository.did + `
                                                            style="display: none" lay-verify="required"/>
@@ -238,7 +251,7 @@
                                                 <label class="layui-form-label"  style="height: 40px;">仓库：</label>
                                                 <div class="layui-input-block">
                                                 <div class="inputdiv">
-                                                    <input type="text" placeholder="请选择仓库" class="layui-input"
+                                                    <input type="text" placeholder="请选择仓库" class="layui-input" style="border: none"
                                                            id="openSonByDepository" readonly onclick="openDepositoryTree(this)" value=` + place.dname + "-" + place.code + `
                                                            lay-verify="required"/>
                                                     <input type="text" name=` + "depositoryId" + NewIdNumber + ` class="layui-input" id="depositoryId" value=` + place.depositoryId + `
@@ -282,7 +295,7 @@
                                       <label class="layui-form-label"  style="height: 40px;">物料编码:</label>
                                       <div class="layui-input-block">
                                        <div class="inputdiv">
-                                           <input id="code" name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码"  onblur="selectCode(this)"
+                                           <input id="code" style="border: none" name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码"  onblur="selectCode(this)"
                                                            class="layui-input" lay-verify="required" value="${obj.code}">
                                                            <img src="/static/images/search.ico" height="16" width="16"
                                                      style="margin-top: 10px" onclick="scanCodeInStorage(this)">
@@ -336,18 +349,7 @@
             $("#btn_sub").prepend(materialItem)
         };
 
-        // 用于分步表单加载
-        step.render({
-            elem: '#stepForm',
-            filter: 'stepForm',
-            width: '100%', //设置容器宽度
-            height: '600px',
-            stepItems: [{
-                title: '填写信息'
-            }, {
-                title: '提交成功'
-            }]
-        });
+
 
 
         // 用于提交操作
@@ -427,7 +429,7 @@
         <label class="layui-form-label" style="height: 40px;">仓库：</label>
             <div class="layui-input-block">
             <div class="inputdiv">
-                <input type="text" placeholder="请选择仓库" class="layui-input"
+                <input type="text" placeholder="请选择仓库" class="layui-input" style="border: none"
             id="openSonByDepository" readonly onclick="openDepositoryTree(this)"
             lay-verify="required"/>
                 <input type="text" name=` + "depositoryId" + NewIdNumber + ` class="layui-input" id="depositoryId"
@@ -449,7 +451,7 @@
                                                 <label class="layui-form-label" style="height: 40px;">仓库：</label>
                                                 <div class="layui-input-block">
                                                 <div class="inputdiv">
-                                                    <input type="text" placeholder="请选择仓库" class="layui-input" value=` + depository.dname + `
+                                                    <input style="border: none" type="text" placeholder="请选择仓库" class="layui-input" value=` + depository.dname + `
                                                            id="openSonByDepository" readonly onclick="openDepositoryTree(this)"
                                                            lay-verify="required"/>
                                                     <input type="text" name=` + "depositoryId" + NewIdNumber + ` class="layui-input" id="depositoryId" value=` + depository.did + `
@@ -472,7 +474,7 @@
                                                 <label class="layui-form-label" style="height: 40px;">仓库：</label>
                                                 <div class="layui-input-block">
                                                 <div class="inputdiv">
-                                                    <input type="text" placeholder="请选择仓库" class="layui-input"
+                                                    <input type="text" placeholder="请选择仓库" class="layui-input" style="border: none"
                                                            id="openSonByDepository" readonly onclick="openDepositoryTree(this)" value=` + place.dname + "-" + place.code + `
                                                            lay-verify="required"/>
                                                     <input type="text" name=` + "depositoryId" + NewIdNumber + ` class="layui-input" id="depositoryId" value=` + place.depositoryId + `
@@ -510,7 +512,7 @@
                                       <div class="layui-input-block">
                                       <div class="inputdiv">
                                            <input id="code" name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" value="" onblur="selectCode(this)"
-                                                           class="layui-input" lay-verify="required">
+                                                          style="border: none"  class="layui-input" lay-verify="required">
                                                             <img src="/static/images/search.ico" height="16" width="16"
                                                      style="margin-top: 10px" onclick="scanCodeInStorage(this)">
                                             </div>
@@ -782,7 +784,7 @@
             var materialChildren = parent.childNodes[5];
             var codeChildren = parent.childNodes[7];
             var codeItem = codeChildren.childNodes[3].childNodes;
-            var codeValue = codeItem[1];
+            var codeValue = codeItem[1].childNodes[1];
             var materialItem = materialChildren.childNodes[3].childNodes[1].childNodes;
             var materialName = materialItem[1];
             var materialId = materialName.parentNode.parentNode.childNodes[3];
@@ -814,6 +816,7 @@
                             materialName.value = material.mname;
                             materialId.value = material.mid;
                             codeValue.value = material.code;
+
                             var shelfLife = material.shelfLife;
                             if (shelfLife !== null && shelfLife !== undefined) {
                                 $("#" + "producedDateItem" + idNumber).show();
diff --git a/target/classes/templates/pages/application/application_multi.html b/target/classes/templates/pages/application/application_multi.html
index 762b52a8..dc064cdb 100644
--- a/target/classes/templates/pages/application/application_multi.html
+++ b/target/classes/templates/pages/application/application_multi.html
@@ -45,7 +45,7 @@
 
         <!--        用于计量单位的展示-->
         <script id="changeUnit" type="text/html">
-            <button class="layui-btn layui-btn-primary layui-btn-xs" lay-event="changeUnit" click_num="0" id="btn_unit_{{d.id}}" value="-1">{{d.showUnit}}</button>
+            <button class="layui-btn layui-btn-primary layui-btn-xs" lay-event="changeUnit" click_num="0" id="btn_unit_{{d.iid}}" value="-1">{{d.showUnit}}</button>
         </script>
 
         <script id="selectLocation" type="text/html">
@@ -131,7 +131,6 @@
             req.depositoryIds = [];
             req.quantitys = [];
             req.applyRemarks = [];
-            req.prices = [];
             req.placeCodes = [];
             req.iids = [];
             req.units = [];
@@ -141,7 +140,6 @@
                 req.depositoryIds[i] = data[i].depositoryId;
                 req.quantitys[i] = data[i].quantity;
                 req.applyRemarks[i] = data[i].applyRemark;
-                req.prices[i] = data[i].price;
                 req.placeCodes[i] = data[i].placeCode;
                 req.units[i] = data[i].unit;
             }
@@ -327,7 +325,7 @@
             }
             else if (obj.event === 'changeUnit') {
                 let splitInfoList = data.splitInfoList;
-                let btn = $("#btn_unit_"+data.id);
+                let btn = $("#btn_unit_"+data.iid);
                 let clickNum = Number(btn.attr("click_num"));
                 if(splitInfoList.length > 0){
                     if(clickNum < splitInfoList.length){