提交

zhangback

2025-12-30 939ee5a461a64b40b23d2b5f51c69dead13ee7e3

 tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java

@@ -87,6 +87,8 @@
    private TmsServiceProviderMapper tmsServiceProviderMapper;
    @Resource
    private TmsCustomsServiceProviderMapper tmsCustomsServiceProviderMapper;
    @Resource
    private  TmsTripMapper tmsTripMapper;

    /**
     * 查询调度单管理
@@ -166,6 +168,9 @@
        tmsDispatchOrderNew.setLicensePlate(null);
        tmsDispatchOrderNew.setUpdateBy(null);
        tmsDispatchOrderNew.setId(null);
        tmsDispatchOrderNew.setAccountsReceivableStatus(0);
        tmsDispatchOrderNew.setAccountsPayableStatus(0);



        int i = insertTmsDispatchOrder(tmsDispatchOrderNew);
@@ -196,6 +201,27 @@
        return AjaxResult.success("操作成功");
    }

    @Override
    public AjaxResult close(Integer id) {
        TmsDispatchOrder tmsDispatchOrder = selectTmsDispatchOrderById(id);
        if (tmsDispatchOrder == null){
            return AjaxResult.error("未找到该数据");
        }
        if (tmsDispatchOrder.getIsfk() == 0){
            return AjaxResult.success();
        }
        TmsTrip tmsTrip = tmsTripMapper.selectOne(new LambdaQueryWrapper<TmsTrip>().eq(TmsTrip::getDispatchOrderId, id)
                .eq(TmsTrip::getTripType, 0)
                .orderByDesc(TmsTrip::getId)
                .last("limit 1")
        );

        if (tmsTrip != null){
            return AjaxResult.error("该调度单状态为【在途】，且司机于【"+DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", tmsTrip.getTripTime())+"】已发车，不允许作废，如需取消行程，" +
                    "请通知司机操作返空即可。");
        }
        return AjaxResult.success("操作成功");
    }

    @Override
    public AjaxResult connectHang(TmsDriverDispatch driverDispatch) {
@@ -208,6 +234,27 @@
        return AjaxResult.success();
    }

    @Override
    public AjaxResult closeOrder(TmsDispatchOrder order) {
        TmsDispatchOrder tmsDispatchOrder = selectTmsDispatchOrderById(order.getId());
        if (tmsDispatchOrder == null){
            return AjaxResult.error("未找到该数据");
        }
        AjaxResult close = close(tmsDispatchOrder.getId());
        if (close.isSuccess()){
            tmsDispatchOrder.setStatus(5);
            tmsDispatchOrder.setCloseBy(SecurityUtils.getUsername());
            tmsDispatchOrder.setCloseTime(DateUtils.getNowDate());
            tmsDispatchOrder.setCloseRemark(tmsDispatchOrder.getCloseRemark());
            tmsDispatchOrder.setCloseWhy(tmsDispatchOrder.getCloseWhy());
            tmsDispatchOrderMapper.updateTmsDispatchOrder(tmsDispatchOrder);
            // TODO 加日志

            return AjaxResult.success("操作成功");
        }else{
            return close;
        }
    }

    @Override
    public int customsOrder(TmsDispatchOrder tmsDispatchOrder) {