yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

更改

master
ligaode 3 months ago
parent
eba74f5f92
commit
a9033e4cc9
4 changed files with 34 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
  2. 13
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java
  3. 9
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
  4. 10
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java

12
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
View File

@ -1658,9 +1658,15 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
scmSpecialRebateExcelVo.setOnceCheckState("一次核对中");
}
scmSpecialRebateExcelVo.setCreateTime(DateUtil.formatDate(DateUtil.parse(scmSpecialRebateExcelVo.getCreateTime())));
scmSpecialRebateExcelVo.setItureAdjustmentMoney(scmSpecialRebateExcelVo.getOnceItureCost().add(scmSpecialRebateExcelVo.getSecondItureCost()).subtract(scmSpecialRebateExcelVo.getExpectItureCost()));
scmSpecialRebateExcelVo.setTreatAdjustmentMoney(scmSpecialRebateExcelVo.getOnceTreatCost().add(scmSpecialRebateExcelVo.getSecondTreatCost()).subtract(scmSpecialRebateExcelVo.getExpectTreatCost()));
scmSpecialRebateExcelVo.setSuppAdjustmentMoney(scmSpecialRebateExcelVo.getOnceSuppCost().add(scmSpecialRebateExcelVo.getSecondSuppCost()).subtract(scmSpecialRebateExcelVo.getExpectSuppCost()));
if ("是".equals(scmSpecialRebateExcelVo.getIsAdjustment())){
scmSpecialRebateExcelVo.setItureAdjustmentMoney(scmSpecialRebateExcelVo.getOnceItureCost().add(scmSpecialRebateExcelVo.getSecondItureCost()).subtract(scmSpecialRebateExcelVo.getExpectItureCost()));
scmSpecialRebateExcelVo.setTreatAdjustmentMoney(scmSpecialRebateExcelVo.getOnceTreatCost().add(scmSpecialRebateExcelVo.getSecondTreatCost()).subtract(scmSpecialRebateExcelVo.getExpectTreatCost()));
scmSpecialRebateExcelVo.setSuppAdjustmentMoney(scmSpecialRebateExcelVo.getOnceSuppCost().add(scmSpecialRebateExcelVo.getSecondSuppCost()).subtract(scmSpecialRebateExcelVo.getExpectSuppCost()));
}else {
scmSpecialRebateExcelVo.setItureAdjustmentMoney(BigDecimal.ZERO);
scmSpecialRebateExcelVo.setTreatAdjustmentMoney(BigDecimal.ZERO);
scmSpecialRebateExcelVo.setSuppAdjustmentMoney(BigDecimal.ZERO);
}
}
return scmSpecialRebateExcelVos;
}

13
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java
View File

@ -44,6 +44,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.HashMap;
@ -123,9 +124,15 @@ public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckappl
BeanUtil.copyProperties(datum,excelVo);
excelVo.setRankNo(i);
excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime()));
excelVo.setItureAdjustmentMoney(excelVo.getOnceItureCost().add(excelVo.getSecondItureCost()).subtract(excelVo.getExpectItureCost()));
excelVo.setTreatAdjustmentMoney(excelVo.getOnceTreatCost().add(excelVo.getSecondTreatCost()).subtract(excelVo.getExpectTreatCost()));
excelVo.setSuppAdjustmentMoney(excelVo.getOnceSuppCost().add(excelVo.getSecondSuppCost()).subtract(excelVo.getExpectSuppCost()));
if ("是".equals(excelVo.getIsAdjustment())){
excelVo.setItureAdjustmentMoney(excelVo.getOnceItureCost().add(excelVo.getSecondItureCost()).subtract(excelVo.getExpectItureCost()));
excelVo.setTreatAdjustmentMoney(excelVo.getOnceTreatCost().add(excelVo.getSecondTreatCost()).subtract(excelVo.getExpectTreatCost()));
excelVo.setSuppAdjustmentMoney(excelVo.getOnceSuppCost().add(excelVo.getSecondSuppCost()).subtract(excelVo.getExpectSuppCost()));
}else {
excelVo.setItureAdjustmentMoney(BigDecimal.ZERO);
excelVo.setTreatAdjustmentMoney(BigDecimal.ZERO);
excelVo.setSuppAdjustmentMoney(BigDecimal.ZERO);
}
if (excelVo.getState().equals("0")){
excelVo.setState("未预提");
}else if (excelVo.getState().equals("1")){

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

@ -2053,8 +2053,13 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
scmVehRebateExcelVo.setOnceCheckState("一次核对中");
}
scmVehRebateExcelVo.setCreateTime(DateUtil.formatDate(DateUtil.parse(scmVehRebateExcelVo.getCreateTime())));
scmVehRebateExcelVo.setTreatAdjustmentMoney(scmVehRebateExcelVo.getOnceTreatCost().add(scmVehRebateExcelVo.getSecondTreatCost()).subtract(scmVehRebateExcelVo.getExpectTreatCost()));
scmVehRebateExcelVo.setSuppAdjustmentMoney(scmVehRebateExcelVo.getOnceSuppCost().add(scmVehRebateExcelVo.getSecondSuppCost()).subtract(scmVehRebateExcelVo.getExpectSuppCost()));
if ("是".equals(scmVehRebateExcelVo.getIsAdjustment())){
scmVehRebateExcelVo.setTreatAdjustmentMoney(scmVehRebateExcelVo.getOnceTreatCost().add(scmVehRebateExcelVo.getSecondTreatCost()).subtract(scmVehRebateExcelVo.getExpectTreatCost()));
scmVehRebateExcelVo.setSuppAdjustmentMoney(scmVehRebateExcelVo.getOnceSuppCost().add(scmVehRebateExcelVo.getSecondSuppCost()).subtract(scmVehRebateExcelVo.getExpectSuppCost()));
}else {
scmVehRebateExcelVo.setTreatAdjustmentMoney(BigDecimal.ZERO);
scmVehRebateExcelVo.setSuppAdjustmentMoney(BigDecimal.ZERO);
}
}
return scmVehRebateExcelVos;
}

10
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java
View File

@ -44,6 +44,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.HashMap;
@ -134,8 +135,13 @@ public class ScmVehrebateCheckapplyRest implements ScmVehrebateCheckapplyFeign {
BeanUtil.copyProperties(datum,excelVo);
excelVo.setRankNo(i);
excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime()));
excelVo.setTreatAdjustmentMoney(excelVo.getOnceTreatCost().add(excelVo.getSecondTreatCost()).subtract(excelVo.getExpectTreatCost()));
excelVo.setSuppAdjustmentMoney(excelVo.getOnceSuppCost().add(excelVo.getSecondSuppCost()).subtract(excelVo.getExpectSuppCost()));
if ("是".equals(excelVo.getIsAdjustment())){
excelVo.setTreatAdjustmentMoney(excelVo.getOnceTreatCost().add(excelVo.getSecondTreatCost()).subtract(excelVo.getExpectTreatCost()));
excelVo.setSuppAdjustmentMoney(excelVo.getOnceSuppCost().add(excelVo.getSecondSuppCost()).subtract(excelVo.getExpectSuppCost()));
}else {
excelVo.setTreatAdjustmentMoney(BigDecimal.ZERO);
excelVo.setSuppAdjustmentMoney(BigDecimal.ZERO);
}
if (excelVo.getState().equals("0")){
excelVo.setState("未预提");
}else if (excelVo.getState().equals("1")){

Write Preview
Loading…
Cancel
Save