1

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java

@@ -127,4 +127,6 @@ public class ScmVehRebateVo implements Vo {
     private String uploadState; // 上传状态
     @ApiModelProperty("是否可以点击是否调整")
     private Boolean adjustOrNot;
+    @ApiModelProperty("调整状态(1已调整0未调整)")
+    private Integer adjustmentState;
 }

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

@@ -256,7 +256,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 record.setUploadState("2");
             }
             //上传状态：已上传
-            if (StringUtils.isNotBlank(record.getUploadDate()) && StringUtils.isNotBlank(record.getUploadMoney()) && record.getIsAdjustment().equals("否")) {
+            if (StringUtils.isNotBlank(record.getUploadDate()) && StringUtils.isNotBlank(record.getUploadMoney())) {
                 record.setUploadState("3");
             }
             //是否调整