修改系统内部审批流程

src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java

@@ -2414,7 +2414,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                                 redisPool.getRedisTemplateByDb(14).opsForHash().putAll(redisOutKey, stringObjectMap);
                                 redisPool.getRedisTemplateByDb(14).expire(redisOutKey, 72, TimeUnit.HOURS);
                             });
-                        } else {
+                        }
+                        else {
                             // 如果是通过仓库
 
 
@@ -3074,11 +3075,13 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                 // 获取所有仓库
                 List<Depository> depositoryAll = depositoryMapper.findDepositoryAll();
                 for (Depository depositoryById : depositoryByIds) {
-                    // 获取当前仓库的顶级仓库
                     Depository parentDepository = findParentDepository(depositoryById, depositoryAll);
-                    if (parentDepository.getDname().contains("办公")) {
-                        // 设置为true
-                        flagForZXCWorkWarehouse = true;
+                    if (!parentDepository.getDname().contains("前置仓")) {
+                        // 如果不是前置仓下的仓库
+                        if (depositoryById.getDname().contains("办公")) {
+                            // 如果是中心仓下的办公用品库
+                            flagForZXCWorkWarehouse = true;
+                        }
                     }
                 }
                 if (!flagForZXCWorkWarehouse) {

src/main/resources/templates/pages/applicationForStorageCenter/application-out.html

@@ -122,7 +122,7 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">出库类别:</label>
                                                 <div class="layui-input-block">
-                                                    <select name="outType">
+                                                    <select name="outType" id="outType">
                                                         <option></option>
                                                         <option th:each="bt,iterStar:${btList}"
                                                                 th:value="${bt?.getId()}"
@@ -322,8 +322,12 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">出库类别:</label>
                                                 <div class="layui-input-block">
-                                                    <input name="outType" placeholder="请填写相关原因及申请原因" value=""
-                                                           class="layui-input"/>
+                                                    <select name="outType" id="outTypeForGroup">
+                                                        <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">
@@ -1927,74 +1931,80 @@
         form.on('select()', function (data) {
 
             let id = data.elem.id;
-            let idNum = id.split("unit")[1];
-            let unit = "";
-            let mcode = "";
-            let depositoryId = "-1";
-            // 用于标志是否为物料出库（默认为物料）
-            let flag = true;
-            if (id.indexOf('unit') !== -1) {
-                unit = data.value;
-                if (depositoryDisplay !== "none") {
-                    depositoryId = $("#showDepository" + idNum).val();
+            if(id.indexOf('outType') === -1){
+                let idNum = id.split("unit")[1];
+                let unit = "";
+                let mcode = "";
+                let depositoryId = "-1";
+                // 用于标志是否为物料出库（默认为物料）
+                let flag = true;
+                if (id.indexOf('unit') !== -1) {
+                    unit = data.value;
+                    if (depositoryDisplay !== "none") {
+                        depositoryId = $("#showDepository" + idNum).val();
+                    }
                 }
-            } else if (id.indexOf('ForGroup') === -1) {
-                // 获取当前选中的仓库id是在物料出库下
-                depositoryId = data.value;
-                idNum = id.split('showDepository')[1];
-                unit = $("#unit" + idNum).val();
-            } else if (id.indexOf("ForGroup") !== -1) {
-                depositoryId = data.value;
-                idNum = id.split('showDepositoryForGroup')[1];
-                flag = false;
-            }
-            if (flag) {
-                mcode = $("#code" + idNum).val();
-                if (mcode === "" || mcode === undefined || mcode === null) {
-                    layer.msg("请输入物料的正确编码！", {icon: 0, time: 1000}, 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)
-                                }
-
-                            }
+                else if (id.indexOf('ForGroup') === -1) {
+                    // 获取当前选中的仓库id是在物料出库下
+                    depositoryId = data.value;
+                    idNum = id.split('showDepository')[1];
+                    unit = $("#unit" + idNum).val();
+                }
+                else if (id.indexOf("ForGroup") !== -1) {
+                    depositoryId = data.value;
+                    idNum = id.split('showDepositoryForGroup')[1];
+                    flag = false;
+                }
+                if (flag) {
+                    mcode = $("#code" + idNum).val();
+                    if (mcode === "" || mcode === undefined || mcode === null) {
+                        layer.msg("请输入物料的正确编码！", {icon: 0, time: 1000}, 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)
+                                    }
+
+                                }
+                            });
+                        }
                     }
                 }
-            } else {
-                let elem = {};
-                elem.id = "quantityForGroup" + idNum;
-                groupQuantityIsTrue(elem)
+                else {
+                    let elem = {};
+                    elem.id = "quantityForGroup" + idNum;
+                    groupQuantityIsTrue(elem)
+                }
             }
 
 
+
         });
 
 

