diff --git a/target/classes/.restartTriggerFile b/target/classes/.restartTriggerFile
new file mode 100644
index 00000000..e69de29b
diff --git a/target/classes/templates/pages/group/group-add_back.html b/target/classes/templates/pages/group/group-add_back.html
new file mode 100644
index 00000000..f7770d2d
--- /dev/null
+++ b/target/classes/templates/pages/group/group-add_back.html
@@ -0,0 +1,801 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="utf-8">
+    <title>layui</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">
+</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">
+        <input style="display: none" id="gid" th:value="${gid}">
+        <div style="margin: 10px 10px 10px 10px">
+            <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-body" id="takingHeader" style="padding-right: 0px">
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">组合名称:</label>
+                                    <div class="layui-input-block">
+                                        <div class="inputdiv">
+                                            <input type="text" placeholder="请输入组合名称" class="layui-input" id="gname" th:value="${gid == -1?'':group?.getGname()}"
+                                                   name="gname" lay-verify="required">
+                                        </div>
+                                    </div>
+                                </div>
+                                <label class="layui-form-label">备注说明:</label>
+                                <div class="layui-input-block">
+                                    <input name="applyRemark" placeholder="请填写相关原因及申请原因" th:value="${gid == -1?'':group?.getRemark()}"
+                                           class="layui-input"/>
+                                </div>
+                            </div>
+
+                            <div class="layui-card" id="cardParent" style="box-shadow:none">
+                                <fieldset class="table-search-fieldset">
+                                    <legend>组合明细</legend>
+                                    <div class="layui-card-body" id="cardItem">
+                                        <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">物料名称:</label>
+                                            <div class="layui-input-block">
+                                                <div class="inputdiv">
+                                                    <input type="text" placeholder="请选择物料" class="layui-input"
+                                                           style="border-style: none"
+                                                           id="openSonByMaterial"
+                                                           onblur="selectMaterialByName(this)"
+                                                           lay-verify="required"/>
+                                                    <i class="layui-icon layui-icon-search"
+                                                       style="display: inline"
+                                                       id="selectMaterial" onclick="selectMaterial(this)"></i>
+                                                </div>
+                                                <input type="text" name="mid" class="layui-input" id="mid"
+                                                       style="display: none" lay-verify="required"/>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">物料编码:</label>
+                                            <div class="layui-input-block">
+                                                <div class="inputdiv">
+                                                    <input id="code" name="code" 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="scanCodeForMaterial(this)">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">条形编码:</label>
+                                            <div class="layui-input-block" style="margin: 0px;">
+                                                <div class="inputdiv">
+                                                    <input id="barCode" name="barCode" type="text"
+                                                           placeholder="请填写入条形编码"
+                                                           value=""
+                                                           class="layui-input"
+                                                           style="border-style: none">
+                                                    <img src="/static/images/search.ico" height="16" width="16"
+                                                         id="barCodeImg"
+                                                         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" type="number" placeholder="请填写入物料数量"
+                                                       value=""
+                                                       id="quantity"
+                                                       class="layui-input" lay-verify="number" required>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">计量单位:</label>
+                                            <div class="layui-input-block">
+                                                <select id="unit" name="unit">
+
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <i class="layui-icon layui-icon-addition" style="display: inline"
+                                           onclick="addItem(this)"></i>
+                                    </div>
+                                </fieldset>
+                                <!--                            提交按钮-->
+                                <div class="layui-form-item" id="btn_sub" style="margin-top: 10px">
+                                    <div class="layui-input-block">
+                                        <button class="layui-btn" lay-submit lay-filter="formStep" type="button"
+                                                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 style="text-align: center;margin-top: 50px;">
+                                    <button class="layui-btn next" >再创建一次</button>
+                                </div>
+                            </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>
+    // 实现卡片添加
+    function addItem() {
+
+    }
+
+    // 实现卡片删除
+    function deleteItem() {
+
+    }
+
+    // 扫描物料条码
+    function scanBarCode() {
+
+    }
+
+    // 用于扫码功能
+    function scanCodeForMaterial() {
+
+    }
+
+    // 用于实现点击搜索按钮
+    function selectMaterial() {
+
+    }
+
+    // 用于实现通过编码查询物料
+    function selectCode() {
+
+    }
+
+    // 用于实现物料名称搜索
+    function selectMaterialByName() {
+
+    }
+
+    // 用于暂存卡片个数
+    var params = [];
+    // 用于卡片编号
+    var NewIdNumber = 1;
+
+    layui.use(['form', 'layer', 'tree', 'step'], function () {
+        var $ = layui.jquery,
+            form = layui.form,
+            step = layui.step;
+
+        let gid = $("#gid").val();
+
+        step.render({
+            elem: '#stepForm',
+            filter: 'stepForm',
+            width: '100%', //设置容器宽度
+            height: '600px',
+            stepItems: [{
+                title: '填写信息'
+            }, {
+                title: '创建成功'
+            }]
+        });
+
+        // 提交（组合出库）
+        form.on('submit(formStep)', function (data) {
+            data = data.field;
+            data.len = NewIdNumber;
+            data.params = params;
+            if("-1" !== gid){
+                data.gid = gid;
+            }
+            $.ajax({
+                url: "/group/addGroup",
+                data: JSON.stringify(data),
+                dataType: "json",
+                type: "post",
+                contentType: "application/json;charset=utf-8",
+                beforeSend: function () {
+                    this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
+                },
+                success: function (d) {
+                    layer.close(this.layerIndex);
+                    if (d.status >= 300) {
+                        layer.msg(d.statusInfo.detail);//失败的表情
+
+                    } else {
+                        layer.msg("创建成功", {
+                            icon: 6,//成功的表情
+                            time: 1000 //1秒关闭（如果不配置，默认是3秒）
+                        }, function () {
+                            step.next('#stepForm');
+                        });
+                    }
+                },
+                complete: function () {
+                    layer.close(this.layerIndex);
+                }
+            })
+        });
+
+        $('.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">物料名称</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"+NewIdNumber+`
+                                                               style="display: none" lay-verify="required" />
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label">物料编码:</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="scanCodeForMaterial(this)">
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                 <div class="layui-form-item">
+                                        <label class="layui-form-label">条形编码:</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=""
+                                                   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>
+
+                                <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);
+            $("#stepForm").css("height", height + 384 + '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]);
+            $("#stepForm").css("height", height - 384 + '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;
+        }
+
+        // 扫描物料条码
+        scanBarCode = function (obj) {
+            parent.wx.scanQRCode({
+                desc: 'scanQRCode desc',
+                needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
+                scanType: ["barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
+                success: function (res) {
+                    // 回调
+                    var result = res.resultStr;//当needResult为1时返回处理结果
+                    var req = {};
+                    req.qrCode = result;
+                    $.ajax({
+                        url: "/material/qywxApplicationInScanBarCode",
+                        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.mid;
+                                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));
+                                }
+                                form.render();
+                            } else {
+                                // 如果没有对应关系
+                                layer.msg("对于编码：" + result + ",并未发现对应的物料", {
+                                    icon: 0,
+                                    time: 1000 //0.5秒关闭（如果不配置，默认是3秒）
+                                }, function () {
+                                })
+                            }
+
+                        }
+                    })
+                }
+            })
+        };
+
+        // 用于扫码功能
+        scanCodeForMaterial = function (obj) {
+            parent.wx.scanQRCode({
+                desc: 'scanQRCode desc',
+                needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
+                scanType: ["qrCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
+                success: function (res) {
+                    // 回调
+                    var result = res.resultStr;//当needResult为1时返回处理结果
+                    var req = {};
+                    req.qrCode = result;
+                    $.ajax({
+                        url: "/material/qywxApplicationInScanQrCode",
+                        type: "post",
+                        dataType: 'json',
+                        data: JSON.stringify(req),
+                        contentType: "application/json;charset=utf-8",
+                        success: function (d) {
+                            var data = d.data;
+                            // 获取对应元素
+                            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.unit, "-1"));
+                            $.each(data.splitInfoList, function (index, item) {
+                                $("#unit" + idNumber).append(new Option(item.newUnit, item.newUnit));
+                            });
+                            form.render();
+                            materialName.value = data.mname;
+                            materialId.value = data.mid;
+                            materialCode.value = data.code;
+                        }
+                    })
+                }
+            })
+        };
+
+        // 用于实现点击搜索按钮
+        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: '/selectMaterialByCard?mname=' + mname + '&type=2&clickObj=' + parentId,
+                content: '/getMaterialAll?mname=' + mname + '&type=1&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 !== '') {
+                        $.ajax({
+                            url: "/material/findMatrialById?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.unit, "-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();
+                                    }
+                                }
+                                form.render();
+                            }
+                        });
+                    }
+                }
+            });
+        };
+
+        // 用于实现通过编码查询物料
+        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.code = code;
+            req.type = "in";
+            $.ajax({
+                url: "/material/findMatrialByCode",
+                type: "get",
+                dataType: 'json',
+                data: (req),
+                contentType: "application/json;charset=utf-8",
+                success: function (d) {
+                    var d = d.data;
+                    if (d == null) {
+                        layer.msg("仓库中暂无该物料");
+                        materialName.value = "";
+                        materialId.value = "";
+                        obj.value = "";
+                        $('#place' + objId).empty();
+
+                    } else {
+                        materialName.value = d.mname;
+                        materialId.value = d.mid;
+                        var idNumber = materialId.name.split("mid")[1];
+                        // 获取物料与条形码的对应关系
+                        var materialAndBarCodeList = d["materialAndBarCodeList"];
+                        var unit = $("#unit" + idNumber);
+                        unit.empty();
+                        $("#unit" + idNumber).append(new Option(d.unit, "-1"));
+                        var unitList = d["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();
+                            }
+                        }
+                    }
+                }
+            });
+        };
+
+        //用于实现物料名称搜索
+        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 = {};
+            req.mname = data;
+            $.ajax({
+                url: "/material/findMaterialByCondition",
+                type: "post",
+                dataType: 'json',
+                data: JSON.stringify(req),
+                contentType: "application/json;charset=utf-8",
+                success: function (d) {
+                    if (d.count > 1) {
+                        layer.msg("请点击右侧搜索确定物品");
+                        materialId.value = "";
+                        codeValue.value = "";
+                        return false;
+                    } else if (d.count === 0) {
+                        layer.msg("没有该物品，请确认输入是否正确");
+                        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.unit, "-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;
+                    }
+                }
+            });
+        };
+
+
+    })
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/target/classes/templates/pages/group/group_material_edit.html b/target/classes/templates/pages/group/group_material_edit.html
index e4e21f72..7795b449 100644
--- a/target/classes/templates/pages/group/group_material_edit.html
+++ b/target/classes/templates/pages/group/group_material_edit.html
@@ -77,21 +77,15 @@
     <div class="layui-form-item">
         <label class="layui-form-label">计量单位</label>
         <div class="layui-input-inline">
-            <input type="text" th:value="${record.getUnit()}" name="unit" required autocomplete="off" readonly
-                   class="layui-input">
+            <select id="unit" name="unit">
+                <option value="-1" th:text="${record.getMunit()}" th:selected="${record.getUnit() == '-1'}"></option>
+                <option th:each="splitInfo,iterStar:${splitList}" th:selected="${splitInfo.getNewUnit() == record.getUnit()}"
+                        th:value="${splitInfo?.getNewUnit()}"
+                        th:text="${splitInfo?.getNewUnit()}">
+                </option>
+            </select>
         </div>
     </div>
-
-
-
-    <div class="layui-form-item">
-        <label class="layui-form-label">备注:</label>
-        <div class="layui-input-inline">
-            <input type="text" placeholder="请填写备注" class="layui-input" th:value="${record.getRemark()}"
-                   name="remark" />
-        </div>
-    </div>
-
     <div class="layui-form-item">
         <div class="layui-input-block">
             <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
