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

挂车、上装、主车出库调整

master
God 2 years ago
parent
6c0095040b
commit
f553ccd1b7
1 changed files with 5 additions and 120 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. 125
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

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

@ -352,9 +352,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
}
//项目类别key和项目类别type
salOutStock.setF_PAEZ_AssistantType("payType");
salOutStock.setF_PAEZ_AssistantKey(dto.getTypeKey());
//中介单位
salOutStock.setF_PAEZ_Base(dto.getMiddleCodeOne());
//销售类型-外采挂车映射
salOutStock.setF_PAEZ_AssistantKey("009");
//物料列表
List<SalOutStock.FEntity> fEntityList = new ArrayList<>();
SalOutStock.FEntity fEntity = new SalOutStock.FEntity();
@ -364,63 +363,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
fEntity.setFMaterialID(baseTrailerDetailsVo.getVinNo().substring(baseTrailerDetailsVo.getVinNo().length() - 8) + "G");
//仓库id
fEntity.setFStockID(baseVehicle.getLocationCode());
//销售折让
if (StringUtils.isNotBlank(dto.getSalesAllowance())) {
fEntity.setF_PAEZ_Decimal3(dto.getSalesAllowance());
}
if (StringUtils.isNotBlank(dto.getGiftsDescription())) {
fEntity.setF_PAEZ_Decimal4(dto.getGiftsDescription());
}
//返利金额
fEntity.setF_PAEZ_Decimal("0");
String remarks = dto.getRemarks();
String note = "";
if (StringUtils.isNotBlank(remarks)) {
note = 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() + "。";
//返利金额
fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).add(new BigDecimal(dto.getRebateMoneyTwo())).toString());
} else {
note = 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())) {
note = note + " 返利情况：" + dto.getMiddleTwo() + dto.getRebateMoneyTwo() + "。";
//返利金额
fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyTwo()).toString());//dto.getRebateMoneyOne()
}
}
} else {
if (StringUtils.isNotBlank(dto.getRebateMoneyOne())) {
note = note + " 返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。";
//返利金额
fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());
}
}
} else {
if (StringUtils.isNotBlank(dto.getMiddleTwo())) {
if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
note = note + " 返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。";
//返利金额
fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());
}
}
}
if (StringUtils.isNotBlank(note)) {
fEntity.setFEntrynote(note);
}
fEntityList.add(fEntity);
if (fEntityList.size() > 0) {
salOutStock.setFEntity(fEntityList);
@ -451,74 +393,17 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
}
//项目类别key和项目类别type
salOutStock.setF_PAEZ_AssistantType("payType");
salOutStock.setF_PAEZ_AssistantKey(dto.getTypeKey());
//中介单位
salOutStock.setF_PAEZ_Base(dto.getMiddleCodeOne());
//销售类型-外采挂车映射
salOutStock.setF_PAEZ_AssistantKey("009");
//物料列表
List<SalOutStock.FEntity> fEntityList = new ArrayList<>();
SalOutStock.FEntity fEntity = new SalOutStock.FEntity();
//单价
fEntity.setFPrice(baseVehinstallDetailsVo.getCostPrice());
fEntity.setFPrice(dto.getTrailerOrInstallDealPrice());
//物料编码
fEntity.setFMaterialID(baseVehinstallDetailsVo.getVinNo().substring(dto.getVinNo().length() - 8) + "SZ");
//仓库id
fEntity.setFStockID(baseVehicle.getLocationCode());
//销售折让
if (StringUtils.isNotBlank(dto.getSalesAllowance())) {
fEntity.setF_PAEZ_Decimal3(dto.getSalesAllowance());
}
if (StringUtils.isNotBlank(dto.getGiftsDescription())) {
fEntity.setF_PAEZ_Decimal4(dto.getGiftsDescription());
}
//返利金额
fEntity.setF_PAEZ_Decimal("0");
String remarks = dto.getRemarks();
String note = "";
if (StringUtils.isNotBlank(remarks)) {
note = 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() + "。";
//返利金额
fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).add(new BigDecimal(dto.getRebateMoneyTwo())).toString());
} else {
note = note + " 返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。";
//返利金额
fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());
}
} else {
if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
note = note + " 返利情况：" + dto.getMiddleTwo() + dto.getRebateMoneyTwo() + "。";
//返利金额
fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyTwo()).toString());//dto.getRebateMoneyOne()
}
}
} else {
if (StringUtils.isNotBlank(dto.getRebateMoneyOne())) {
note = note + " 返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。";
//返利金额
fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());
}
}
} else {
if (StringUtils.isNotBlank(dto.getMiddleTwo())) {
if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
note = note + " 返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。";
//返利金额
fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());
}
}
}
if (StringUtils.isNotBlank(note)) {
fEntity.setFEntrynote(note);
}
fEntityList.add(fEntity);
if (fEntityList.size() > 0) {
salOutStock.setFEntity(fEntityList);

Write Preview
Loading…
Cancel
Save