修复车辆出库

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:推送财务出库单
         //推送金蝶出库单