wfg преди 4 месеца
родител
ревизия
2f52bd068c
променени са 1 файла, в които са добавени 5 реда и са изтрити 1 реда
  1. 5 1
      blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/service/impl/ReportsServiceImpl.java

+ 5 - 1
blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/service/impl/ReportsServiceImpl.java

@@ -1448,7 +1448,11 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						BigDecimal PsRate = new BigDecimal(BigInteger.ZERO);
 						Integer corpIsDC = 0;
 						if (ObjectUtils.isNotNull(bCorps11)) {
-							PsRate = new BigDecimal(bCorps11.getPsRate());
+							if("外部报价".equals(item.getQuotationMethod())){
+								PsRate = new BigDecimal(bCorps11.getPsRateExternal());
+							}else {
+								PsRate = new BigDecimal(bCorps11.getPsRate());
+							}
 							if (ObjectUtils.isNotNull(bCorps11.getCorpTypeName()) && bCorps11.getCorpTypeName().contains("国内直接客户")) {
 								corpIsDC = 1;
 							}