diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
index bdf63534..0f2edef6 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
@@ -3265,6 +3265,32 @@ public class PageController {
         return mv;
     }
 
+    // 获取扫描结果并跳转到出库
+    @GetMapping("/application_Immediate_Out_temporaryValue")
+    public ModelAndView applicationImmediateOutScanQrCode(HttpServletRequest request) {
+        ModelAndView mv = new ModelAndView();
+        String token = request.getHeader("user-token");
+        if (token == null) {
+            token = (String) request.getSession().getAttribute("userToken");
+        }
+        List<BusinessType> businessTypeAll = businessTypeService.findBusinessTypeAll();
+        mv.addObject("btList", businessTypeAll);
+        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
+        List<String> range = redisPool.getRedisTemplateByDb(15).boundListOps("WMS_temporaryValue_Out" + userToken.getNumber()).range(0, -1);
+        Integer maindeparment = userToken.getMaindeparment();
+        if (range != null && range.size() > 0) {
+            if (PublicConfig.roleAdminorgList.contains(maindeparment)) {
+                mv.setViewName("pages/applicationForStorageCenter/application-out_admin_temporaryValue");
+            }
+        } else {
+            if (PublicConfig.roleAdminorgList.contains(maindeparment)) {
+                mv.setViewName("pages/applicationForStorageCenter/application-out_admin");
+            }
+        }
+
+        return mv;
+    }
+
     // 当前仓库中该用户的子订单详情,用于pc端
     @GetMapping("/ApplicationOutMinByDid")
     public ModelAndView ApplicationOutMinByDid(Integer depositoryId, Integer state, HttpServletRequest request) {
@@ -3485,16 +3511,14 @@ public class PageController {
     public ModelAndView noticeView(Integer id, HttpServletRequest request) {
         ModelAndView mv = new ModelAndView();
         mv.setViewName("pages/notice/notice-view");
-
-
         String token = request.getHeader("user-token");
         String userKey = request.getHeader("user-key");
         if (token == null) {
             token = (String) request.getSession().getAttribute("userToken");
             userKey = (String) request.getSession().getAttribute("userKey");
         }
-        NoticeP noticeById = noticeService.findNoticeById(id, userKey, token);
         UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
+        NoticeP noticeById = noticeService.findNoticeById(id, userKey, token);
         if (Integer.compare(noticeById.getUserId(), userToken.getId()) == 0) {
             String header = request.getHeader("user-agent");
             String crypt = Md5.crypt(header);
@@ -3637,9 +3661,20 @@ public class PageController {
 
     // 用于展示库存数据
     @GetMapping("/toShowInventory")
-    public ModelAndView toShowInventory(@RequestParam Map<String, String> param) {
+    public ModelAndView toShowInventory(@RequestParam Map<String, String> param,HttpServletRequest request) {
         ModelAndView mv = new ModelAndView();
+        String token = request.getHeader("user-token");
+        String userKey = request.getHeader("user-key");
+        if (token == null) {
+            token = (String) request.getSession().getAttribute("userToken");
+            userKey = (String) request.getSession().getAttribute("userKey");
+        }
+        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
         if (param.containsKey("id")) {
+            Integer maindeparment = userToken.getMaindeparment();
+            if(PublicConfig.roleAdminorgList.contains(maindeparment)){
+                mv.addObject("display","inline-block");
+            }
             String type = param.get("type");
             mv.addObject("id", param.get("id"));
             if ("m".equals(type)) {
diff --git a/src/main/resources/templates/pages/applicationForStorageCenter/application-out_admin_temporaryValue.html b/src/main/resources/templates/pages/applicationForStorageCenter/application-out_admin_temporaryValue.html
new file mode 100644
index 00000000..0aaf1aa9
--- /dev/null
+++ b/src/main/resources/templates/pages/applicationForStorageCenter/application-out_admin_temporaryValue.html
@@ -0,0 +1,1370 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="utf-8">
+    <title>分步表单</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="/static/lib/layui-v2.6.3/css/layui.css" media="all">
+    <link rel="stylesheet" href="/static/css/public.css" media="all">
+    <link rel="stylesheet" href="/static/js/lay-module/step-lay/step.css" media="all">
+    <link rel="stylesheet" href="/static/lib/font-awesome-4.7.0/css/font-awesome.min.css" media="all">
+</head>
+<body>
+<style>
+    .inputdiv {
+        display: flex;
+        background-color: #fff;
+        height: 38px;
+        line-height: 38px;
+        border: 1px solid rgb(238, 238, 238);
+    }
+
+    .layui-form-label {
+        padding: 9px 0px;
+        text-align: left;
+    }
+
+    .layui-input-block {
+        margin-left: 80px;
+    }
+
+    .layui-form-select {
+        width: 100%;
+        border-style: none;
+    }
+
+    .layui-card-body {
+        padding: 10px 5px;
+    }
+
+    .lay-step {
+        display: none;
+    }
+
+</style>
+<div class="layuimini-container">
+    <div class="layuimini-main">
+        <div class="layui-fluid">
+            <!--            普通物料出库申请-->
+            <div class="layui-carousel" id="stepForm" lay-filter="stepForm" style="margin: 0 auto;">
+                <div carousel-item style="overflow: inherit">
+                    <div>
+                        <form class="layui-form layui-form-pane" style="margin: 0 auto;max-width: 460px;">
+                            <div class="layui-card" id="cardParent">
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">人员:</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" placeholder="请选择人员" class="layui-input"
+                                               id="applicationUser"
+                                               onblur="selectUser(this)"
+                                        />
+                                        <input type="text" name="userId" class="layui-input"
+                                               id="userId"
+                                               style="display: none"/>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">部门:</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" placeholder="请选择部门" class="layui-input"
+                                               readonly
+                                               id="openCompanyAdminorg"
+                                               onclick="selectPost(this)"
+                                        />
+                                        <input type="text" name="adminorgId" class="layui-input"
+                                               id="adminorgId"
+                                               style="display: none"/>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">施工单位:</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" placeholder="请选择施工单位" class="layui-input"
+                                               readonly
+                                               id="openConstructionUnit"
+                                               onclick="selectConstructionUnit(this)"
+                                        />
+                                        <input type="text" name="constructionUnitId" class="layui-input"
+                                               id="constructionUnitId"
+                                               style="display: none"/>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">摘要:</label>
+                                    <div class="layui-input-block">
+                                        <input name="abstract" placeholder="请填写摘要" value=""
+                                               class="layui-input"/>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">出库类别:</label>
+                                    <div class="layui-input-block">
+                                        <select name="outType" id="outType">
+                                            <option></option>
+                                            <option th:each="bt,iterStar:${btList}"
+                                                    th:value="${bt?.getId()}"
+                                                    th:text="${bt?.getTypeName()}"></option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">备注说明:</label>
+                                    <div class="layui-input-block">
+                                        <input name="applyRemark" placeholder="请填写相关原因及申请原因" value=""
+                                               class="layui-input"/>
+                                    </div>
+                                </div>
+
+
+
+                                <!--                            提交按钮-->
+                                <div class="layui-form-item" id="btn_sub">
+                                    <div class="layui-input-block">
+                                        <button class="layui-btn" lay-submit lay-filter="formStep"
+                                                style="margin-bottom: 30px;margin-left: 15%">
+                                            &emsp;提交&emsp;
+                                        </button>
+                                    </div>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                    <div>
+                        <form class="layui-form" style="margin: 0 auto;max-width: 460px;padding-top: 40px;">
+                            <div style="text-align: center;margin-top: 90px;">
+                                <i class="layui-icon layui-circle"
+                                   style="color: white;font-size:30px;font-weight:bold;background: #52C41A;padding: 20px;line-height: 80px;">&#xe605;</i>
+                                <div style="font-size: 24px;color: #333;font-weight: 500;margin-top: 30px;">
+                                    提交申请成功
+                                </div>
+                            </div>
+                            <div style="text-align: center;margin-top: 50px;">
+                                <button class="layui-btn next">再申请一次</button>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
+<script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script>
+<script src="https://open.work.weixin.qq.com/wwopen/js/jwxwork-1.0.0.js"></script>
+<script>
+    // 用于添加标签
+    function addItem(obj) {
+    }
+
+    // 用于删除标签
+    function deleteItem(obj) {
+    }
+
+    // 用于搜索人员
+    function selectUser(obj) {
+
+    }
+
+    // 用于编码查询
+    function selectCode(obj) {
+    }
+
+
+    // 用于点击搜索按钮
+    function selectMaterial(obj) {
+    }
+
+
+    // 用于物料名称查询
+    function selectMaterialByName(obj) {
+    }
+
+
+
+    // 用于判断当前物料数量是否合适
+    function MaterialQuantityIsTrue() {
+    }
+
+
+
+    // 用于扫描条形码
+    function scanBarCode() {
+    }
+
+
+
+    // 用于扫码出库
+    function scanCodeByOut(obj) {
+    }
+
+    // 用于获取施工单位
+    function selectConstructionUnit() {
+
+    }
+
+    // 用于获取部门树
+    function selectPost() {
+
+    }
+
+    // 用于选中该用户
+    function SelectTheUser(obj) {
+
+    }
+
+    // 用于页面初始化时的卡片构造
+    function initForm(num, obj) {
+    }
+
+    // 用于暂存卡片个数
+    var params = [];
+
+    // 用于卡片编号
+    var NewIdNumber = 1;
+
+    // 用于打开的人员选择页
+    var selectUserIfame = 0;
+
+    // 用于标志是否为第一次提交
+    let flagForForm = false;
+
+    layui.use(['form', 'step', 'layer', 'jquery', 'element'], function () {
+        var $ = layui.$,
+            form = layui.form,
+            element = layui.element,
+            step = layui.step;
+
+        let depositoryDisplay = $("#depositoryId").css("display");
+
+        // 用于分步表单加载
+        step.render({
+            elem: '#stepForm',
+            filter: 'stepForm',
+            width: '100%', //设置容器宽度
+            height: '800px',
+            stepItems: [{
+                title: '填写信息'
+            }, {
+                title: '提交成功'
+            }]
+        });
+
+        $(function () {
+            let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
+            $.ajax({
+                url: "/material/getTemporaryValue",
+                type: "post",
+                dataType: 'json',
+                data: JSON.stringify({"type": "Out"}),
+                contentType: "application/json;charset=utf-8",
+                success: function (res) {
+                    let temporaryValue = res.data;
+                    for (let i = 0; i < temporaryValue.length; i++) {
+                        initForm(i, temporaryValue[i]);
+                    }
+                    layer.close(loading2);
+                }
+            })
+        });
+
+
+        //用于页面初始化时的卡片构造
+        initForm = function (num, obj) {
+            // 获取待添加父类
+            NewIdNumber = num;
+            if (num === 0) { // 如果是第一个
+                NewIdNumber = "";
+            }
+            let splitInfoList = '';
+            for (let i = 0; i < obj.splitInfoList.length; i++) {
+                let item = '<option value="' + obj.splitInfoList[i].newUnit + '">' + obj.splitInfoList[i].newUnit + '</option>'
+                splitInfoList += item;
+            }
+            let depositoryList = '';
+
+            if (depositoryDisplay !== "none") {
+                depositoryList = `<div class="layui-form-item" id=` + "depositoryId" + NewIdNumber + `>
+                                                    <label class="layui-form-label">仓库:</label>
+                                                    <div class="layui-input-block">
+                                                        <select id=` + "showDepository" + NewIdNumber + ` name=` + "depositoryId" + NewIdNumber + `>`;
+                for (let i = 0; i < obj.depositoryList.length; i++) {
+                    let item = '<option value="' + obj.depositoryList[i].id + '">' + obj.depositoryList[i].dname + '</option>';
+                    depositoryList += item;
+                }
+                depositoryList += `</select></div></div>`
+            }
+            var firstItem = `
+                                <div class="layui-card-body" id=` + "cardItem" + NewIdNumber + `>
+                                <hr>
+                                    <i  class="layui-icon layui-icon-subtraction" style="display: inline" onclick="deleteItem(this)"></i>
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label" style="height: 40px;">物料名称</label>
+                                        <div class="layui-input-block">
+                                            <div class="inputdiv">
+                                            <input type="text" placeholder="请选择物料" class="layui-input" style="border-style: none" value="${obj.mname}"
+                                                               id="openSonByMaterial" lay-verify="required" onblur="selectMaterialByName(this)"/>
+                                            <i  class="layui-icon layui-icon-search" style="display: inline" id="selectMaterial" onclick="selectMaterial(this)"></i>
+                                            </div>
+                                            <input type="text" name=` + "mid" + NewIdNumber + ` class="layui-input" id=` + "mid" + NewIdNumber + `  value="${obj.id}"
+                                                               style="display: none" lay-verify="required" />
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label" style="height: 40px;">物料编码:</label>
+                                        <div class="layui-input-block">
+                                            <div class="inputdiv">
+                                                <input id=` + "code" + NewIdNumber + ` name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" value="${obj.code}"
+                                                       onblur="selectCode(this)"
+                                                       class="layui-input" lay-verify="required"
+                                                       style="border-style: none">
+                                                <img src="/static/images/search.ico" height="16" width="16"
+                                                     style="margin-top: 10px" onclick="scanCodeByOut(this)">
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                 <div class="layui-form-item">
+                                        <label class="layui-form-label" style="height: 40px;">条形编码:</label>
+                                        <div class="layui-input-block" style="margin: 0px;">
+                                            <div class="inputdiv">
+                                                <input id=` + "barCode" + NewIdNumber + ` name=` + "barCode" + NewIdNumber + ` type="text" placeholder="请填写入条形编码"
+                                                       value=""
+                                                       class="layui-input"
+                                                       style="border-style: none">
+                                                <img src="/static/images/search.ico" height="16" width="16" id=` + "barCodeImg" + NewIdNumber + `
+                                                     style="margin-top: 10px" onclick="scanBarCode(this)">
+                                            </div>
+                                        </div>
+                                    </div>
+                                `;
+
+
+            var lastItem = `<div class="layui-form-item">
+                <label class="layui-form-label">物料数量:</label>
+            <div class="layui-input-block">
+                <input name=` + "quantity" + NewIdNumber + ` type="number" placeholder="请填写入物料数量" value="" onblur="MaterialQuantityIsTrue(this)"
+            id=` + "quantity" + NewIdNumber + `       class="layui-input" lay-verify="number">
+                </div>
+                </div>
+                <div class="layui-form-item">
+                <label class="layui-form-label">计量单位:</label>
+                <div class="layui-input-block">
+                <select id=` + "unit" + NewIdNumber + ` name=` + "unit" + NewIdNumber + `>
+                <option value="-1">${obj.unit}</option>` +
+                splitInfoList +
+                `</select>
+                </div>
+                </div>` +
+                depositoryList + `
+                <div class="layui-form-item">
+                <label class="layui-form-label">项目:</label>
+            <div class="layui-input-block">
+                <input id=` + "project" + NewIdNumber + ` name=` + "project" + NewIdNumber + ` placeholder="请填写相关项目" value=""
+        class="layui-input"/>
+                </div>
+                </div>
+                <i  class="layui-icon layui-icon-addition" style="display: inline" onclick="addItem(this)"></i>
+                </div>`;
+            // 获取当前高度
+            var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
+            if (NewIdNumber !== "") {
+                params.push(NewIdNumber)
+            }
+            if(depositoryDisplay === "none"){
+
+                $("#stepForm").css("height", height + 390 + 'px');
+            } else {
+                $("#stepForm").css("height", height + 435 + 'px');
+
+            }
+            var materialItem = firstItem + lastItem;
+            $("#btn_sub").prepend(materialItem);
+            form.render();
+
+
+        };
+
+
+        // 提交（物料出库）
+        form.on('submit(formStep)', function (data) {
+            if (!flagForForm) {
+                flagForForm = true;
+                data = data.field;
+                data.params = params;
+                if (data.mid === undefined) {
+                    // 如果没有初始项
+                    var dataKeys = Object.keys(data);
+                    var dataKey;
+                    for (let i = 0; i < dataKeys.length; i++) {
+                        dataKey = dataKeys[i];
+                        if (dataKey.includes("mid")) {
+                            break;
+                        }
+                    }
+                    // 获取当前数字
+                    var keyNumber = dataKey.split("mid")[1];
+                    for (let index = 0; index < dataKeys.length; index++) {
+                        var tempKey = dataKeys[index];
+                        if (tempKey.includes(keyNumber)) {
+                            var key = tempKey.replace(keyNumber, "");
+                            data[key] = data[tempKey];
+                            delete data[tempKey];
+                        }
+                    }
+                    data.params = remove(data.params, Number(keyNumber));
+                }
+                let userId = data.userId;
+                let flagForSubmit = true;
+                if (userId === "") {
+                    let adminorgId = data.adminorgId;
+                    if (adminorgId === "") {
+                        layer.msg("请选择对应的部门", {
+                            icon: 5,
+                            time: 1000
+                        }, function () {
+                            flagForSubmit = false;
+                            flagForForm = false;
+                        })
+                    }
+                }
+                if (data.outType === "") {
+                    delete data["outType"];
+                }
+                if (flagForSubmit) {
+                    $.ajax({
+                        url: "/depositoryRecord/applicationOutForImmediately",
+                        type: 'post',
+                        dataType: 'json',
+                        contentType: "application/json;charset=utf-8",
+                        data: JSON.stringify(data),
+                        beforeSend: function () {
+                            this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
+                        },
+                        success: function (data) {
+                            layer.close(this.layerIndex);
+                            if (data.status >= 300) {
+                                layer.msg(data.statusInfo.message);//失败的表情
+
+                            } else {
+                                layer.msg("申请提交成功", {
+                                    icon: 6,//成功的表情
+                                    time: 500 //1秒关闭（如果不配置，默认是3秒）
+                                }, function () {
+                                    step.next('#stepForm');
+                                });
+
+
+                            }
+                        },
+                        complete: function () {
+                            layer.close(this.layerIndex);
+                        }
+                    });
+                }
+
+            }
+
+            return false;
+
+        });
+
+
+        $('.pre').click(function () {
+            step.pre('#stepForm');
+        });
+
+        $('.next').click(function () {
+            step.next('#stepForm');
+        });
+
+        // 实现卡片添加
+        addItem = function (obj) {
+            // 获取父元素id
+            var parentId = obj.parentNode.id;
+            NewIdNumber = NewIdNumber + 1;
+            // 物料名称栏目
+            var materialItem = `
+                                <div class="layui-card-body" id=` + "cardItem" + NewIdNumber + `>
+                                <hr>
+                                    <i  class="layui-icon layui-icon-subtraction" style="display: inline" onclick="deleteItem(this)"></i>
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label" style="height: 40px;">物料名称</label>
+                                        <div class="layui-input-block">
+                                            <div class="inputdiv">
+                                            <input type="text" placeholder="请选择物料" class="layui-input" style="border-style: none"
+                                                               id="openSonByMaterial" lay-verify="required" onblur="selectMaterialByName(this)"/>
+                                            <i  class="layui-icon layui-icon-search" style="display: inline" id="selectMaterial" onclick="selectMaterial(this)"></i>
+                                            </div>
+                                            <input type="text" name=` + "mid" + NewIdNumber + ` class="layui-input" id="mid"
+                                                               style="display: none" lay-verify="required" />
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label" style="height: 40px;">物料编码:</label>
+                                        <div class="layui-input-block">
+                                            <div class="inputdiv">
+                                                <input id=` + "code" + NewIdNumber + ` name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" value=""
+                                                       onblur="selectCode(this)"
+                                                       class="layui-input" lay-verify="required"
+                                                       style="border-style: none">
+                                                <img src="/static/images/search.ico" height="16" width="16"
+                                                     style="margin-top: 10px" onclick="scanCodeByOut(this)">
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                 <div class="layui-form-item">
+                                        <label class="layui-form-label" style="height: 40px;">条形编码:</label>
+                                        <div class="layui-input-block" style="margin: 0px;">
+                                            <div class="inputdiv">
+                                                <input id=` + "barCode" + NewIdNumber + ` name=` + "barCode" + NewIdNumber + ` type="text" placeholder="请填写入条形编码"
+                                                       value=""
+                                                       class="layui-input"
+                                                       style="border-style: none">
+                                                <img src="/static/images/search.ico" height="16" width="16" id=` + "barCodeImg" + NewIdNumber + `
+                                                     style="margin-top: 10px" onclick="scanBarCode(this)">
+                                            </div>
+                                        </div>
+                                    </div>
+                                 <div class="layui-form-item">
+                                       <label class="layui-form-label">物料数量:</label>
+                                       <div class="layui-input-block">
+                                            <input name=` + "quantity" + NewIdNumber + ` type="number" placeholder="请填写入物料数量" value="" onblur="MaterialQuantityIsTrue(this)"
+                                                   id=` + "quantity" + NewIdNumber + `       class="layui-input" lay-verify="number">
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item">
+                                                    <label class="layui-form-label">计量单位:</label>
+                                                    <div class="layui-input-block">
+                                                        <select id=` + "unit" + NewIdNumber + ` name=` + "unit" + NewIdNumber + `>
+
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-form-item" id=` + "depositoryId" + NewIdNumber + ` style="display:` + depositoryDisplay + `" >
+                                                    <label class="layui-form-label">仓库:</label>
+                                                    <div class="layui-input-block">
+                                                        <select id=` + "showDepository" + NewIdNumber + ` name=` + "depositoryId" + NewIdNumber + `>
+
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                 <div class="layui-form-item">
+                                   <label class="layui-form-label">项目:</label>
+                                    <div class="layui-input-block">
+                                    <input id=` + "project" + NewIdNumber + ` name=` + "project" + NewIdNumber + ` placeholder="请填写相关项目" value=""
+                                                              class="layui-input"/>
+                                    </div>
+                                 </div>
+                                <i  class="layui-icon layui-icon-addition" style="display: inline" onclick="addItem(this)"></i>
+                                </div>`;
+            // 获取当前高度
+            var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
+            params.push(NewIdNumber);
+            if (depositoryDisplay === "none") {
+                $("#stepForm").css("height", height + 387 + 'px');
+            } else {
+                $("#stepForm").css("height", height + 435 + 'px');
+
+            }
+            $("#" + parentId).after(materialItem);
+        };
+
+
+
+        // 实现卡片删除
+        deleteItem = function (obj) {
+            // 获取父节点
+            var parent = obj.parentNode;
+            var parentId = parent.id;
+            parentId = parseInt(parentId.split("cardItem")[1]);
+            // 获取祖父节点
+            var reparent = parent.parentNode;
+            var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
+            if (depositoryDisplay === "none") {
+
+                $("#stepForm").css("height", height - 387 + 'px');
+            } else {
+                $("#stepForm").css("height", height - 435 + 'px');
+
+            }
+            params = remove(params, parentId);
+            reparent.removeChild(parent);
+        };
+
+
+        //删除数组中指定元素
+        function remove(arr, item) {
+            var result = [];
+            for (let i = 0; i < arr.length; i++) {
+                if (arr[i] === item) {
+                    continue;
+                }
+                result.push(arr[i]);
+            }
+            return result;
+        }
+
+        // 用于实现通过编码查询物料
+        selectCode = function (obj) {
+            // 输入code
+            var code = obj.value;
+            // 获取对应元素
+            var parent = obj.parentNode.parentNode.parentNode.parentNode;
+            var objId = parent.id.split("cardItem")[1];
+            var children = parent.childNodes[5];
+            var materialItem = children.childNodes[3].childNodes[1].childNodes;
+            var barCodeChildren = parent.childNodes[9];
+
+            var materialName = materialItem[1];
+            var materialId = materialName.parentNode.parentNode.childNodes[3];
+            // 条形码条码
+            var barCodeItem = barCodeChildren.childNodes[3];
+            var req = {};
+            req.mcode = code;
+            req.type = "out";
+            if (code !== "") {
+                let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
+                $.ajax({
+                    url: "/material/findMaterialByCodeForImmediatelyOut",
+                    type: "get",
+                    dataType: 'json',
+                    data: (req),
+                    contentType: "application/json;charset=utf-8",
+                    success: function (d) {
+                        var d = d.data;
+                        if (d == null) {
+                            layer.msg("仓库中暂无该物料", {icon: 0, time: 500}, function () {
+                                layer.close(loading2);
+                                materialName.value = "";
+                                materialId.value = "";
+                                obj.value = "";
+                                $('#place' + objId).empty();
+                            });
+
+                        } else {
+                            materialName.value = d.mname;
+                            materialId.value = d.id;
+                            var idNumber = materialId.name.split("mid")[1];
+                            // 获取物料与条形码的对应关系
+                            var materialAndBarCodeList = d["materialAndBarCodeList"];
+                            var unit = $("#unit" + idNumber);
+                            unit.empty();
+                            $("#unit" + idNumber).append(new Option(d.baseUnit, "-1"));
+                            var unitList = d["splitInfoList"];
+                            for (let i = 0; i < unitList.length; i++) {
+                                $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
+                            }
+                            if (materialAndBarCodeList.length > 0) {
+                                // 如果有对应的条形码
+                                var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
+                                var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
+                                var id = barCodeInput.id;
+                                $("#" + id).remove();
+                                $("#barCode" + idNumber).empty();
+                                var barCode = $("#barCode" + idNumber);
+                                if (barCode.length > 0) {
+                                    barCode.empty();
+                                } else {
+                                    var barCodeSelect = `
+                             <select id=` + "barCode" + idNumber + ` name=` + "barCode" + idNumber + `>
+                                        </select>`;
+                                    $("#" + barCodeImg.id).before(barCodeSelect);
+                                }
+                                form.render();
+                                $.each(materialAndBarCodeList, function (index, item) {
+                                    $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
+                                });
+                                form.render();
+                            } else {
+                                var barCode = $("#barCode" + idNumber);
+                                if (barCode.length > 0) {
+                                    barCode.empty();
+                                }
+                            }
+                            if (depositoryDisplay !== "none") {
+                                $("#showDepository" + idNumber).empty();
+                                let depositoryList = d.depositoryList;
+                                if (depositoryList !== null) {
+                                    for (let i = 0; i < depositoryList.length; i++) {
+                                        $("#showDepository" + idNumber).append(new Option(depositoryList[i].dname, depositoryList[i].id));
+                                    }
+                                }
+                            }
+                            form.render();
+                            layer.close(loading2);
+                        }
+                    }
+                });
+            }
+
+        };
+
+
+        // 用于实现点击搜索按钮
+        selectMaterial = function (obj) {
+            var parent = obj.parentNode.parentNode.parentNode.parentNode;
+            var parentId = parent.id;
+            var codeChildren = parent.childNodes[7];
+            var materialChildren = parent.childNodes[5];
+            var codeItem = codeChildren.childNodes[3].childNodes[1].childNodes;
+            var codeValue = codeItem[1];
+            var materialItem = materialChildren.childNodes[3].childNodes[1].childNodes;
+            var materialName = materialItem[1];
+            var materialId = materialName.parentNode.parentNode.childNodes[3];
+            var mname = materialName.value;
+            var barCodeChildren = parent.childNodes[9];
+            // 条形码条码
+            var barCodeItem = barCodeChildren.childNodes[3];
+
+            mname = mname.split(",")[0];
+            layer.open({
+                type: 2,
+                title: '弹窗内容',
+                skin: 'layui-layer-rim',
+                maxmin: true,
+                shadeClose: true, //点击遮罩关闭层
+                area: ['70%', '70%'],
+                content: '/getMaterialAll?mname=' + mname + '&type=immediately&clickObj=' + parentId,
+                move: '.layui-layer-title',
+                fixed: false,
+                success: function (layero, index) {
+                    var children = layero.children();
+                    var content = $(children[1]);
+                    var iframeChildren = $(content.children());
+                    content.css('height', '100%');
+                    iframeChildren.css('height', '100%');
+                },
+                end: function () {
+                    var mid = materialId.value;
+                    if (mid !== '') {
+                        let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
+                        $.ajax({
+                            url: "/material/findInventoryByIdForImmediately?mid=" + mid,
+                            type: "get",
+                            dataType: 'json',
+                            contentType: "application/json;charset=utf-8",
+                            success: function (d) {
+                                var material = d.data.materialById;
+                                var code = material.code;
+                                if (code === undefined) {
+                                    code = "";
+                                }
+                                codeValue.value = code;
+                                var materialAndBarCodeList = material["materialAndBarCodeList"];
+                                var idNumber = materialId.name.split("mid")[1];
+                                var unit = $("#unit" + idNumber);
+                                unit.empty();
+                                $("#unit" + idNumber).append(new Option(material.baseUnit, "-1"));
+                                var unitList = material["splitInfoList"];
+                                for (let i = 0; i < unitList.length; i++) {
+                                    $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
+                                }
+                                form.render();
+                                if (materialAndBarCodeList.length > 0) {
+                                    // 如果有对应的条形码
+                                    var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
+                                    var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
+                                    var id = barCodeInput.id;
+                                    $("#" + id).remove();
+                                    $("#barCode" + idNumber).empty();
+                                    var barCode = $("#barCode" + idNumber);
+                                    if (barCode.length > 0) {
+                                        barCode.empty();
+                                    } else {
+                                        var barCodeSelect = `
+                             <select id=` + "barCode" + idNumber + ` name=` + "barCode" + idNumber + `>
+                                        </select>`;
+                                        $("#" + barCodeImg.id).before(barCodeSelect);
+                                    }
+                                    form.render();
+                                    $.each(materialAndBarCodeList, function (index, item) {
+                                        $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
+                                    });
+                                    form.render();
+                                } else {
+                                    var barCode = $("#barCode" + idNumber);
+                                    if (barCode.length > 0) {
+                                        barCode.empty();
+                                    }
+                                }
+                                if (depositoryDisplay !== "none") {
+                                    $("#showDepository" + idNumber).empty();
+                                    let depositoryList = material.depositoryList;
+                                    if (depositoryList !== null) {
+                                        for (let i = 0; i < depositoryList.length; i++) {
+                                            $("#showDepository" + idNumber).append(new Option(depositoryList[i].dname, depositoryList[i].id));
+                                        }
+                                    }
+                                }
+                                form.render();
+                                layer.close(loading2);
+                            }
+                        });
+                    }
+                }
+            });
+        };
+
+        //用于实现物料名称搜索
+        selectMaterialByName = function (obj) {
+            var data = obj.value;
+            // 获取对应元素
+            var parent = obj.parentNode.parentNode.parentNode.parentNode;
+            var materialChildren = parent.childNodes[5];
+            var codeChildren = parent.childNodes[7];
+            var codeItem = codeChildren.childNodes[3].childNodes[1].childNodes;
+            var codeValue = codeItem[1];
+            var materialItem = materialChildren.childNodes[3].childNodes[1].childNodes;
+            var materialName = materialItem[1];
+            var materialId = materialName.parentNode.parentNode.childNodes[3];
+            var barCodeChildren = parent.childNodes[9];
+            // 条形码条码
+            var barCodeItem = barCodeChildren.childNodes[3];
+            var req = {};
+            data = data.split(",")[0];
+            if (data !== "") {
+                let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
+                req.mname = data;
+                $.ajax({
+                    url: "/material/findInventoryByConditionForImmediatelyOut",
+                    type: "post",
+                    dataType: 'json',
+                    data: JSON.stringify(req),
+                    contentType: "application/json;charset=utf-8",
+                    success: function (d) {
+                        if (d.count > 1) {
+                            layer.msg("请点击右侧搜索确定物品", {icon: 0, time: 500}, function () {
+                                layer.close(loading2);
+                                materialId.value = "";
+                                codeValue.value = "";
+                            });
+                            return false;
+                        } else if (d.count === 0) {
+                            layer.msg("没有该物品，请确认输入是否正确", {icon: 5, time: 500}, function () {
+                                layer.close(loading2);
+                                materialId.value = "";
+                                codeValue.value = "";
+                                materialName.value = "";
+                            });
+                            return false;
+                        } else {
+                            var idNumber = materialId.name.split("mid")[1];
+                            var material = d.data[0];
+                            var unit = $("#unit" + idNumber);
+                            unit.empty();
+                            $("#unit" + idNumber).append(new Option(material.baseUnit, "-1"));
+                            var unitList = material["splitInfoList"];
+                            if (unitList !== null && unitList != undefined) {
+                                for (let i = 0; i < unitList.length; i++) {
+                                    $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
+                                }
+                                form.render();
+                            }
+                            var materialAndBarCodeList = material["materialAndBarCodeList"];
+                            if (materialAndBarCodeList.length > 0) {
+                                // 如果有对应的条形码
+                                var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
+                                var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
+                                var id = barCodeInput.id;
+                                $("#" + id).remove();
+                                $("#barCode" + idNumber).empty();
+                                var barCode = $("#barCode" + idNumber);
+                                if (barCode.length > 0) {
+                                    barCode.empty();
+                                } else {
+                                    var barCodeSelect = `
+                             <select id=` + "barCode" + idNumber + ` name=` + "barCode" + idNumber + `>
+                                        </select>`;
+                                    $("#" + barCodeImg.id).before(barCodeSelect);
+                                }
+                                form.render();
+                                $.each(materialAndBarCodeList, function (index, item) {
+                                    $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
+                                });
+                                form.render();
+                            } else {
+                                var barCode = $("#barCode" + idNumber);
+                                if (barCode.length > 0) {
+                                    barCode.empty();
+                                }
+                            }
+                            materialName.value = material.mname;
+                            materialId.value = material.id;
+                            codeValue.value = material.code;
+
+                            $("#showDepository" + idNumber).empty();
+                            let depositoryList = material.depositoryList;
+                            if (depositoryList !== null) {
+                                for (let i = 0; i < depositoryList.length; i++) {
+                                    $("#showDepository" + idNumber).append(new Option(depositoryList[i].dname, depositoryList[i].id));
+                                }
+                            }
+                            form.render();
+
+                            layer.close(loading2);
+                        }
+                    }
+                });
+            }
+
+        };
+
+        // 扫描物料条码
+        scanBarCode = function (obj) {
+            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"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
+                success: function (res) {
+                    // 回调
+                    var result = res.resultStr;//当needResult为1时返回处理结果
+                    var req = {};
+                    req.qrCode = result;
+                    req.codeFlag = 1;
+                    req.outType = "immediately";
+                    let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
+                    $.ajax({
+                        url: "/material/qywxApplicationOutScanBarCode",
+                        type: "post",
+                        dataType: 'json',
+                        data: JSON.stringify(req),
+                        contentType: "application/json;charset=utf-8",
+                        success: function (d) {
+                            // 获取对应元素
+                            var parent = obj.parentNode.parentNode.parentNode.parentNode;
+
+                            var MaterialChildren = parent.childNodes[5];
+                            var materialItem = MaterialChildren.childNodes[3].childNodes[1].childNodes;
+
+                            var barCodeChildren = parent.childNodes[9];
+
+                            var materialName = materialItem[1];
+                            var materialId = materialName.parentNode.parentNode.childNodes[3];
+                            // 条形码条码
+                            var barCodeItem = barCodeChildren.childNodes[3];
+                            // 物料编码
+                            var materialCodeItem = parent.childNodes[7].childNodes[3].childNodes[1].childNodes;
+
+
+                            var materialCode = materialCodeItem[1];
+
+                            var data = d.data;
+                            if (data !== null) {
+                                materialName.value = data.mname;
+                                materialId.value = data.iid;
+                                materialCode.value = data.mcode;
+                                var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
+                                barCodeInput.value = result;
+                                var idNumber = materialId.name.split("mid")[1];
+                                var unit = $("#unit" + idNumber);
+                                unit.empty();
+                                $("#unit" + idNumber).append(new Option(data.unit, "-1"));
+                                var unitList = data["splitInfoList"];
+                                for (let i = 0; i < unitList.length; i++) {
+                                    $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
+                                }
+                                if (depositoryDisplay !== "none") {
+                                    $("#showDepository" + idNumber).empty();
+                                    let depositoryList = data.depositoryList;
+                                    if (depositoryList !== null) {
+                                        for (let i = 0; i < depositoryList.length; i++) {
+                                            $("#showDepository" + idNumber).append(new Option(depositoryList[i].dname, depositoryList[i].id));
+                                        }
+                                    }
+                                }
+                                form.render();
+                                layer.close(loading2);
+                            } else {
+                                // 如果没有对应关系
+                                layer.msg("对于编码：" + result + ",并未发现仓库中存在对应的物料", {
+                                    icon: 0,
+                                    time: 1000 //0.5秒关闭（如果不配置，默认是3秒）
+                                }, function () {
+                                    layer.close(loading2);
+                                })
+                            }
+
+                        }
+                    })
+                }
+            })
+
+
+        };
+
+        // 用于扫码功能
+        scanCodeByOut = function (obj) {
+            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"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
+                success: function (res) {
+                    // 回调
+                    var result = res.resultStr;//当needResult为1时返回处理结果
+                    var req = {};
+                    req.qrCode = result;
+                    req.codeFlag = 2;
+                    req.outType = "immediately";
+                    let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
+                    $.ajax({
+                        url: "/material/qywxApplicationOutScanQrCode",
+                        type: "post",
+                        dataType: 'json',
+                        data: JSON.stringify(req),
+                        contentType: "application/json;charset=utf-8",
+                        success: function (d) {
+                            var data = d.data;
+                            if (data === null) {
+                                layer.msg("对于编码：" + result + ",并未发现仓库中存在对应的物料", {
+                                    icon: 0,
+                                    time: 1000 //0.5秒关闭（如果不配置，默认是3秒）
+                                }, function () {
+                                    layer.close(loading2);
+                                })
+                            } else {
+                                // 获取对应元素
+                                var parent = obj.parentNode.parentNode.parentNode.parentNode;
+                                var MaterialChildren = parent.childNodes[5];
+                                var materialItem = MaterialChildren.childNodes[3].childNodes[1].childNodes;
+
+                                var barCodeChildren = parent.childNodes[9];
+
+                                var materialName = materialItem[1];
+                                var materialId = materialName.parentNode.parentNode.childNodes[3];
+                                // 条形码条码
+                                var barCodeItem = barCodeChildren.childNodes[3];
+                                // 物料编码
+                                var materialCodeItem = parent.childNodes[7].childNodes[3].childNodes[1].childNodes;
+
+                                var materialCode = materialCodeItem[1];
+
+                                var idNumber = materialId.name.split("mid")[1];
+
+
+                                // 获取物料与条形码的对应关系
+                                var materialAndBarCodeList = data["materialAndBarCodeList"];
+                                var barCode = $("#barCode" + idNumber);
+                                if (barCode.length > 0) {
+                                    barCode.empty();
+                                }
+
+                                if (materialAndBarCodeList.length > 0) {
+                                    // 如果有对应的条形码
+                                    var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
+                                    var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
+                                    var id = barCodeInput.id;
+                                    $("#" + id).remove();
+                                    $("#barCode" + idNumber).empty();
+                                    var barCode = $("#barCode" + idNumber);
+                                    if (barCode.length > 0) {
+                                        barCode.empty();
+                                    } else {
+                                        var barCodeSelect = `
+                                        <select id=` + "barCode" + idNumber + ` name=` + "barCode" + idNumber + `>
+                                        </select>`;
+                                        $("#" + barCodeImg.id).before(barCodeSelect);
+                                    }
+                                    form.render();
+
+                                    $.each(materialAndBarCodeList, function (index, item) {
+                                        $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
+                                    });
+                                    form.render();
+                                }
+                                $('#place' + idNumber).empty();
+                                $.each(data.placePList, function (index, item) {
+                                    $('#place' + idNumber).append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素
+                                });
+                                $("#unit" + idNumber).empty();
+                                $("#unit" + idNumber).append(new Option(data.baseUnit, "-1"));
+                                $.each(data.splitInfoList, function (index, item) {
+                                    $("#unit" + idNumber).append(new Option(item.newUnit, item.newUnit));
+                                });
+                                if (depositoryDisplay !== "none") {
+                                    $("#showDepository" + idNumber).empty();
+                                    let depositoryList = data.depositoryList;
+                                    if (depositoryList !== null) {
+                                        for (let i = 0; i < depositoryList.length; i++) {
+                                            $("#showDepository" + idNumber).append(new Option(depositoryList[i].dname, depositoryList[i].id));
+                                        }
+                                    }
+                                }
+                                form.render();
+                                materialName.value = data.mname;
+                                materialId.value = data.id;
+                                materialCode.value = data.code;
+
+                                layer.close(loading2);
+                            }
+                        }
+                    })
+                }
+            })
+        };
+
+        //用于判断当前物料数量是否合适
+        MaterialQuantityIsTrue = function (obj) {
+            var id = obj.id.split("quantity")[1];
+            var mcode = $("#code" + id).val(); // 获取到当前输入的物料编码
+            var unit = $("#unit" + id).val();
+            if (mcode === "" || mcode === undefined || mcode === null) {
+                layer.msg("请输入物料的正确编码！", {icon: 0, time: 500}, function () {
+                    $("#quantity" + id).val("")
+                });
+            } else {
+                let val = $("#quantity" + id).val();
+                if (val !== null && val !== undefined && val !== '') {
+                    var req = {};
+                    req.mcode = mcode;
+                    req.quantity = val;
+                    req.unit = unit;
+                    req.placeId = -1;
+                    if (depositoryDisplay !== "none") {
+                        req.depositoryId = $("#showDepository" + id).val();
+                    }
+                    let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
+                    $.ajax({
+                        url: "/material/MaterialQuantityIsTrue",
+                        type: "post",
+                        data: JSON.stringify(req),
+                        dataType: 'json',
+                        contentType: "application/json;charset=utf-8",
+                        success: function (res) {
+                            var flag = res.data;
+                            if (!flag) { // 如果当前数目不合适
+                                layer.msg("当前单个仓库中物料数量不足", {icon: 0, time: 500}, function () {
+                                        layer.close(loading2);
+                                        $("#quantity" + id).val("");
+                                    },
+                                );
+                            } else {
+                                layer.close(loading2)
+                            }
+
+                        }
+                    });
+                }
+            }
+        };
+
+
+        selectPost = function (obj) {
+            let id = obj.id;
+            layer.open({
+                type: 2,
+                title: '弹窗内容',
+                skin: 'layui-layer-rim',
+                maxmin: true,
+                shadeClose: true, //点击遮罩关闭层
+                area: ['70%', '70%'],
+                content: '/selectPost?id=' + id,
+                move: '.layui-layer-title',
+                fixed: false,
+                success: function (layero, index) {
+                    var children = layero.children();
+                    var content = $(children[1]);
+                    var iframeChildren = $(content.children());
+                    content.css('height', '100%');
+                    iframeChildren.css('height', '100%');
+                }
+            });
+        };
+
+        selectConstructionUnit = function (obj) {
+            let id = obj.id;
+            layer.open({
+                type: 2,
+                title: '弹窗内容',
+                skin: 'layui-layer-rim',
+                maxmin: true,
+                shadeClose: true, //点击遮罩关闭层
+                area: ['70%', '70%'],
+                content: '/selectConstructionUnit?id=' + id,
+                move: '.layui-layer-title',
+                fixed: false,
+                success: function (layero, index) {
+                    var children = layero.children();
+                    var content = $(children[1]);
+                    var iframeChildren = $(content.children());
+                    content.css('height', '100%');
+                    iframeChildren.css('height', '100%');
+                },
+                end: function () {
+                    let val = $("#" + id).val();
+                    if (val !== "") {
+                        if (id.indexOf("ForGroup") !== -1) {
+                            // 如果是组合
+                            $("#stepForm2").find('input[id*="project"]').each(function () {
+                                $(this).attr("lay-verify", "required")
+                            })
+
+                        } else {
+                            // 如果是物料
+                            $("#stepForm").find('input[id*="project"]').each(function () {
+                                $(this).attr("lay-verify", "required")
+                            })
+                        }
+                    } else {
+                        if (id.indexOf("ForGroup") !== -1) {
+                            // 如果是组合
+                            $("#stepForm2").find('input[id*="project"]').each(function () {
+                                $(this).removeAttr("lay-verify")
+                            })
+
+                        } else {
+                            // 如果是物料
+                            $("#stepForm").find('input[id*="project"]').each(function () {
+                                $(this).removeAttr("lay-verify")
+                            })
+                        }
+                    }
+                }
+            });
+        };
+
+
+        selectUser = function (obj) {
+            let name = obj.value;
+            if (name !== "") {
+                let req = {};
+                req.name = name;
+                req.scope = "company";
+                $.ajax({
+                    url: "/sys/findUserByName",
+                    type: "post",
+                    data: JSON.stringify(req),
+                    dataType: 'json',
+                    contentType: "application/json;charset=utf-8",
+                    beforeSend: function () {
+                        this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
+                    },
+                    success: function (res) {
+                        layer.close(this.layerIndex);
+                        let data = res.data;
+                        let count = res.count;
+                        if (count === 0) {
+                            layer.msg("不存在该用户，请选择对应部门", {
+                                icon: 0,
+                                time: 1000
+                            })
+                        } else if (count > 1) {
+
+                            let content = ``;
+                            $.each(data, function (index, item) {
+                                let listItem = `<div class="userItem">
+                                                        <button type="button" onclick="SelectTheUser(this)" id=` + item.id + `  adminorgname=` + item.maindeparmentname + ` adminorg=` + item.maindeparment + `  class="layui-btn layui-btn-fluid">` + item.companyname + "-" + item.maindeparmentname + "-" + item.number + "-" + item.name + `</button>
+                                                 </div>`;
+                                content += listItem;
+                            });
+                            selectUserIfame = layer.open({
+                                type: 1,
+                                title: false,
+                                area: ["70%", "70%"],
+                                content: content
+                            })
+                        } else {
+                            let user = data[0];
+                            $("#adminorgId").val(user.maindeparment);
+                            $("#openCompanyAdminorg").val(user.maindeparmentname);
+                            $("#userId").val(user.id);
+                        }
+                    }
+                })
+            }
+        };
+
+
+        // 用于选定人员
+        SelectTheUser = function (obj) {
+            let data = $(obj);
+            let adminorg = data.attr("adminorg");
+            let adminorgName = data.attr("adminorgname");
+            let id = data.attr("id");
+            $("#adminorgId").val(adminorg);
+            $("#openCompanyAdminorg").val(adminorgName);
+            $("#userId").val(id);
+            layer.close(selectUserIfame)
+        };
+
+        form.on('select()', function (data) {
+
+            let id = data.elem.id;
+            if (id.indexOf('outType') === -1) {
+                let idNum = id.split("unit")[1];
+                let unit = "";
+                let mcode = "";
+                let depositoryId = "-1";
+                if (id.indexOf('unit') !== -1) {
+                    unit = data.value;
+                } else {
+                    // 获取当前选中的仓库id
+                    depositoryId = data.value;
+                    idNum = id.split('showDepository')[1];
+                    unit = $("#unit" + idNum).val();
+
+                }
+                mcode = $("#code" + idNum).val();
+                if (mcode === "" || mcode === undefined || mcode === null) {
+                    layer.msg("请输入物料的正确编码！", {icon: 0, time: 500}, function () {
+                        $("#quantity" + idNum).val("")
+                    });
+                } else {
+                    let val = $("#quantity" + idNum).val();
+                    if (val !== null && val !== undefined && val !== '') {
+                        var req = {};
+                        req.mcode = mcode;
+                        req.quantity = val;
+                        req.unit = unit;
+                        req.placeId = -1;
+                        if (depositoryId !== "-1") {
+                            req.depositoryId = depositoryId;
+                        }
+                        let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
+                        $.ajax({
+                            url: "/material/MaterialQuantityIsTrue",
+                            type: "post",
+                            data: JSON.stringify(req),
+                            dataType: 'json',
+                            contentType: "application/json;charset=utf-8",
+                            success: function (res) {
+                                var flag = res.data;
+                                if (!flag) { // 如果当前数目不合适
+                                    layer.msg("当前单个仓库中物料数量不足", {icon: 0, time: 500}, function () {
+                                            layer.close(loading2);
+                                            $("#quantity" + idNum).val("");
+                                        },
+                                    );
+                                } else {
+                                    layer.close(loading2)
+                                }
+
+                            }
+                        });
+                    }
+                }
+            }
+
+
+        });
+    })
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/pages/showInventory/showInventoryForLocation.html b/src/main/resources/templates/pages/showInventory/showInventoryForLocation.html
index 9d47a92f..d2824c51 100644
--- a/src/main/resources/templates/pages/showInventory/showInventoryForLocation.html
+++ b/src/main/resources/templates/pages/showInventory/showInventoryForLocation.html
@@ -46,7 +46,7 @@
 
         #chooseBusinessType {
             position: fixed;
-            width: 400px;
+            width: 500px;
             bottom: 20px;
             left: 0;
             right: 0;
@@ -90,6 +90,10 @@
                                     <button class="layui-btn layui-btn-customize" type="button"
                                             onclick="applicationOut()">出库申请
                                     </button>
+
+                                    <button class="layui-btn layui-btn-customize" type="button" th:style="'display:'+${display}"
+                                            onclick="applicationImmediateOut()">直接出库申请
+                                    </button>
                                 </div>
                             </div>
                         </div>
@@ -117,6 +121,10 @@
 
     }
 
+    function applicationImmediateOut() {
+
+    }
+
     var depositoryId = "-1";
     var placeId = "0";
 
@@ -317,6 +325,16 @@
             });
         };
 
+        /**
+         * 用于跳转到直接出库页面
+         */
+        applicationImmediateOut = function () {
+            miniTab.openNewTabByIframeNew({
+                href: "/application_Immediate_Out_temporaryValue",
+                title: "出库申请"
+            });
+        };
+
 
         /**
          * 用于选择选择框
diff --git a/target/classes/templates/pages/showInventory/showInventoryForLocation.html b/target/classes/templates/pages/showInventory/showInventoryForLocation.html
index 9d47a92f..d2824c51 100644
--- a/target/classes/templates/pages/showInventory/showInventoryForLocation.html
+++ b/target/classes/templates/pages/showInventory/showInventoryForLocation.html
@@ -46,7 +46,7 @@
 
         #chooseBusinessType {
             position: fixed;
-            width: 400px;
+            width: 500px;
             bottom: 20px;
             left: 0;
             right: 0;
@@ -90,6 +90,10 @@
                                     <button class="layui-btn layui-btn-customize" type="button"
                                             onclick="applicationOut()">出库申请
                                     </button>
+
+                                    <button class="layui-btn layui-btn-customize" type="button" th:style="'display:'+${display}"
+                                            onclick="applicationImmediateOut()">直接出库申请
+                                    </button>
                                 </div>
                             </div>
                         </div>
@@ -117,6 +121,10 @@
 
     }
 
+    function applicationImmediateOut() {
+
+    }
+
     var depositoryId = "-1";
     var placeId = "0";
 
@@ -317,6 +325,16 @@
             });
         };
 
+        /**
+         * 用于跳转到直接出库页面
+         */
+        applicationImmediateOut = function () {
+            miniTab.openNewTabByIframeNew({
+                href: "/application_Immediate_Out_temporaryValue",
+                title: "出库申请"
+            });
+        };
+
 
         /**
          * 用于选择选择框