[fix]工程管理

bom前端 工程经理审核、工程主管审核、研发总监审核、驳回调整页面新增型号字段；
bom的service层去掉重复的事务注解，防止导致数据库死锁问题

ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpBomService.java

@@ -125,7 +125,7 @@ public interface IErpBomService
 
     public ProcessInstance submitApply(ErpBom erpBom);
 
-    @Transactional(rollbackFor = Exception.class)
+
     ProcessInstance submitUpdateApply(ErpBom erpBom);
 
     ErpBom selectErpBomByOneMaterialNo(String materialNo);

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

@@ -78,6 +78,12 @@
                 </select>
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">型号：</label>
+            <div class="col-sm-8">
+                <input name="materialModel" th:field="*{materialModel}" class="form-control" type="text" readonly>
+            </div>
+        </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">品牌：</label>
             <div class="col-sm-8">

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

@@ -79,6 +79,12 @@
                 </select>
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">型号：</label>
+            <div class="col-sm-8">
+                <input name="materialModel" th:field="*{materialModel}" class="form-control" type="text" readonly>
+            </div>
+        </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">品牌：</label>
             <div class="col-sm-8">

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

@@ -79,6 +79,12 @@
                 </select>
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">型号：</label>
+            <div class="col-sm-8">
+                <input name="materialModel" th:field="*{materialModel}" class="form-control" type="text" readonly>
+            </div>
+        </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">品牌：</label>
             <div class="col-sm-8">

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

@@ -78,6 +78,12 @@
                 </select>
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">型号：</label>
+            <div class="col-sm-8">
+                <input name="materialModel" th:field="*{materialModel}" class="form-control" type="text" readonly>
+            </div>
+        </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">品牌：</label>
             <div class="col-sm-8">