修改系统内部审批流程

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,13 +3075,15 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                 // 获取所有仓库
                 List<Depository> depositoryAll = depositoryMapper.findDepositoryAll();
                 for (Depository depositoryById : depositoryByIds) {
-                    // 获取当前仓库的顶级仓库
                     Depository parentDepository = findParentDepository(depositoryById, depositoryAll);
-                    if (parentDepository.getDname().contains("办公")) {
-                        // 设置为true
+                    if (!parentDepository.getDname().contains("前置仓")) {
+                        // 如果不是前置仓下的仓库
+                        if (depositoryById.getDname().contains("办公")) {
+                            // 如果是中心仓下的办公用品库
                             flagForZXCWorkWarehouse = true;
                         }
                     }
+                }
                 if (!flagForZXCWorkWarehouse) {
                     // 如果不是中心仓下的办公用品库
                     if (flagForOpenDepository == 2) {

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,6 +1931,7 @@
         form.on('select()', function (data) {
 
             let id = data.elem.id;
+            if(id.indexOf('outType') === -1){
                 let idNum = id.split("unit")[1];
                 let unit = "";
                 let mcode = "";
@@ -1938,12 +1943,14 @@
                     if (depositoryDisplay !== "none") {
                         depositoryId = $("#showDepository" + idNum).val();
                     }
-            } else if (id.indexOf('ForGroup') === -1) {
+                }
+                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) {
+                }
+                else if (id.indexOf("ForGroup") !== -1) {
                     depositoryId = data.value;
                     idNum = id.split('showDepositoryForGroup')[1];
                     flag = false;
@@ -1988,11 +1995,14 @@
                             });
                         }
                     }
-            } else {
+                }
+                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,13 +1949,15 @@
         form.on('select()', function (data) {
 
             let id = data.elem.id;
+            if(id.indexOf('outType') === -1){
                 let idNum = id.split("unit")[1];
                 let unit = "";
                 let mcode = "";
                 let depositoryId = "-1";
                 if (id.indexOf('unit') !== -1) {
                     unit = data.value;
-            } else {
+                }
+                else {
                     // 获取当前选中的仓库id
                     depositoryId = data.value;
                     idNum = id.split('showDepository')[1];
@@ -1963,7 +1969,8 @@
                     layer.msg("请输入物料的正确编码！", {icon: 0, time: 500}, function () {
                         $("#quantity" + idNum).val("")
                     });
-            } else {
+                }
+                else {
                     let val = $("#quantity" + idNum).val();
                     if (val !== null && val !== undefined && val !== '') {
                         var req = {};
@@ -1997,6 +2004,8 @@
                         });
                     }
                 }
+            }
+
 
 
         });

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,6 +596,7 @@
         form.on('select()', function (data) {
 
             let id = data.elem.id;
+            if(id.indexOf('outType') === -1){
                 let unit = "";
                 let mcode = "";
                 let depositoryId = "-1";
@@ -604,7 +605,8 @@
                     if (depositoryDisplay !== "none") {
                         depositoryId = $("#showDepository" + idNum).val();
                     }
-            } else {
+                }
+                else {
                     // 获取当前选中的仓库id
                     depositoryId = data.value;
                     unit = $("#unit").val();
@@ -615,7 +617,8 @@
                     layer.msg("请输入物料的正确编码！", {icon: 0, time: 500}, function () {
                         $("#quantity").val("")
                     });
-            } else {
+                }
+                else {
                     let val = $("#quantity").val();
                     if (val !== null && val !== undefined && val !== '') {
                         var req = {};
@@ -649,6 +652,8 @@
                         });
                     }
                 }
+            }
+
 
 
         });

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,6 +1176,7 @@
         form.on('select()', function (data) {
 
             let id = data.elem.id;
+            if(id.indexOf('outType') === -1){
                 let idNum = id.split("unit")[1];
                 let unit = "";
                 let mcode = "";
@@ -1185,7 +1186,8 @@
                     if (depositoryDisplay !== "none") {
                         depositoryId = $("#showDepository" + idNum).val();
                     }
-            } else {
+                }
+                else {
                     // 获取当前选中的仓库id
                     depositoryId = data.value;
                     idNum = id.split('showDepository')[1];
@@ -1197,7 +1199,8 @@
                     layer.msg("请输入物料的正确编码！", {icon: 0, time: 500}, function () {
                         $("#quantity" + idNum).val("")
                     });
-            } else {
+                }
+                else {
                     let val = $("#quantity" + idNum).val();
                     if (val !== null && val !== undefined && val !== '') {
                         var req = {};
@@ -1231,6 +1234,8 @@
                         });
                     }
                 }
