diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 3f539c39f3..479082d8d0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -352,9 +352,8 @@ public class BaseVehicleOutService extends MybatisBaseService fEntityList = new ArrayList<>(); SalOutStock.FEntity fEntity = new SalOutStock.FEntity(); @@ -364,63 +363,6 @@ public class BaseVehicleOutService extends MybatisBaseService 0) { salOutStock.setFEntity(fEntityList); @@ -451,74 +393,17 @@ public class BaseVehicleOutService extends MybatisBaseService 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);