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

出库单推送调整备注格式

zhanglei
dimengzhe 3 years ago
parent
648fce07e7
commit
4b5b1fa337
1 changed files with 10 additions and 6 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. 16
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

16
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
View File

@ -191,25 +191,29 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
//返利金额
fEntity.setF_PAEZ_Decimal("0");//dto.getRebateMoneyOne()
String remarks = dto.getRemarks();
String note = remarks;
String note = "";
if(StringUtils.isNotBlank(remarks)){
note = note+remarks;
}
// String note = remarks;
//备注
if (StringUtils.isNotBlank(dto.getMiddleOne())) {
if (StringUtils.isNotBlank(dto.getMiddleTwo())) {
if (StringUtils.isNotBlank(dto.getRebateMoneyOne())) {
if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
note = note + "。返利情况：" + dto.getMiddleOne() + ":" + dto.getRebateMoneyOne() + "," + dto.getMiddleTwo() + ":" + dto.getRebateMoneyTwo() + "。";
note = note + " 返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "," + dto.getMiddleTwo() + dto.getRebateMoneyTwo() + "。";
fEntity.setFEntrynote(note);
//返利金额
fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).add(new BigDecimal(dto.getRebateMoneyTwo())).toString());
} else {
fEntity.setFEntrynote(note + "。返利情况：" + dto.getMiddleOne() + ":" + dto.getRebateMoneyOne() + "。");
fEntity.setFEntrynote(note + " 返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。");
//返利金额
fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());
}
} else {
if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
fEntity.setFEntrynote(note + "。返利情况：" + dto.getMiddleTwo() + ":" + dto.getRebateMoneyTwo() + "。");
fEntity.setFEntrynote(note + " 返利情况：" + dto.getMiddleTwo() + dto.getRebateMoneyTwo() + "。");
//返利金额
fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyTwo()).toString());//dto.getRebateMoneyOne()
}
@ -217,7 +221,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
} else {
if (StringUtils.isNotBlank(dto.getRebateMoneyOne())) {
note = note + "。返利情况：" + dto.getMiddleOne() + ":" + dto.getRebateMoneyOne() + "。";
note = note + " 返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。";
fEntity.setFEntrynote(note);
//返利金额
fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());
@ -226,7 +230,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
} else {
if (StringUtils.isNotBlank(dto.getMiddleTwo())) {
if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
note = note + "。返利情况：" + dto.getMiddleOne() + ":" + dto.getRebateMoneyOne() + "。";
note = note + " 返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。";
fEntity.setFEntrynote(note);
//返利金额
fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());

Write Preview
Loading…
Cancel
Save