src/main/resources/templates/pages/applicationForStorageCenter/application-out_admin.html

@@ -109,7 +109,7 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">出库类别:</label>
                                                 <div class="layui-input-block">
-                                                    <select name="outType">
+                                                    <select name="outType" id="outType">
                                                         <option></option>
                                                         <option th:each="bt,iterStar:${btList}"
                                                                 th:value="${bt?.getId()}"
@@ -283,8 +283,12 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">出库类别:</label>
                                                 <div class="layui-input-block">
-                                                    <input name="outType" placeholder="请填写相关原因及申请原因" value=""
-                                                           class="layui-input"/>
+                                                    <select name="outType" id="outTypeForGroup">
+                                                        <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">
@@ -1945,60 +1949,65 @@
         form.on('select()', function (data) {
 
             let id = data.elem.id;
-            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)
-                            }
+            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>

src/main/resources/templates/pages/applicationForStorageCenter/application-out_back.html

@@ -104,7 +104,7 @@
                                         <div class="layui-form-item">
                                             <label class="layui-form-label">出库类别:</label>
                                             <div class="layui-input-block">
-                                                <select name="outType">
+                                                <select name="outType" id="outType">
                                                     <option></option>
                                                     <option th:each="bt,iterStar:${btList}"
                                                             th:value="${bt?.getId()}"
@@ -596,61 +596,66 @@
         form.on('select()', function (data) {
 
             let id = data.elem.id;
-            let unit = "";
-            let mcode = "";
-            let depositoryId = "-1";
-            if (id.indexOf('unit') !== -1) {
-                unit = data.value;
-                if (depositoryDisplay !== "none") {
-                    depositoryId = $("#showDepository" + idNum).val();
-                }
-            } else {
-                // 获取当前选中的仓库id
-                depositoryId = data.value;
-                unit = $("#unit").val();
-
-            }
-            mcode = $("#code").val();
-            if (mcode === "" || mcode === undefined || mcode === null) {
-                layer.msg("请输入物料的正确编码！", {icon: 0, time: 500}, function () {
-                    $("#quantity").val("")
-                });
-            } else {
-                let val = $("#quantity").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;
+            if(id.indexOf('outType') === -1){
+                let unit = "";
+                let mcode = "";
+                let depositoryId = "-1";
+                if (id.indexOf('unit') !== -1) {
+                    unit = data.value;
+                    if (depositoryDisplay !== "none") {
+                        depositoryId = $("#showDepository" + idNum).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").val("");
-                                    },
-                                );
-                            } else {
-                                layer.close(loading2)
-                            }
+                }
+                else {
+                    // 获取当前选中的仓库id
+                    depositoryId = data.value;
+                    unit = $("#unit").val();
 
-                        }
+                }
+                mcode = $("#code").val();
+                if (mcode === "" || mcode === undefined || mcode === null) {
+                    layer.msg("请输入物料的正确编码！", {icon: 0, time: 500}, function () {
+                        $("#quantity").val("")
                     });
                 }
+                else {
+                    let val = $("#quantity").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").val("");
+                                        },
+                                    );
+                                } else {
+                                    layer.close(loading2)
+                                }
+
+                            }
+                        });
+                    }
+                }
             }
 
 
+
         });
 
 

src/main/resources/templates/pages/applicationForStorageCenter/application-out_temporaryValue.html

@@ -82,7 +82,7 @@
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">出库类别:</label>
                                     <div class="layui-input-block">
-                                        <select name="outType">
+                                        <select name="outType" id="outType">
                                             <option></option>
                                             <option th:each="bt,iterStar:${btList}"
                                                     th:value="${bt?.getId()}"
