From 15c5f7e90e7cc1445acf7ed704caf69bec369bd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Mon, 16 Dec 2024 10:18:01 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20bom=E4=BF=A1=E6=81=AF=20=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E3=80=81=E7=BC=96=E8=BE=91bom=E3=80=81=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA=E4=B8=8E?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=EF=BC=9B=20=E4=BF=AE=E6=94=B9bom=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5=EF=BC=9B=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9bom=E7=9B=B8=E5=85=B3mapper=E6=96=B9=E6=B3=95=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=EF=BC=9B=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=90=84=E5=AE=A1=E6=89=B9=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/erp/domain/ErpBom.java | 13 +++++++++ .../resources/mapper/erp/ErpBomMapper.xml | 27 +++++++++++-------- .../main/resources/templates/erp/bom/add.html | 15 ++++++++++- .../resources/templates/erp/bom/detail.html | 6 +++++ .../resources/templates/erp/bom/edit.html | 15 ++++++++++- .../templates/erp/bom/taskGcjlVerify.html | 6 +++++ .../templates/erp/bom/taskGczgVerify.html | 6 +++++ .../templates/erp/bom/taskModifyApply.html | 6 +++++ .../templates/erp/bom/taskYfzjVerify.html | 6 +++++ 9 files changed, 87 insertions(+), 13 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpBom.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpBom.java index 9af1ff44..e96d5c49 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpBom.java +++ b/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{" + diff --git a/ruoyi-admin/src/main/resources/mapper/erp/ErpBomMapper.xml b/ruoyi-admin/src/main/resources/mapper/erp/ErpBomMapper.xml index 0a6b655e..32bd8929 100644 --- a/ruoyi-admin/src/main/resources/mapper/erp/ErpBomMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/erp/ErpBomMapper.xml @@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -68,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -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 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; @@ -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" parent_id, `level`, sort_no, + file_code, audit_status, use_status, instance_id, @@ -299,6 +302,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{parentId}, #{level}, #{sortNo}, + #{fileCode}, #{auditStatus}, #{useStatus}, #{instanceId}, @@ -335,6 +339,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" parent_id = #{parentId}, `level` = #{level}, sort_no = #{sortNo}, + file_code = #{fileCode}, parent_id = #{parentId}, audit_status = #{auditStatus}, use_status = #{useStatus}, @@ -384,13 +389,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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 ( #{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}) @@ -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 diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/add.html b/ruoyi-admin/src/main/resources/templates/erp/bom/add.html index 002f4850..44d8bc24 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/add.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/add.html @@ -93,7 +93,12 @@ - +
+ +
+ +
+
+
+ +
+ +
+
diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html b/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html index c6dfb296..454646f0 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html @@ -75,10 +75,16 @@
-
+
+ +
+ +
+
+
+ +
+ +
+
diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/taskGczgVerify.html b/ruoyi-admin/src/main/resources/templates/erp/bom/taskGczgVerify.html index 19dd7c48..0143ffb3 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/taskGczgVerify.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/taskGczgVerify.html @@ -104,6 +104,12 @@
+
+ +
+ +
+
diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/erp/bom/taskModifyApply.html index e079b26e..91ced627 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/taskModifyApply.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/taskModifyApply.html @@ -103,6 +103,12 @@
+
+ +
+ +
+
diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html b/ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html index 07ff6852..d0033035 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html @@ -102,6 +102,12 @@
+
+ +
+ +
+