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}