@@ -1176,63 +1176,68 @@
         form.on('select()', function (data) {
 
             let id = data.elem.id;
-            let idNum = id.split("unit")[1];
-            let unit = "";
-            let mcode = "";
-            let depositoryId = "-1";
-            if (id.indexOf('unit') !== -1) {
-                unit = data.value;
-                if (depositoryDisplay !== "none") {
-                    depositoryId = $("#showDepository" + idNum).val();
-                }
-            } 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;
+            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;
+                    if (depositoryDisplay !== "none") {
+                        depositoryId = $("#showDepository" + idNum).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" + idNum).val("");
-                                    },
-                                );
-                            } else {
-                                layer.close(loading2)
-                            }
+                }
+                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)
+                                }
+
+                            }
+                        });
+                    }
+                }
             }
 
 
+
         });
 
 

target/classes/templates/pages/applicationForStorageCenter/application-out.html

@@ -122,7 +122,7 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">出库类别:</label>
                                                 <div class="layui-input-block">
-                                                    <select name="outType">
+                                                    <select name="outType" id="outType">
                                                         <option></option>
                                                         <option th:each="bt,iterStar:${btList}"
                                                                 th:value="${bt?.getId()}"
@@ -322,8 +322,12 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">出库类别:</label>
                                                 <div class="layui-input-block">
-                                                    <input name="outType" placeholder="请填写相关原因及申请原因" value=""
-                                                           class="layui-input"/>
+                                                    <select name="outType" id="outTypeForGroup">
+                                                        <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">
@@ -1927,74 +1931,80 @@
         form.on('select()', function (data) {
 
             let id = data.elem.id;
-            let idNum = id.split("unit")[1];
-            let unit = "";
-            let mcode = "";
-            let depositoryId = "-1";
-            // 用于标志是否为物料出库（默认为物料）
-            let flag = true;
-            if (id.indexOf('unit') !== -1) {
-                unit = data.value;
-                if (depositoryDisplay !== "none") {
-                    depositoryId = $("#showDepository" + idNum).val();
+            if(id.indexOf('outType') === -1){
+                let idNum = id.split("unit")[1];
+                let unit = "";
+                let mcode = "";
+                let depositoryId = "-1";
+                // 用于标志是否为物料出库（默认为物料）
+                let flag = true;
+                if (id.indexOf('unit') !== -1) {
+                    unit = data.value;
+                    if (depositoryDisplay !== "none") {
+                        depositoryId = $("#showDepository" + idNum).val();
+                    }
                 }
-            } else if (id.indexOf('ForGroup') === -1) {
-                // 获取当前选中的仓库id是在物料出库下
-                depositoryId = data.value;
-                idNum = id.split('showDepository')[1];
-                unit = $("#unit" + idNum).val();
-            } else if (id.indexOf("ForGroup") !== -1) {
-                depositoryId = data.value;
-                idNum = id.split('showDepositoryForGroup')[1];
-                flag = false;
-            }
-            if (flag) {
-                mcode = $("#code" + idNum).val();
-                if (mcode === "" || mcode === undefined || mcode === null) {
-                    layer.msg("请输入物料的正确编码！", {icon: 0, time: 1000}, 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)
-                                }
-
-                            }
+                else if (id.indexOf('ForGroup') === -1) {
+                    // 获取当前选中的仓库id是在物料出库下
+                    depositoryId = data.value;
+                    idNum = id.split('showDepository')[1];
+                    unit = $("#unit" + idNum).val();
+                }
+                else if (id.indexOf("ForGroup") !== -1) {
+                    depositoryId = data.value;
+                    idNum = id.split('showDepositoryForGroup')[1];
+                    flag = false;
+                }
+                if (flag) {
+                    mcode = $("#code" + idNum).val();
+                    if (mcode === "" || mcode === undefined || mcode === null) {
+                        layer.msg("请输入物料的正确编码！", {icon: 0, time: 1000}, 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)
+                                    }
+
+                                }
+                            });
+                        }
                     }
                 }
-            } else {
-                let elem = {};
-                elem.id = "quantityForGroup" + idNum;
-                groupQuantityIsTrue(elem)
+                else {
+                    let elem = {};
+                    elem.id = "quantityForGroup" + idNum;
+                    groupQuantityIsTrue(elem)
+                }
             }
 
 
+
         });
 
 

target/classes/templates/pages/applicationForStorageCenter/application-out_admin.html

@@ -109,7 +109,7 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">出库类别:</label>
                                                 <div class="layui-input-block">
