From ce3870c1bba79b90fe08b81eaa2cdd66d4ea65b5 Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Mon, 24 Nov 2025 17:49:29 +0800 Subject: [PATCH] =?UTF-8?q?feat(crm):=20=E5=AE=8C=E5=96=84=E6=8A=A5?= =?UTF-8?q?=E4=BB=B7=E4=BF=A1=E6=81=AF=E5=92=8C=E7=89=A9=E6=96=99=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在CrmQuoteInfoMapper.xml中加入客户名称和供应商名称关联查询 - 扩展报价信息查询，增加客户联系人和供应商信息的左连接 - 在CrmQuoteMaterialVo.java中新增标准物料标识字段，支持字典转换 - 添加物料编号字段以支持SAP物料编码展示 --- .../oa/crm/domain/vo/CrmQuoteMaterialVo.java | 13 +++++++++++++ .../resources/mapper/oa/crm/CrmQuoteInfoMapper.xml | 9 +++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/vo/CrmQuoteMaterialVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/vo/CrmQuoteMaterialVo.java index 60b3b220..3ed89d13 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/vo/CrmQuoteMaterialVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/vo/CrmQuoteMaterialVo.java @@ -46,6 +46,13 @@ public class CrmQuoteMaterialVo implements Serializable { @ExcelProperty(value = "序号(ERP风格)") private Long itemNo; + /** + * 标准物料标识（1标准物料 2非标物料） + */ + @ExcelProperty(value = "标准物料标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "material_flag") + private String materialFlag; + /** * 产品/服务名称 */ @@ -70,6 +77,12 @@ public class CrmQuoteMaterialVo implements Serializable { @ExcelProperty(value = "销售物料ID(关联名)") private Long relationMaterialId; + /** + * 物料编号（SAP物料编码，来自基础物料表） + */ + @ExcelProperty(value = "物料编号") + private String materialCode; + /** * SAP物料名称（联表得到） */ diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/crm/CrmQuoteInfoMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/crm/CrmQuoteInfoMapper.xml index ab8c7ed8..43ca51cc 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/crm/CrmQuoteInfoMapper.xml +++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/crm/CrmQuoteInfoMapper.xml @@ -13,12 +13,17 @@ t.total_tax, t.total_including_tax, t.customer_contact_id, t.customer_contact_name, t.customer_contact_phone, t.customer_contact_email, t.supplier_contact_id, t.supplier_contact_name, t.supplier_contact_phone, t.supplier_contact_email, t.project_id, t.template_id, t.oss_id, t.quote_status, t.flow_status, t.remark, - d.dept_name as deptName, - u3.nick_name as createName, + ci.customer_name as customerName, + s.supplier_name as supplierName, + d.dept_name as deptName, + u3.nick_name as createName, t.del_flag, t.create_dept, t.create_by, t.create_time, t.update_by, t.update_time from crm_quote_info t left join sys_user u3 on t.create_by = u3.user_id left join sys_dept d on d.dept_id = t.quote_dept_id + left join crm_customer_contact cc on t.customer_contact_id = cc.contact_id + left join crm_customer_info ci on ci.customer_id = cc.customer_id + left join crm_supplier_info s on s.supplier_id = t.supplier_contact_id ${ew.getCustomSqlSegment}