Merge remote-tracking branch 'origin/master'

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;
 

src/main/java/com/spring/modules/quote/service/impl/QuoteServiceImpl.java

@@ -287,7 +287,12 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> implements
             detail.setCurrencyTotalCost2(BigDecimal.ZERO);
             detail.setQuoteCurrencyTotalCost1(BigDecimal.ZERO);
             detail.setQuoteCurrencyTotalCost2(BigDecimal.ZERO);
-//            detail.setMoq("Standard 250K");
+            detail.setElseCost(BigDecimal.ZERO);
+            detail.setAdjustElseCost(BigDecimal.ZERO);
+            detail.setTestCost(BigDecimal.ZERO);
+            detail.setAdjustTestCost(BigDecimal.ZERO);
+            detail.setCalculatedItems("工具,测试,其他,包装&运输");
+            detail.setMoq("");
             quoteDetailService.saveQuoteDetail(detail);
 
             ids.add(quote.getId());

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

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