Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java

@@ -28,4 +28,6 @@ public interface BaseVehicleOutMapper extends BaseMapper<BaseVehicleOut> {
     IPage<BaseVehicleOutVo> selectPageVo(IPage<BaseVehicleOut> page, @Param(Constants.WRAPPER)QueryWrapper<BaseVehicleOut> qw);
 
     BaseVehicleOutDetailsVo details(String sid);
+
+    int selectCountBySidVin(String vinSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml

@@ -80,4 +80,8 @@
         from base_vehicle_out
         where sid = #{sid}
     </select>
+
+    <select id="selectCountBySidVin" resultType="int">
+        select count(*) from base_vehicle_out where vinSid = #{vinSid}
+    </select>
 </mapper>

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

@@ -61,6 +61,11 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         if (count > 0) {
             return rb.setMsg(dto.getVinNo() + "车辆不满足出库条件");
         }
+        //查询是否已出库
+        int counts = baseMapper.selectCountBySidVin(dto.getVinSid());
+        if (counts > 0) {
+            return rb.setMsg("该车辆已出库，不允许重复出库");
+        }
         BaseVehicleOut baseVehicleOut = new BaseVehicleOut();
         BeanUtil.copyProperties(dto, baseVehicleOut, "sid");
         if (StringUtils.isNotBlank(dto.getPrice())) {