+            }
+
 
 
         });

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,6 +1931,7 @@
         form.on('select()', function (data) {
 
             let id = data.elem.id;
+            if(id.indexOf('outType') === -1){
                 let idNum = id.split("unit")[1];
                 let unit = "";
                 let mcode = "";
@@ -1938,12 +1943,14 @@
                     if (depositoryDisplay !== "none") {
                         depositoryId = $("#showDepository" + idNum).val();
                     }
-            } else if (id.indexOf('ForGroup') === -1) {
+                }
+                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) {
+                }
+                else if (id.indexOf("ForGroup") !== -1) {
                     depositoryId = data.value;
                     idNum = id.split('showDepositoryForGroup')[1];
                     flag = false;
@@ -1988,11 +1995,14 @@
                             });
                         }
                     }
-            } else {
+                }
+                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,13 +1949,15 @@
         form.on('select()', function (data) {
 
             let id = data.elem.id;
+            if(id.indexOf('outType') === -1){
                 let idNum = id.split("unit")[1];
                 let unit = "";
                 let mcode = "";
                 let depositoryId = "-1";
                 if (id.indexOf('unit') !== -1) {
                     unit = data.value;
-            } else {
+                }
+                else {
                     // 获取当前选中的仓库id
                     depositoryId = data.value;
                     idNum = id.split('showDepository')[1];
@@ -1963,7 +1969,8 @@
                     layer.msg("请输入物料的正确编码！", {icon: 0, time: 500}, function () {
                         $("#quantity" + idNum).val("")
                     });
-            } else {
+                }
+                else {
                     let val = $("#quantity" + idNum).val();
                     if (val !== null && val !== undefined && val !== '') {
                         var req = {};
@@ -1997,6 +2004,8 @@
                         });
                     }
                 }
+            }
+
 
 
         });

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,6 +596,7 @@
         form.on('select()', function (data) {
 
             let id = data.elem.id;
+            if(id.indexOf('outType') === -1){
                 let unit = "";
                 let mcode = "";
                 let depositoryId = "-1";
@@ -604,7 +605,8 @@
                     if (depositoryDisplay !== "none") {
                         depositoryId = $("#showDepository" + idNum).val();
                     }
-            } else {
+                }
+                else {
                     // 获取当前选中的仓库id
                     depositoryId = data.value;
                     unit = $("#unit").val();
@@ -615,7 +617,8 @@
                     layer.msg("请输入物料的正确编码！", {icon: 0, time: 500}, function () {
                         $("#quantity").val("")
                     });
-            } else {
+                }
+                else {
                     let val = $("#quantity").val();
                     if (val !== null && val !== undefined && val !== '') {
                         var req = {};
@@ -649,6 +652,8 @@
                         });
                     }
                 }
+            }
+
 
 
         });

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,6 +1176,7 @@
         form.on('select()', function (data) {
 
             let id = data.elem.id;
+            if(id.indexOf('outType') === -1){
                 let idNum = id.split("unit")[1];
                 let unit = "";
                 let mcode = "";
@@ -1185,7 +1186,8 @@
                     if (depositoryDisplay !== "none") {
                         depositoryId = $("#showDepository" + idNum).val();
                     }
-            } else {
+                }
+                else {
                     // 获取当前选中的仓库id
                     depositoryId = data.value;
                     idNum = id.split('showDepository')[1];
@@ -1197,7 +1199,8 @@
                     layer.msg("请输入物料的正确编码！", {icon: 0, time: 500}, function () {
                         $("#quantity" + idNum).val("")
                     });
-            } else {
+                }
+                else {
                     let val = $("#quantity" + idNum).val();
                     if (val !== null && val !== undefined && val !== '') {
                         var req = {};
@@ -1231,6 +1234,8 @@
                         });
                     }
                 }
+            }
+
 
 
         });