From 947d4db284ae58571a6e4fb0374437c511ccece0 Mon Sep 17 00:00:00 2001
From: youjianchi <13260889671@163.com>
Date: Fri, 16 Feb 2024 17:00:19 +0800
Subject: [PATCH] =?UTF-8?q?[fix]:=E4=BF=AE=E5=A4=8D=E7=89=A9=E6=96=99?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=87=BA=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/ruoyi/erp/domain/ErpMaterial.java | 15 +++++++++++++--
.../resources/mapper/erp/ErpMaterialMapper.xml | 10 +++++++++-
2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java
index e315e509..46fa6707 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java
@@ -47,8 +47,10 @@ public class ErpMaterial extends BaseEntity
/**技术团队名称 */
private String itemName;
/** 物料类型 */
- @Excel(name = "物料类型",sort = 4)
private String materialType;
+ /** 物料类型名称 */
+ @Excel(name = "物料类型名称",sort = 4)
+ private String materialTypeName;
/** 加工方式 */
@Excel(name = "加工方式",sort = 8,dictType = "processMethod")
@@ -175,7 +177,16 @@ public class ErpMaterial extends BaseEntity
{
return materialType;
}
- public void setProcessMethod(String processMethod)
+
+ public String getMaterialTypeName() {
+ return materialTypeName;
+ }
+
+ public void setMaterialTypeName(String materialTypeName) {
+ this.materialTypeName = materialTypeName;
+ }
+
+ public void setProcessMethod(String processMethod)
{
this.processMethod = processMethod;
}
diff --git a/ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml b/ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml
index 3c635521..e353e2cc 100644
--- a/ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml
@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -47,13 +48,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
, erp.material_name, erp.audit_status, erp.use_status, erp.hava_product_tem, erp.product_item,erp.`itemName`, erp.material_type, erp.process_method
, erp.unit, erp.brand, erp.`describe`, erp.warehouse_dept
,erp.instance_id,erp.instance_type,process_type_dict.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
+ ,file.url as photo_url,cate.name as material_type_name
from erp_material erp
left join(
select dict_value,dict_label from sys_dict_data
where dict_type = 'processType'
)process_type_dict
on erp.instance_type = process_type_dict.dict_value
+ left join (
+ select code,name from sys_category
+ where parent_id in(
+ select id from sys_category
+ where parent_id = (select id from sys_category where code = 'materialType') )
+ )cate
+ on erp.material_type = cate.code
left join (
select
att.rel_id