From 1742e2f57662feb835a297a1b075a034e475514d Mon Sep 17 00:00:00 2001 From: lzq <2495532633@qq.com> Date: Fri, 6 Mar 2026 16:55:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E9=87=8D=E5=A4=8D=E6=8E=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervisory/biz/service/BizDriverService.java | 2 +- .../supervisory/biz/service/BizTruckService.java | 2 +- .../supervisory/order/mapper/OrderInfoMapper.java | 4 ++++ .../supervisory/order/service/OrderInfoService.java | 13 ++++++++++--- .../main/resources/mapper/order/OrderInfoMapper.xml | 12 ++++++++++++ 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizDriverService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizDriverService.java index 7fc76a6..bafe565 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizDriverService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizDriverService.java @@ -174,7 +174,7 @@ public class BizDriverService extends ServiceImpllambdaQuery() - .eq(BizDriverEntity::getBusy, false) + // .eq(BizDriverEntity::getBusy, false) .eq(BizDriverEntity::getCompanyId, searchCompanyResult.getId()) .eq(BizDriverEntity::getAuditStatus, AuditStatus.TongGuo) .and(StrUtil.isNotBlank(keywords), it -> diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizTruckService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizTruckService.java index b31a1fc..1378bed 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizTruckService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizTruckService.java @@ -188,7 +188,7 @@ public class BizTruckService extends ServiceImpl SearchCompanyResult searchCompanyResult = baseMapper.selectCompanyByUserId(userDetail.getUserId()); Assert.notNull(searchCompanyResult, () -> Exceptions.exception("未查询到公司信息")); return PageResult.of(this.page(pageParam.toPage(), Wrappers.lambdaQuery() - .eq(BizTruckEntity::getBusy, false) + // .eq(BizTruckEntity::getBusy, false) .eq(BizTruckEntity::getAuditStatus, AuditStatus.TongGuo) .eq(BizTruckEntity::getCompanyId, searchCompanyResult.getId()) .and(StrUtil.isNotBlank(keywords), it -> diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/mapper/OrderInfoMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/mapper/OrderInfoMapper.java index 57d285d..ba62f2d 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/mapper/OrderInfoMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/mapper/OrderInfoMapper.java @@ -56,4 +56,8 @@ public interface OrderInfoMapper extends BaseMapper { @SuppressWarnings("MybatisXMapperMethodInspection") List> statisticsByAreaGoods(@Param("ew") QueryWrapper ew); + + Boolean driverIsBusy(@Param("driverId") Long driverId); + + Boolean truckIsBusy(@Param("truckId") Long truckId); } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java index 844ac24..d436091 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java @@ -786,7 +786,7 @@ public class OrderInfoService extends ServiceImpl Exceptions.clierr("您没有权限确认此单")); - baseMapper.busyTruck(truckId, Boolean.TRUE); + // baseMapper.busyTruck(truckId, Boolean.TRUE); OrderCargoPlaceEntity cargoPlaceEntity = orderCargoPlaceService.getById(orderInfo.getCargoPlaceId()); String area = cargoPlaceEntity.getArea(); BizAuditConfigEntity bizAuditConfigEntity = bizAuditConfigService.getOne(Wrappers.lambdaQuery(BizAuditConfigEntity.class).eq(BizAuditConfigEntity::getArea, area)); @@ -937,6 +937,12 @@ public class OrderInfoService extends ServiceImpl Exceptions.clierr("订单不存在")); Assert.isTrue(orderInfo.getOrderStatus() == OrderStatus.YiJieDan, () -> Exceptions.clierr("当前订单状态，无法开始运输")); Assert.isTrue(orderInfo.getAuditStatus() == AuditStatus.TongGuo, () -> Exceptions.clierr("当前订单未审核完成，无法开始运输")); + Long truckId = orderInfo.getTruckId(); + Long driverId = orderInfo.getDriverId(); + Boolean driverIsBusy = baseMapper.driverIsBusy(driverId); + Assert.isFalse(driverIsBusy, () -> Exceptions.exception("有未完成的订单，不能清运")); + Boolean truckIsBusy = baseMapper.truckIsBusy(truckId); + Assert.isFalse(truckIsBusy, () -> Exceptions.exception("有未完成的订单，不能清运")); Long orderInfoId = orderInfo.getId(); OrderGoodsEntity entity = orderGoodsService.getById(orderInfo.getGoodsId()); @@ -948,6 +954,8 @@ public class OrderInfoService extends ServiceImpl Exceptions.clierr("订单未分配车辆")); BizTruckEntity truckInfo = baseMapper.getTruckInfo(truckId); Assert.notNull(truckInfo, () -> Exceptions.clierr("车辆不存在")); diff --git a/njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml b/njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml index da9a37b..1a2c5bc 100644 --- a/njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml @@ -400,4 +400,16 @@ INNER JOIN goods_info t2 ON t2.id = t1.goods_id INNER JOIN sys_district t3 ON t3.id = t1.area_code + +