-                                                    <select name="outType">
+                                                    <select name="outType" id="outType">
                                                         <option></option>
                                                         <option th:each="bt,iterStar:${btList}"
                                                                 th:value="${bt?.getId()}"
@@ -283,8 +283,12 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">出库类别:</label>
                                                 <div class="layui-input-block">
-                                                    <input name="outType" placeholder="请填写相关原因及申请原因" value=""
-                                                           class="layui-input"/>
+                                                    <select name="outType" id="outTypeForGroup">
+                                                        <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">
@@ -1945,60 +1949,65 @@
         form.on('select()', function (data) {
 
             let id = data.elem.id;
-            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)
-                            }
+            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>

target/classes/templates/pages/applicationForStorageCenter/application-out_back.html

@@ -104,7 +104,7 @@
                                         <div class="layui-form-item">
                                             <label class="layui-form-label">出库类别:</label>
                                             <div class="layui-input-block">
-                                                <select name="outType">
+                                                <select name="outType" id="outType">
                                                     <option></option>
                                                     <option th:each="bt,iterStar:${btList}"
                                                             th:value="${bt?.getId()}"
@@ -596,61 +596,66 @@
         form.on('select()', function (data) {
 
             let id = data.elem.id;
-            let unit = "";
-            let mcode = "";
-            let depositoryId = "-1";
-            if (id.indexOf('unit') !== -1) {
-                unit = data.value;
-                if (depositoryDisplay !== "none") {
-                    depositoryId = $("#showDepository" + idNum).val();
-                }
-            } else {
-                // 获取当前选中的仓库id
-                depositoryId = data.value;
-                unit = $("#unit").val();
-
-            }
-            mcode = $("#code").val();
-            if (mcode === "" || mcode === undefined || mcode === null) {
-                layer.msg("请输入物料的正确编码！", {icon: 0, time: 500}, function () {
-                    $("#quantity").val("")
-                });
-            } else {
-                let val = $("#quantity").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;
+            if(id.indexOf('outType') === -1){
+                let unit = "";
+                let mcode = "";
+                let depositoryId = "-1";
+                if (id.indexOf('unit') !== -1) {
+                    unit = data.value;
+                    if (depositoryDisplay !== "none") {
+                        depositoryId = $("#showDepository" + idNum).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").val("");
-                                    },
-                                );
-                            } else {
-                                layer.close(loading2)
-                            }
+                }
+                else {
+                    // 获取当前选中的仓库id
+                    depositoryId = data.value;
+                    unit = $("#unit").val();
 
-                        }
+                }
+                mcode = $("#code").val();
+                if (mcode === "" || mcode === undefined || mcode === null) {
+                    layer.msg("请输入物料的正确编码！", {icon: 0, time: 500}, function () {
+                        $("#quantity").val("")
                     });
                 }
+                else {
+                    let val = $("#quantity").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").val("");
+                                        },
+                                    );
+                                } else {
+                                    layer.close(loading2)
+                                }
+
+                            }
+                        });
+                    }
+                }
             }
 
 
+
         });
 
 

target/classes/templates/pages/applicationForStorageCenter/application-out_temporaryValue.html

@@ -82,7 +82,7 @@
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">出库类别:</label>
                                     <div class="layui-input-block">
-                                        <select name="outType">
+                                        <select name="outType" id="outType">
                                             <option></option>
                                             <option th:each="bt,iterStar:${btList}"
                                                     th:value="${bt?.getId()}"
@@ -1176,63 +1176,68 @@
         form.on('select()', function (data) {
 
             let id = data.elem.id;
-            let idNum = id.split("unit")[1];
-            let unit = "";
-            let mcode = "";
-            let depositoryId = "-1";
-            if (id.indexOf('unit') !== -1) {
-                unit = data.value;
-                if (depositoryDisplay !== "none") {
-                    depositoryId = $("#showDepository" + idNum).val();
-                }
-            } 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;
+            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;
+                    if (depositoryDisplay !== "none") {
+                        depositoryId = $("#showDepository" + idNum).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" + idNum).val("");
-                                    },
-                                );
-                            } else {
-                                layer.close(loading2)
-                            }
+                }
+                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)
+                                }
+
+                            }
+                        });
+                    }
+                }
             }
 
 
+
         });