[feat]

工程管理 bom信息
修改添加、编辑bom、详情页面，添加文件编号字段显示与保存；
修改bom实体类，新增文件编号字段；
修改bom相关mapper方法，新增字段；
修改各审批页面，新增字段；

ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpBom.java

@@ -67,6 +67,11 @@ public class ErpBom extends BaseEntity
 
     private String warehouseDept;
 
+    /*
+    * 文件编号*/
+    @Excel(name = "文件编号",sort = 14)
+    private String fileCode;
+
     /** 用量 */
 //    @Excel(name = "用量",sort = 8)
     private Integer useNum;
@@ -456,6 +461,14 @@ public class ErpBom extends BaseEntity
         this.warehouseDept = warehouseDept;
     }
 
+    public String getFileCode() {
+        return fileCode;
+    }
+
+    public void setFileCode(String fileCode) {
+        this.fileCode = fileCode;
+    }
+
     @Override
     public String toString() {
         return "ErpBom{" +

ruoyi-admin/src/main/resources/mapper/erp/ErpBomMapper.xml

@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="parentId"                   column="parent_id"    />
         <result property="level"                      column="level"    />
         <result property="sortNo"                     column="sort_no"    />
+        <result property="fileCode"                   column="file_code"    />
         <result property="auditStatus"                column="audit_status"    />
         <result property="useStatus"                  column="use_status"    />
         <result property="instanceId"                 column="instance_id"    />
@@ -68,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="parentId"         column="sub_parent_id"    />
         <result property="level"            column="sub_level"    />
         <result property="sortNo"           column="sub_sort_no"    />
+        <result property="fileCode"         column="file_code"    />
         <result property="auditStatus"      column="sub_audit_status"    />
         <result property="useStatus"        column="sub_use_status"    />
     </resultMap>
@@ -77,14 +79,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                material_no, material_name, material_type, process_method, unit, material_model, brand, `describe`,warehouseDept,
                engineer,use_num, loss_rate, parent_id, `level`, sort_no, audit_status, use_status,
                instance_id,instance_type,submit_instance_id,cancel_instance_id,restore_instance_id,
-               apply_title,apply_user,apply_time from erp_bom
+               apply_title,apply_user,apply_time,file_code from erp_bom
     </sql>
 
     <select id="selectErpBomList" parameterType="ErpBomVo" resultMap="ErpBomResult">
         select erp.id, erp.del_flag, erp.create_by, erp.create_time, erp.update_by, erp.update_time
         , erp.remark,erp.bom_no,erp.material_no,erp.material_name, erp.audit_status, erp.use_status
         , erp.material_type, erp.process_method,erp.unit, erp.material_model, erp.brand, erp.`describe`,erp.warehouseDept,erp.engineer,
-          erp.use_num,erp.loss_rate, erp.parent_id, erp.`level`, erp.sort_no, erp.instance_id,
+          erp.use_num,erp.loss_rate, erp.parent_id, erp.`level`, erp.sort_no, erp.instance_id, erp.file_code,
           erp.instance_type, processDict.dict_label as instance_type_name, erp.submit_instance_id,
           erp.cancel_instance_id, erp.restore_instance_id,erp.apply_title,erp.apply_user,erp.apply_time
         , file.url as photo_url,cate.name as material_type_name from erp_bom as erp
@@ -158,7 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectErpBomList1" resultMap="ErpBomResult">
         select  bom_no, id, create_by, create_time, update_by, update_time, remark,
                         material_no, material_name, material_type, process_method, unit, material_model,
-                        brand, `describe`,warehouseDept,engineer,use_num, loss_rate, parent_id, `level`,
+                        brand, `describe`,warehouseDept,engineer,use_num, loss_rate, parent_id, `level`,file_code,
                         sort_no, audit_status, use_status from erp_bom
         where bom_no != "" ORDER BY id DESC;
     </select>
@@ -166,7 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select erp.id, erp.del_flag, erp.create_by, erp.create_time, erp.update_by, erp.update_time,
                erp.remark,erp.bom_no, erp.material_no , erp.material_name, erp.audit_status, erp.use_status,
                erp.material_type,  erp.process_method, erp.unit, erp.material_model, erp.brand, erp.describe,erp.warehouseDept,
-               erp.use_num, erp.engineer,
+               erp.use_num, erp.engineer,erp.file_code,
                erp.loss_rate, erp.parent_id, erp.level, erp.sort_no,erp.instance_id,erp.instance_type,
                erp.submit_instance_id,erp.cancel_instance_id,erp.restore_instance_id,erp.apply_title,
                erp.apply_user,erp.apply_time,
@@ -267,6 +269,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="parentId != null">parent_id,</if>
             <if test="level != null">`level`,</if>
             <if test="sortNo != null">sort_no,</if>
+            <if test="fileCode != null">file_code,</if>
             <if test="auditStatus != null">audit_status,</if>
             <if test="useStatus != null">use_status,</if>
             <if test="instanceId != null and instanceId != ''">instance_id,</if>
@@ -299,6 +302,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="parentId != null">#{parentId},</if>
             <if test="level != null">#{level},</if>
             <if test="sortNo != null">#{sortNo},</if>
+            <if test="fileCode != null">#{fileCode},</if>
             <if test="auditStatus != null">#{auditStatus},</if>
             <if test="useStatus != null">#{useStatus},</if>
             <if test="instanceId != null and instanceId != ''">#{instanceId},</if>
@@ -335,6 +339,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="parentId != null">parent_id = #{parentId},</if>
             <if test="level != null">`level` = #{level},</if>
             <if test="sortNo != null">sort_no = #{sortNo},</if>
+            <if test="fileCode != null">file_code = #{fileCode},</if>
             <if test="parentId != null">parent_id = #{parentId},</if>
             <if test="auditStatus != null">audit_status = #{auditStatus},</if>
             <if test="useStatus != null">use_status = #{useStatus},</if>
@@ -384,13 +389,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <insert id="batchErpBom">
         insert into erp_bom( id, del_flag, create_by, create_time, update_by, update_time, remark, bom_no, material_no,
-                            material_name, material_type, process_method, unit, material_model,  brand, `describe`,warehouseDept, use_num, loss_rate,
+                            material_name, material_type, process_method, unit, material_model,  brand, `describe`,warehouseDept, use_num, loss_rate,file_code,
                             parent_id, `level`, sort_no, audit_status, use_status) values
 		<foreach item="item" index="index" collection="list" separator=",">
             ( #{item.id}, #{item.delFlag}, #{item.createBy}, #{item.createTime},
              #{item.updateBy}, #{item.updateTime}, #{item.remark}, #{item.bomNo},
              #{item.materialNo}, #{item.materialName}, #{item.materialType}, #{item.processMethod},
-             #{item.unit}, #{item.brand}, #{item.describe},#{item.warehouseDept}, #{item.useNum}, #{item.lossRate},
+             #{item.unit}, #{item.brand}, #{item.describe},#{item.warehouseDept}, #{item.useNum}, #{item.lossRate}, #{item.fileCode},
              #{item.parentId}, #{item.level}, #{item.sortNo}, #{item.auditStatus}, #{item.useStatus})
         </foreach>
     </insert>
@@ -425,7 +430,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                erp.remark,erp.bom_no,erp.material_no,erp.material_name, erp.audit_status, erp.use_status,
                erp.material_type, erp.process_method,erp.unit, erp.material_model, erp.brand, erp.`describe`,erp.warehouseDept,erp.engineer,
                erp.use_num,erp.loss_rate, erp.parent_id, erp.`level`, erp.sort_no, erp.instance_id,
-               erp.instance_type, processDict.dict_label as instance_type_name, erp.submit_instance_id,
+               erp.instance_type, processDict.dict_label as instance_type_name, erp.submit_instance_id,erp.file_code,
                erp.cancel_instance_id, erp.restore_instance_id,erp.apply_title,erp.apply_user,erp.apply_time,
                file.url as photo_url,cate.name as material_type_name from erp_bom as erp
         left join (
@@ -459,7 +464,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select erp.id, erp.del_flag, erp.create_by, erp.create_time, erp.update_by, erp.update_time,
         erp.remark,erp.bom_no,erp.material_no,erp.material_name, erp.audit_status, erp.use_status,
         erp.material_type, erp.process_method,erp.unit, erp.material_model, erp.brand, erp.`describe`,erp.warehouseDept,erp.engineer,
-        erp.use_num,erp.loss_rate, erp.parent_id, erp.`level`, erp.sort_no, erp.instance_id,
+        erp.use_num,erp.loss_rate, erp.parent_id, erp.`level`, erp.sort_no, erp.instance_id,erp.file_code,
         erp.instance_type, processDict.dict_label as instance_type_name, erp.submit_instance_id,
         erp.cancel_instance_id, erp.restore_instance_id,erp.apply_title,erp.apply_user,erp.apply_time,
         cate.name as material_type_name from erp_bom as erp
@@ -498,7 +503,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select erp.id, erp.del_flag, erp.create_by, erp.create_time, erp.update_by, erp.update_time,
                erp.remark,erp.bom_no,erp.material_no,erp.material_name, erp.audit_status, erp.use_status,
                erp.material_type, erp.process_method,erp.unit,  erp.material_model, erp.brand, erp.`describe`,erp.warehouseDept,erp.engineer,
-               erp.use_num,erp.loss_rate, erp.parent_id, erp.`level`, erp.sort_no, erp.instance_id,
+               erp.use_num,erp.loss_rate, erp.parent_id, erp.`level`, erp.sort_no, erp.instance_id,erp.file_code,
                erp.instance_type, processDict.dict_label as instance_type_name, erp.submit_instance_id,
                erp.cancel_instance_id, erp.restore_instance_id,erp.apply_title,erp.apply_user,erp.apply_time,
                file.url as photo_url,cate.name as material_type_name from erp_bom as erp
@@ -532,7 +537,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select erp.id, erp.del_flag, erp.create_by, erp.create_time, erp.update_by, erp.update_time,
                erp.remark,erp.bom_no,erp.material_no,erp.material_name, erp.audit_status, erp.use_status,
                erp.material_type, erp.process_method,erp.unit, erp.material_model, erp.brand, erp.`describe`,erp.warehouseDept,erp.engineer,
-               erp.use_num,erp.loss_rate, erp.parent_id, erp.`level`, erp.sort_no, erp.instance_id,
+               erp.use_num,erp.loss_rate, erp.parent_id, erp.`level`, erp.sort_no, erp.instance_id,erp.file_code,
                erp.instance_type, processDict.dict_label as instance_type_name, erp.submit_instance_id,
                erp.cancel_instance_id, erp.restore_instance_id,erp.apply_title,erp.apply_user,erp.apply_time,
                file.url as photo_url,cate.name as material_type_name from erp_bom as erp
@@ -566,7 +571,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select erp.id, erp.del_flag, erp.create_by, erp.create_time, erp.update_by, erp.update_time,
                erp.remark,erp.bom_no,erp.material_no,erp.material_name, erp.audit_status, erp.use_status,
                erp.material_type, erp.process_method,erp.unit, erp.material_model, erp.brand, erp.`describe`,erp.warehouseDept,erp.engineer,
-               erp.use_num,erp.loss_rate, erp.parent_id, erp.`level`, erp.sort_no, erp.instance_id,
+               erp.use_num,erp.loss_rate, erp.parent_id, erp.`level`, erp.sort_no, erp.instance_id,erp.file_code,
                erp.instance_type, processDict.dict_label as instance_type_name, erp.submit_instance_id,
                erp.cancel_instance_id, erp.restore_instance_id,erp.apply_title,erp.apply_user,erp.apply_time,
                file.url as photo_url,cate.name as material_type_name from erp_bom as erp

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

@@ -93,7 +93,12 @@
                 </div>
                 <input type="text" name="engineer" readonly hidden />
             </div>
-
+            <div class="form-group">
+                <label class="col-sm-3 control-label">文件编号：</label>
+                <div class="col-sm-8">
+                    <input name="fileCode" id="fileCode" class="form-control" readonly>
+                </div>
+            </div>
         </form>
         <div class="btn-group-sm" id="toolbar" role="group">
             <a class="btn btn-success" onclick="insertRow()">
@@ -389,6 +394,12 @@
                         return $.table.selectCategoryLabel(warehouseDeptDatas, value);
                     }
                 },
+                {
+                    field: 'fileCode',
+                    align: 'center',
+                    title: '文件编号',
+                    visible: false,
+                },
                 {
                     field: 'remark',
                     align: 'center',
@@ -453,6 +464,7 @@
             $("#selectUnit").val([data.unit]).trigger("change");
             $("input[name='unit']").val(data.unit);
             $("input[name='warehouseDept']").val(data.warehouseDept);
+            $("input[name='fileCode']").val(data.fileCode);
 
         }
 
@@ -534,6 +546,7 @@
                         materialModel: rowData.materialModel,
                         brand: rowData.brand,
                         warehouseDept: rowData.warehouseDept,
+                        fileCode: rowData.fileCode,
                         level: "1",
                         useNum: '',
                         lossRate: ''

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

@@ -76,6 +76,12 @@
                     <input name="engineer" th:field="*{engineer}" class="form-control" disabled required/>
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">文件编号：</label>
+                <div class="col-sm-8">
+                    <input name="fileCode" id="fileCode" th:field="*{fileCode}" class="form-control" readonly>
+                </div>
+            </div>
         </form>
         <div class="row">
             <div class="col-sm-12 select-table table-striped">

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

@@ -75,10 +75,16 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label" >工程员：</label>
                 <div class="col-sm-8">
-                    <select name="engineer" class="form-control" readonly>
+                    <select name="engineer" class="form-control" th:field="*{engineer}" readonly>
                     </select>
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">文件编号：</label>
+                <div class="col-sm-8">
+                    <input name="fileCode" id="fileCode" th:field="*{fileCode}" class="form-control" readonly>
+                </div>
+            </div>
         </form>
         <div class="btn-group-sm" id="toolbar" role="group">
             <a class="btn btn-success" onclick="insertRow()">
@@ -311,6 +317,12 @@
                             return $.table.selectCategoryLabel(warehouseDeptDatas, value);
                         }
                     },
