183计量公式

blade-service/blade-manager/src/main/java/org/springblade/manager/formula/impl/ExecutorMeter.java

@@ -1107,12 +1107,12 @@ public class ExecutorMeter extends FormulaExecutor {
                             .add(BaseUtils.str2BigDecimal(StringUtils.handleNull(change.getChangeEndPeriodUnit())));
                     if(addTotal.compareTo(BigDecimal.ZERO)!=0){
                         change.setAfterChangePeriodUnit(addTotal.stripTrailingZeros().toPlainString());
-                        if(inventory.getCurrentPrice().compareTo(BigDecimal.ZERO)!=0){
-                            BigDecimal multiplyMoney = addTotal.multiply(inventory.getCurrentPrice());
-                            /*到本期末变更后(金额)*/
-                            change.setAfterChangePeriodAmount(multiplyMoney.stripTrailingZeros().toPlainString());
-                        }
                     }
+                    /*到本期末变更后(金额)*/
+                    //合同清单数量(金额)+到本期末变更累计(金额)
+                    BigDecimal contractAmount = BaseUtils.str2BigDecimal(StringUtils.handleNull(change.getContractInventoryAmount()));
+                    BigDecimal changeEndAmount = BaseUtils.str2BigDecimal(StringUtils.handleNull(change.getChangeEndPeriodAmount()));
+                    change.setAfterChangePeriodAmount(contractAmount.add(changeEndAmount).stripTrailingZeros().toPlainString());
                     dataList.add(change);
                 }
                 if(!dataList.isEmpty()){