From d156b5f5424424e658a52711926478f0e6735485 Mon Sep 17 00:00:00 2001 From: qiezi <15576055375@163.com> Date: Mon, 16 Dec 2024 11:25:48 +0800 Subject: [PATCH 1/2] 2024-12-16 --- .../modules/quote/entity/QuoteDetail.java | 10 +++++++++ .../quote/service/impl/QuoteServiceImpl.java | 5 +++++ src/main/resources/application-dev.yml | 10 ++++----- .../mapper/quote/QuoteDetailMapper.xml | 21 ++++++++++++++++--- 4 files changed, 38 insertions(+), 8 deletions(-) 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 e439864f..e206f48d 100644 --- a/src/main/java/com/spring/modules/quote/entity/QuoteDetail.java +++ b/src/main/java/com/spring/modules/quote/entity/QuoteDetail.java @@ -155,6 +155,16 @@ public class QuoteDetail { private BigDecimal quoteCurrencyTotalCost2; + private BigDecimal testCost; + + private BigDecimal adjustTestCost; + + private BigDecimal elseCost; + + private BigDecimal adjustElseCost; + + private String calculatedItems;//计算项目 + @TableField(exist = false) private Integer engChgLevel; diff --git a/src/main/java/com/spring/modules/quote/service/impl/QuoteServiceImpl.java b/src/main/java/com/spring/modules/quote/service/impl/QuoteServiceImpl.java index 30954262..5756a2b7 100644 --- a/src/main/java/com/spring/modules/quote/service/impl/QuoteServiceImpl.java +++ b/src/main/java/com/spring/modules/quote/service/impl/QuoteServiceImpl.java @@ -287,6 +287,11 @@ public class QuoteServiceImpl extends ServiceImpl implements detail.setCurrencyTotalCost2(BigDecimal.ZERO); detail.setQuoteCurrencyTotalCost1(BigDecimal.ZERO); detail.setQuoteCurrencyTotalCost2(BigDecimal.ZERO); + detail.setElseCost(BigDecimal.ZERO); + detail.setAdjustElseCost(BigDecimal.ZERO); + detail.setTestCost(BigDecimal.ZERO); + detail.setAdjustTestCost(BigDecimal.ZERO); + detail.setCalculatedItems("工具,测试,其他,包装&运输"); // detail.setMoq("Standard 250K"); quoteDetailService.saveQuoteDetail(detail); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 18eb6cb2..9554a2e5 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -5,12 +5,12 @@ spring: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver type: com.alibaba.druid.pool.DruidDataSource #url: jdbc:sqlserver://xujiesoft.vicp.net:11512;databaseName=XJMES - url: jdbc:sqlserver://10.10.8.200:1433;databaseName=SRQ_MES_PROD +# url: jdbc:sqlserver://10.10.8.200:1433;databaseName=SRQ_MES_PROD +# username: sa +# password: SRQmes123@ + url: jdbc:sqlserver://192.168.1.90:1433;databaseName=ccl_plm username: sa - password: SRQmes123@ - #url: jdbc:sqlserver://192.168.1.90:1433;databaseName=ccl_plm - #username: sa - #password: XJsoft123 + password: XJsoft123 initial-size: 10 max-active: 100 min-idle: 10 diff --git a/src/main/resources/mapper/quote/QuoteDetailMapper.xml b/src/main/resources/mapper/quote/QuoteDetailMapper.xml index 431747be..80cebf66 100644 --- a/src/main/resources/mapper/quote/QuoteDetailMapper.xml +++ b/src/main/resources/mapper/quote/QuoteDetailMapper.xml @@ -72,7 +72,12 @@ qd.currency_total_cost1, qd.currency_total_cost2, qd.quote_currency_total_cost1, - qd.quote_currency_total_cost2 + qd.quote_currency_total_cost2, + qd.calculated_items, + qd.test_cost, + qd.adjust_test_cost, + qd.else_cost, + qd.adjust_else_cost from plm_quote_detail qd left join plm_quote q on qd.quote_id = q.id left join view_Project_Part pp @@ -170,7 +175,12 @@ qd.currency_total_cost1, qd.currency_total_cost2, qd.quote_currency_total_cost1, - qd.quote_currency_total_cost2 + qd.quote_currency_total_cost2, + qd.calculated_items, + qd.test_cost, + qd.adjust_test_cost, + qd.else_cost, + qd.adjust_else_cost from plm_quote_detail qd left join plm_quote q on qd.quote_id = q.id left join view_Project_Part pp @@ -272,7 +282,12 @@ qd.quote_currency_total_cost2, q.quote_date, q.quote_version_no, - q.inside_inquiry_no + q.inside_inquiry_no, + qd.calculated_items, + qd.test_cost, + qd.adjust_test_cost, + qd.else_cost, + qd.adjust_else_cost from plm_quote_detail qd left join plm_quote q on qd.quote_id = q.id left join view_Project_Part pp From 2a476d815b6b58002ed09ea9921f1b748892d681 Mon Sep 17 00:00:00 2001 From: qiezi <15576055375@163.com> Date: Mon, 16 Dec 2024 11:55:19 +0800 Subject: [PATCH 2/2] 2024-12-16 --- .../com/spring/modules/quote/service/impl/QuoteServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/spring/modules/quote/service/impl/QuoteServiceImpl.java b/src/main/java/com/spring/modules/quote/service/impl/QuoteServiceImpl.java index 5756a2b7..68fd186a 100644 --- a/src/main/java/com/spring/modules/quote/service/impl/QuoteServiceImpl.java +++ b/src/main/java/com/spring/modules/quote/service/impl/QuoteServiceImpl.java @@ -292,7 +292,7 @@ public class QuoteServiceImpl extends ServiceImpl implements detail.setTestCost(BigDecimal.ZERO); detail.setAdjustTestCost(BigDecimal.ZERO); detail.setCalculatedItems("工具,测试,其他,包装&运输"); -// detail.setMoq("Standard 250K"); + detail.setMoq(""); quoteDetailService.saveQuoteDetail(detail); ids.add(quote.getId());