+                    {
+                        field: 'fileCode',
+                        align: 'center',
+                        title: '文件编号',
+                        visible: false,
+                    },
                     {
                         field: 'remark',
                         align: 'center',
@@ -403,6 +415,7 @@
                     unit: rowData.unit,
                     processMethod: rowData.processMethod,
                     warehouseDept: rowData.warehouseDept,
+                    fileCode: rowData.fileCode,
                 }
             })
             layer.close(index);

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

@@ -102,6 +102,12 @@
                 <input name="engineer" th:field="*{engineer}" class="form-control" disabled required/>
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">文件编号：</label>
+            <div class="col-sm-8">
+                <input name="fileCode" id="fileCode" th:field="*{fileCode}" class="form-control" 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

@@ -104,6 +104,12 @@
                 <input name="engineer" th:field="*{engineer}" class="form-control" readonly required/>
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">文件编号：</label>
+            <div class="col-sm-8">
+                <input name="fileCode" id="fileCode" th:field="*{fileCode}" class="form-control" 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

@@ -103,6 +103,12 @@
                 <input name="engineer" th:field="*{engineer}" class="form-control" readonly required/>
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">文件编号：</label>
+            <div class="col-sm-8">
+                <input name="fileCode" id="fileCode" th:field="*{fileCode}" class="form-control" 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

@@ -102,6 +102,12 @@
                 <input name="engineer" th:field="*{engineer}" class="form-control" readonly required/>
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">文件编号：</label>
+            <div class="col-sm-8">
+                <input name="fileCode" id="fileCode" th:field="*{fileCode}" class="form-control" readonly>
+            </div>
+        </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">照片：</label>
             <div class="col-sm-8">