[update]工程模块Bom信息部分，修改添加一个业务审核流，创建业务审核对象

ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpBomController.java

@@ -202,7 +202,7 @@ public class ErpBomController extends BaseController
         String instanceId = erpBomVo.getInstanceId();
         //获取实例类型
         String instanceType = erpBomVo.getInstanceType();
-        boolean approvedFlag = processService.complete(taskId, instanceId, erpBomVo.getApplyTitle(), erpBomVo.getMaterialNo(), "erpBom", new HashMap<String, Object>(), request);
+        boolean approvedFlag = processService.complete(taskId, instanceId, erpBomVo.getApplyTitle(), erpBomVo.getBomNo(), "erpBom", new HashMap<String, Object>(), request);
         if(!approvedFlag){
             // 审核状态-审核拒绝
             erpBomVo.setAuditStatus("2");

ruoyi-admin/src/main/resources/templates/erp/bom/add.html

@@ -15,7 +15,6 @@
                 <label class="col-sm-3 control-label is-required">料号：</label>
                 <div class="col-sm-8">
                     <select class="form-control" id="materialNo" name="materialNo" required>
-
                     </select>
                 </div>
             </div>
@@ -458,12 +457,6 @@
             })
             layer.close(index);
         }
-        // function doSubmit(index, layero){
-        //     var body = layer.getChildFrame('body', index);
-        //     $("#treeId").val(body.find('#treeId').val());
-        //     $("#treeName").val(body.find('#treeName').val());
-        //     layer.close(index);
-        // }
         /* 新增表格行 */
         function insertRow(){
             var url = ctx + "erp/material/select";

ruoyi-admin/src/main/resources/templates/erp/bom/bom.html

@@ -76,12 +76,12 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="erp:bom:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="erp:bom:edit">
+                <!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="erp:bom:edit">
                     <i class="fa fa-edit"></i> 修改
                 </a>
-<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="erp:bom:remove">-->
-<!--                    <i class="fa fa-remove"></i> 删除-->
-<!--                </a>-->
+-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="erp:bom:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>-->
                 <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="erp:bom:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
@@ -112,6 +112,9 @@
         var processMethodDatas = [[${@dict.getType('processMethod')}]];
         var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
         var useStatusDatas = [[${@dict.getType('useStatus')}]];
+        var userName = [[${@permission.getPrincipalProperty('userName')}]];
+        var currentUser = [[${currentUser}]];
+        var loginName = currentUser.loginName;
         var prefix = ctx + "erp/bom";
         $(function()  {
             // $('#selectMaterialType').on('select2:select', function (e) {

ruoyi-admin/src/main/resources/templates/erp/bom/equals.html

@@ -8,8 +8,8 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-bom-equlas">
             <div class="form-group">
-                <label class="col-sm-6 control-label is-required">第一项 bom号:</label>
-                <div class="col-sm-6">
+                <label class="col-sm-4 control-label is-required">第一项 bom号:</label>
+                <div class="col-sm-5">
                     <select class="form-control" th:with="bomList=${@erpBomL.selectErpBomList1()}"  id="bomNo1" name="bomNo1" required>
                         <option value="">无</option>
                         <option th:each="bomss : ${bomList}" th:value="${bomss.bomNo}" th:text="${bomss.bomNo}"></option>
@@ -18,20 +18,20 @@
             </div>
             <div class="form-group">
                 <label class="col-sm-4 control-label is-required">第二项 bom号</label>
-                <div class="col-sm-6">
+                <div class="col-sm-5">
                     <select class="form-control m-b" th:with="bomList=${@erpBomL.selectErpBomList1()}"  id="bomNo2" name="bomNo2" required>
                         <option value="">无</option>
                         <option th:each="bomss : ${bomList}" th:value="${bomss.bomNo}" th:text="${bomss.bomNo}"></option>
                     </select>
                 </div>
-                <div class="btn-group-sm">
-                    <a class="btn btn-primary" onclick="searchBom()" >
-                        <i class="fa fa-plus"></i> 搜索
-                    </a>
-                    <button class="btn btn-danger multiple" onclick="refreshBom()">
-                        <i class="fa fa-remove"></i> 重置
-                    </button>
-                </div>
+            </div>
+            <div class="form-group">
+                <a class="btn btn-primary" onclick="searchBom()" >
+                    <i class="fa fa-plus"></i> 搜索
+                </a>
+                <a class="btn btn-danger multiple" onclick="refreshBom()">
+                    <i class="fa fa-remove"></i> 重置
+                </a>
             </div>
         </form>
         <div>
@@ -84,6 +84,10 @@
             $("#bom-ton").html("");
             $("#bom1-dif").html("");
             $("#bom2-dif").html("");
+            if (bomNo1 == "" || bomNo2 == ""){
+                $.modal.msgError("请选择bom号");
+                return;
+            }
             $.ajax({
                 url: prefix + "/equalsBom",
                 async:true,    //true所有请求均为异步请求

ruoyi-admin/src/main/resources/templates/erp/bom/taskGcjlVerify.html

@@ -236,7 +236,7 @@
         }
     })
 
-    var prefix = ctx + "erp/material";
+    var prefix = ctx + "erp/bom";
     $("#form-edit").validate({
         focusCleanup: true
     });

ruoyi-admin/src/main/resources/templates/erp/bom/taskGczgVerify.html

@@ -244,7 +244,7 @@
         }
     })
 
-    var prefix = ctx + "erp/material";
+    var prefix = ctx + "erp/bom";
     $("#form-edit").validate({
         focusCleanup: true
     });

ruoyi-admin/src/main/resources/templates/erp/bom/taskModifyApply.html

@@ -229,7 +229,7 @@
         }
     })
 
-    var prefix = ctx + "erp/material";
+    var prefix = ctx + "erp/bom";
     $("#form-edit").validate({
         onkeyup: false,
         rules:{

ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html

@@ -14,7 +14,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">申请人：</label>
             <div class="col-sm-8">
-                <input name="applyUserName" th:field="*{applyUserName}" class="form-control" type="text" readonly>
+                <input name="applyUser" th:field="*{applyUser}" class="form-control" type="text" readonly>
             </div>
         </div>
         <div class="form-group">
@@ -236,7 +236,7 @@
         }
     })
 
-    var prefix = ctx + "erp/material";
+    var prefix = ctx + "erp/bom";
     $("#form-edit").validate({
         focusCleanup: true
     });