1

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -283,6 +283,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 record.setUploadState("1");
             }
             //是否调整
+            if (0 == record.getAdjustmentState()){
                 if (new BigDecimal(record.getStayDetermineMoney()).compareTo(BigDecimal.ZERO) == 0) {
                     BigDecimal decimal = new BigDecimal(StringUtils.isNotBlank(record.getUploadMoney()) ? record.getUploadMoney() : "0").add(new BigDecimal(StringUtils.isNotBlank(record.getSecondaryUploadMoney()) ? record.getSecondaryUploadMoney() : "0")).subtract(new BigDecimal(StringUtils.isNotBlank(record.getMoney()) ? record.getMoney() : "0")).subtract(new BigDecimal(StringUtils.isNotBlank(record.getStayDetermineMoney()) ? record.getStayDetermineMoney() : "0")).subtract(new BigDecimal(StringUtils.isNotBlank(record.getEstimateRebate()) ? record.getEstimateRebate() : "0"));
                     int i = decimal.compareTo(BigDecimal.ZERO);
@@ -305,6 +306,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                     record.setAdjustOrNot(false);
                 }
             }
+        }
         PagerVo<ScmVehRebateVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }