From 8531386ca1db52a952a507ebbb7debb9e0557228 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Sun, 22 Dec 2024 22:36:00 +0800
Subject: [PATCH] =?UTF-8?q?opt=EF=BC=9A=E5=A2=9E=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E5=85=B7=E6=96=B0=E5=A2=9E=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BmVehicleInfoServiceImpl.java     | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/impl/BmVehicleInfoServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/impl/BmVehicleInfoServiceImpl.java
index eedef090..ca3e3a27 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/impl/BmVehicleInfoServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/impl/BmVehicleInfoServiceImpl.java
@@ -2,9 +2,9 @@ package org.nl.wms.base_manage.vehicle.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -12,10 +12,10 @@ import org.nl.common.domain.entity.PageQuery;
 import org.nl.common.domain.exception.BadRequestException;
 import org.nl.common.utils.CodeUtil;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.wms.base_manage.vehicle.service.dto.VehicleQuery;
 import org.nl.wms.base_manage.vehicle.service.IBmVehicleInfoService;
 import org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo;
 import org.nl.wms.base_manage.vehicle.service.dao.mapper.BmVehicleInfoMapper;
+import org.nl.wms.base_manage.vehicle.service.dto.VehicleQuery;
 import org.nl.wms.system_manage.service.dict.ISysDictService;
 import org.nl.wms.system_manage.service.dict.dao.Dict;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,11 +47,6 @@ public class BmVehicleInfoServiceImpl extends ServiceImpl<BmVehicleInfoMapper, B
 
     @Override
     public JSONArray create(JSONObject map) {
-        BmVehicleInfo one = this.getOne(new QueryWrapper<BmVehicleInfo>()
-                .eq("vehicle_code", map.getString("vehicle_code")));
-        if (!ObjectUtil.isEmpty(one)) {
-            throw new BadRequestException("此载具已存在");
-        }
         //转编码类型：
         Dict dict = dictService.getOne(new QueryWrapper<Dict>().eq("para1", map.getString("vehicle_type")));
         if (dict==null){
@@ -73,7 +68,10 @@ public class BmVehicleInfoServiceImpl extends ServiceImpl<BmVehicleInfoMapper, B
             entity.setW(vehicleInfo.getW());
             entity.setOverstruct_type(vehicleInfo.getOverstruct_type());
             entity.setOccupystruct_qty(vehicleInfo.getOccupystruct_qty());
-            this.save(entity);
+            BmVehicleInfo bmVehicleInfo = this.getOne(new LambdaQueryWrapper<BmVehicleInfo>().eq(BmVehicleInfo::getVehicle_code, entity.getVehicle_code()));
+            if (bmVehicleInfo == null) {
+                this.save(entity);
+            }
             resultCodeArr.add(entity.getVehicle_code());
         }
         return resultCodeArr;