1

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

@@ -356,13 +356,13 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         ScmSpecialRebate scmSpecialRebate = fetchBySid(sid);
         ScmSpecialRebateDto scmSpecialRebateDto = new ScmSpecialRebateDto();
         BeanUtil.copyProperties(scmSpecialRebate, scmSpecialRebateDto);
-        scmSpecialRebateDto.setOnceItureCost(dto.getOnceItureCost());
-        scmSpecialRebateDto.setOnceTreatCost(dto.getOnceTreatCost());
-        scmSpecialRebateDto.setOnceSuppCost(dto.getOnceSuppCost());
+        scmSpecialRebateDto.setOnceItureCost(scmSpecialRebate.getOnceItureCost().subtract(scmSpecialRebate.getTempItureCost()).add(dto.getTempItureCost()));
+        scmSpecialRebateDto.setOnceTreatCost(scmSpecialRebate.getOnceTreatCost().subtract(scmSpecialRebate.getTempTreatCost()).add(dto.getTempTreatCost()));
+        scmSpecialRebateDto.setOnceSuppCost(scmSpecialRebate.getOnceSuppCost().subtract(scmSpecialRebate.getTempSuppCost()).add(dto.getTempSuppCost()));
         scmSpecialRebateDto.setOnceSuppRemark(dto.getOnceSuppRemark());
-        scmSpecialRebateDto.setTempItureCost(scmSpecialRebate.getOnceItureCost().subtract(scmSpecialRebate.getTempItureCost()).add(dto.getTempItureCost()));
-        scmSpecialRebateDto.setTempTreatCost(scmSpecialRebate.getOnceTreatCost().subtract(scmSpecialRebate.getTempTreatCost()).add(dto.getTempTreatCost()));
-        scmSpecialRebateDto.setTempSuppCost(scmSpecialRebate.getOnceSuppCost().subtract(scmSpecialRebate.getTempSuppCost()).add(dto.getTempSuppCost()));
+        scmSpecialRebateDto.setTempItureCost(dto.getTempItureCost());
+        scmSpecialRebateDto.setTempTreatCost(dto.getTempTreatCost());
+        scmSpecialRebateDto.setTempSuppCost(dto.getTempSuppCost());
         scmSpecialRebateDto.setSecondItureCost(dto.getSecondItureCost());
         scmSpecialRebateDto.setSecondTreatCost(dto.getSecondTreatCost());
         scmSpecialRebateDto.setSecondSuppCost(dto.getSecondSuppCost());

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

@@ -528,11 +528,11 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         ScmVehRebate scmVehRebate = fetchBySid(sid);
         ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto();
         BeanUtil.copyProperties(scmVehRebate, scmVehRebateVehDto);
-        scmVehRebateVehDto.setOnceTreatCost(dto.getOnceTreatCost());
-        scmVehRebateVehDto.setOnceSuppCost(dto.getOnceSuppCost());
+        scmVehRebateVehDto.setOnceTreatCost(scmVehRebate.getOnceTreatCost().subtract(scmVehRebate.getTempTreatCost()).add(dto.getTempTreatCost()));
+        scmVehRebateVehDto.setOnceSuppCost(scmVehRebate.getOnceSuppCost().subtract(scmVehRebate.getTempSuppCost()).add(dto.getTempSuppCost()));
         scmVehRebateVehDto.setOnceSuppRemark(dto.getOnceSuppRemark());
-        scmVehRebateVehDto.setTempTreatCost(scmVehRebate.getOnceTreatCost().subtract(scmVehRebate.getTempTreatCost()).add(dto.getTempTreatCost()));
-        scmVehRebateVehDto.setTempSuppCost(scmVehRebate.getOnceSuppCost().subtract(scmVehRebate.getTempSuppCost()).add(dto.getTempSuppCost()));
+        scmVehRebateVehDto.setTempTreatCost(dto.getTempTreatCost());
+        scmVehRebateVehDto.setTempSuppCost(dto.getTempSuppCost());
         scmVehRebateVehDto.setSecondTreatCost(dto.getSecondTreatCost());
         scmVehRebateVehDto.setSecondSuppCost(dto.getSecondSuppCost());
         scmVehRebateVehDto.setSecondSuppRemark(dto.getSecondSuppRemark());