Browse Source

销售报价表头添加BU和销售,条目明细添加客户物料编码

master
han\hanst 1 month ago
parent
commit
4053b99ddd
  1. 6
      src/main/java/com/spring/modules/quote/entity/Quote.java
  2. 3
      src/main/java/com/spring/modules/quote/entity/QuoteDetail.java
  3. 2
      src/main/resources/mapper/quote/QuoteDetailMapper.xml
  4. 7
      src/main/resources/mapper/quote/QuoteMapper.xml

6
src/main/java/com/spring/modules/quote/entity/Quote.java

@ -262,4 +262,10 @@ public class Quote extends QueryPage {
*/ */
@TableField(exist = false) @TableField(exist = false)
private String menuId; private String menuId;
/**
* 询价单发起人
*/
@TableField(exist = false)
private String inquiryCreateBy;
} }

3
src/main/java/com/spring/modules/quote/entity/QuoteDetail.java

@ -253,4 +253,7 @@ public class QuoteDetail {
private String ifsPartNo; private String ifsPartNo;
@TableField(exist = false) @TableField(exist = false)
private BigDecimal unitPriceRate; private BigDecimal unitPriceRate;
@TableField(exist = false)
private String customerPartNo;
} }

2
src/main/resources/mapper/quote/QuoteDetailMapper.xml

@ -84,6 +84,7 @@
qd.quote_group_detail_id, qd.quote_group_detail_id,
pp.plm_part_no, pp.plm_part_no,
pp.ifs_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 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 from plm_quote_detail qd
left join plm_quote q on qd.quote_id = q.id 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 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' 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 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
<where> <where>
<if test="id != null"> <if test="id != null">
and qd.id = #{id} and qd.id = #{id}

7
src/main/resources/mapper/quote/QuoteMapper.xml

@ -240,6 +240,7 @@
q.quote_no, q.quote_no,
q.site, q.site,
q.bu_no, q.bu_no,
dbo.plm_get_bu_desc(q.site, ppp.bu_no) as buDesc,
q.version_no, q.version_no,
q.quote_date, q.quote_date,
q.quote_version_no, q.quote_version_no,
@ -284,7 +285,8 @@
q.quote_version_no) as approvalUsername, q.quote_version_no) as approvalUsername,
gd.plm_part_no as plmPartNo, gd.plm_part_no as plmPartNo,
gd.ifs_part_no as ifsPartNo, 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 from plm_quote q
left join plm_customer_information c on q.customer_no = c.customer_no 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 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' 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 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_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 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 and prh.workflow_id = prn.workflow_id and q.step_id = prn.step_id
outer apply ( outer apply (
@ -303,6 +306,8 @@
left join part pp on qd.part_no = pp.part_no and qd.site = pp.site left join part pp on qd.part_no = pp.part_no and qd.site = pp.site
where qd.quote_id = q.id where qd.quote_id = q.id
) gd ) 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
<where> <where>
<include refid="quotePageWhereConditions"/> <include refid="quotePageWhereConditions"/>
</where> </where>

Loading…
Cancel
Save