1

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

@@ -125,4 +125,6 @@ public class ScmVehRebateVo implements Vo {
     private String createOrgName; // 创建组织名称
     @ApiModelProperty("上传状态(2未上传、3已上传)")
     private String uploadState; // 上传状态
+    @ApiModelProperty("是否可以点击是否调整")
+    private Boolean adjustOrNot;
 }

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

@@ -261,21 +261,25 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
             }
             //是否调整
             if (new BigDecimal(record.getStayDetermineMoney()).compareTo(BigDecimal.ZERO) == 0){
-                BigDecimal decimal = new BigDecimal(record.getUploadMoney()).subtract(new BigDecimal(record.getFreight())).subtract(new BigDecimal(record.getStayDetermineMoney())).subtract(new BigDecimal(record.getEstimateRebate()));
+                BigDecimal decimal = new BigDecimal(record.getUploadMoney()).subtract(new BigDecimal(record.getMoney())).subtract(new BigDecimal(record.getStayDetermineMoney())).subtract(new BigDecimal(record.getEstimateRebate()));
                 int i = decimal.compareTo(BigDecimal.ZERO);
                 if (i < 0){//小于
                     record.setIsAdjustment("否");
                     record.setAdjustmentMoney("0");
+                    record.setAdjustOrNot(true)
                 }else if (i == 0){//等于
                     record.setIsAdjustment("是");
                     record.setAdjustmentMoney("0");
+                    record.setAdjustOrNot(false)
                 }else{//大于
                     record.setIsAdjustment("是");
                     record.setAdjustmentMoney(decimal.toString());
+                    record.setAdjustOrNot(true)
                 }
             }else {
                 record.setIsAdjustment("否");
                 record.setAdjustmentMoney("0");
+                record.setAdjustOrNot(false)
             }
         }
         PagerVo<ScmVehRebateVo> p = PagerUtil.pageToVo(pagging, null);