From 4053b99ddd83e6d6ebf66d399c986657ba8cc8f7 Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Thu, 12 Mar 2026 15:00:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E6=8A=A5=E4=BB=B7=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4=E6=B7=BB=E5=8A=A0BU=E5=92=8C=E9=94=80=E5=94=AE?= =?UTF-8?q?=EF=BC=8C=E6=9D=A1=E7=9B=AE=E6=98=8E=E7=BB=86=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=89=A9=E6=96=99=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/spring/modules/quote/entity/Quote.java | 6 ++++++ .../java/com/spring/modules/quote/entity/QuoteDetail.java | 3 +++ src/main/resources/mapper/quote/QuoteDetailMapper.xml | 2 ++ src/main/resources/mapper/quote/QuoteMapper.xml | 7 ++++++- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/spring/modules/quote/entity/Quote.java b/src/main/java/com/spring/modules/quote/entity/Quote.java index 20bde0c3..aa75b287 100644 --- a/src/main/java/com/spring/modules/quote/entity/Quote.java +++ b/src/main/java/com/spring/modules/quote/entity/Quote.java @@ -262,4 +262,10 @@ public class Quote extends QueryPage { */ @TableField(exist = false) private String menuId; + + /** + * 询价单发起人 + */ + @TableField(exist = false) + private String inquiryCreateBy; } diff --git a/src/main/java/com/spring/modules/quote/entity/QuoteDetail.java b/src/main/java/com/spring/modules/quote/entity/QuoteDetail.java index 810c9a28..b75e923c 100644 --- a/src/main/java/com/spring/modules/quote/entity/QuoteDetail.java +++ b/src/main/java/com/spring/modules/quote/entity/QuoteDetail.java @@ -253,4 +253,7 @@ public class QuoteDetail { private String ifsPartNo; @TableField(exist = false) private BigDecimal unitPriceRate; + + @TableField(exist = false) + private String customerPartNo; } diff --git a/src/main/resources/mapper/quote/QuoteDetailMapper.xml b/src/main/resources/mapper/quote/QuoteDetailMapper.xml index c249f903..6ccceaea 100644 --- a/src/main/resources/mapper/quote/QuoteDetailMapper.xml +++ b/src/main/resources/mapper/quote/QuoteDetailMapper.xml @@ -84,6 +84,7 @@ qd.quote_group_detail_id, pp.plm_part_no, pp.ifs_part_no, + pc.customer_part_no, convert(decimal(20,6),(case when exchange_rate2 = 0 or exchange_rate2 is null then 0 else unit_price/exchange_rate2 end)) as unitPriceRate from plm_quote_detail qd left join plm_quote q on qd.quote_id = q.id @@ -92,6 +93,7 @@ and sdd1.dict_value = qd.currency1 and sdd1.site = qd.site left join sys_dict_data sdd2 on sdd2.dict_type = 'plm_customer_information_customer_customer_currency' and sdd2.dict_value = qd.currency2 and sdd2.site = qd.site + left join plm_customer_part_info pc on pc.part_no = qd.part_no and pc.site = qd.site and pc.customer_no = q.customer_no and qd.id = #{id} diff --git a/src/main/resources/mapper/quote/QuoteMapper.xml b/src/main/resources/mapper/quote/QuoteMapper.xml index c4b39df5..895c296e 100644 --- a/src/main/resources/mapper/quote/QuoteMapper.xml +++ b/src/main/resources/mapper/quote/QuoteMapper.xml @@ -240,6 +240,7 @@ q.quote_no, q.site, q.bu_no, + dbo.plm_get_bu_desc(q.site, ppp.bu_no) as buDesc, q.version_no, q.quote_date, q.quote_version_no, @@ -284,7 +285,8 @@ q.quote_version_no) as approvalUsername, gd.plm_part_no as plmPartNo, gd.ifs_part_no as ifsPartNo, - gd.part_desc as partDesc + gd.part_desc as partDesc, + qq.create_by as inquiryCreateBy from plm_quote q left join plm_customer_information c on q.customer_no = c.customer_no left join plm_project_info p on q.project_no = p.project_id and q.site = p.site @@ -295,6 +297,7 @@ left join sys_dict_data sdd_final on sdd_final.dict_type = 'finalCustomer' and sdd_final.dict_value = p.final_customer_id and sdd_final.site = q.site left join plm_request_header prh on q.site = prh.site and prh.menu_id = '5011' + left join plm_quotation_information qq on q.site = qq.site and q.inside_inquiry_no = qq.quotation_no left join plm_request_node prn on q.site = prn.site and prh.classification_no = prn.classification_no and prh.workflow_id = prn.workflow_id and q.step_id = prn.step_id outer apply ( @@ -303,6 +306,8 @@ left join part pp on qd.part_no = pp.part_no and qd.site = pp.site where qd.quote_id = q.id ) gd + left join plm_project_part ppp on ppp.site = q.site and ppp.project_id = p.project_id + and ppp.test_part_no = gd.plm_part_no