From c07ae3aa0729848ebce5ca70f8638a56000173c0 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Thu, 5 Sep 2024 09:40:23 +0800
Subject: [PATCH] 1

---
 .../java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java | 2 ++
 .../com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java
index 8709a7d081..699e948db1 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java
+++ b/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;
 }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
index c0005377d3..b99caaecb7 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
+++ b/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");
             }
             //是否调整