From 6454ce5df740c23f583db7a49f27bae0b98054b4 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Sat, 8 Oct 2022 15:38:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BD=A6=E8=BE=86=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basevehicleout/BaseVehicleOutService.java | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

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 08fb599ce1..1905c6577c 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
@@ -58,10 +58,18 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         }
         BaseVehicleOut baseVehicleOut = new BaseVehicleOut();
         BeanUtil.copyProperties(dto, baseVehicleOut, "sid");
-        baseVehicleOut.setPrice(new BigDecimal(dto.getPrice()));
-        baseVehicleOut.setSalesAllowance(new BigDecimal(dto.getSalesAllowance()));
-        baseVehicleOut.setRebateMoneyOne(new BigDecimal(dto.getRebateMoneyOne()));
-        baseVehicleOut.setRebateMoneyTwo(new BigDecimal(dto.getRebateMoneyTwo()));
+        if(StringUtils.isNotBlank(dto.getPrice())){
+            baseVehicleOut.setPrice(new BigDecimal(dto.getPrice()));
+        }
+        if(StringUtils.isNotBlank(dto.getSalesAllowance())){
+            baseVehicleOut.setSalesAllowance(new BigDecimal(dto.getSalesAllowance()));
+        }
+        if(StringUtils.isNotBlank(dto.getRebateMoneyOne())){
+            baseVehicleOut.setRebateMoneyOne(new BigDecimal(dto.getRebateMoneyOne()));
+        }
+        if(StringUtils.isNotBlank(dto.getRebateMoneyTwo())){
+            baseVehicleOut.setRebateMoneyTwo(new BigDecimal(dto.getRebateMoneyTwo()));
+        }
         baseMapper.insert(baseVehicleOut);
         //更新车辆台账的出库状态等值，库存状态修改为出库，销售日期修改为当天，成交价，备注
         String remarks = baseVehicleOut.getConcatNo() + baseVehicleOut.getType();
@@ -70,7 +78,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         baseVehicle.setVehicleState(VehicleState.StockEnum.OUT_STOCK.getCode());
         baseVehicle.setVehicleStateValue(VehicleState.StockEnum.OUT_STOCK.getRemarks());
         baseVehicle.setSalesDate(new Date());
-        baseVehicle.setSalePrice(Integer.valueOf(dto.getPrice()));
+        if(StringUtils.isNotBlank(dto.getPrice())){
+            baseVehicle.setSalePrice(Integer.valueOf(dto.getPrice()));
+        }
         baseVehicleService.updateById(baseVehicle);
         ////ToDo:推送财务出库单
         //推送金蝶出库单