Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

zhangback

7 天以前 ca412ade3b178fbc8ba0a4b6215a040acdede954

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

@@ -96,7 +96,7 @@
        if (tmsDispatchOrder.getVehicleId() == null){
            return AjaxResult.error("请先选择车辆");
        }

        tmsDispatchOrder.setConfirmTime(DateUtils.getNowDate());
        tmsDispatchOrder.setStatus(1);

        tmsDispatchOrder.setUpdateBy(SecurityUtils.getUsername());
@@ -121,7 +121,7 @@
            return AjaxResult.error("该调度单数据状态异常");
        }
        tmsDispatchOrder.setStatus(3);

        tmsDispatchOrder.setOkTime(DateUtils.getNowDate());
        tmsDispatchOrder.setUpdateBy(SecurityUtils.getUsername());
        int i = tmsDispatchOrderMapper.updateTmsDispatchOrder(tmsDispatchOrder);
        if (i > 0){
@@ -168,6 +168,11 @@
                        .eq(TmsDriverDispatch::getDriverId, tmsDispatchOrder.getMainDriverId())
                        .set(TmsDriverDispatch::getStatus, 1)
        );

        tmsDispatchOrderMapper.update(new LambdaUpdateWrapper<TmsDispatchOrder>()
                .eq(TmsDispatchOrder::getId, tmsDispatchOrder.getId())
                .set(TmsDispatchOrder::getStatus, 6)
        );
        return AjaxResult.success("操作成功");
    }

@@ -181,6 +186,26 @@
        driverDispatch.setStatus(2);
        tmsDriverDispatchService.insertTmsDriverDispatch(driverDispatch);
        return AjaxResult.success();
    }


    @Override
    public int customsOrder(TmsDispatchOrder tmsDispatchOrder) {
        return tmsDispatchOrderMapper.update(new LambdaUpdateWrapper<TmsDispatchOrder>()
                .eq(TmsDispatchOrder::getId, tmsDispatchOrder.getId())
                .set(TmsDispatchOrder::getCustomsServiceProviderId, tmsDispatchOrder.getCustomsServiceProviderId())
                .set(TmsDispatchOrder::getCustomsServiceProviderName, tmsDispatchOrder.getCustomsServiceProviderName())
        );

    }

    @Override
    public int loadingOrder(TmsDispatchOrder tmsDispatchOrder) {
        return tmsDispatchOrderMapper.update(new LambdaUpdateWrapper<TmsDispatchOrder>()
                .eq(TmsDispatchOrder::getId, tmsDispatchOrder.getId())
                .set(TmsDispatchOrder::getLoadingServiceProviderId, tmsDispatchOrder.getLoadingServiceProviderId())
                .set(TmsDispatchOrder::getLoadingServiceProviderName, tmsDispatchOrder.getLoadingServiceProviderName())
        );
    }

    @Override
@@ -478,6 +503,16 @@
    @Override
    public AjaxResult generateTmsDispatchOrder(List<Integer> ids) {
        List<TmsDispatchOrder> tmsDispatchOrders = initGenerate(ids);
        List<TmsDispatchOrder> collect1 = tmsDispatchOrders.stream().filter(item -> item.getIsCustoms() == 0 && item.getCustomsServiceProviderId() == null).collect(Collectors.toList());
        if (!collect1.isEmpty()){
            String disNos = collect1.stream().map(TmsDispatchOrder::getDispatchNo).collect(Collectors.joining(","));
            return AjaxResult.error("调度单"+disNos+"未补充委托报关信息");
        }
        List<TmsDispatchOrder> collect2 = tmsDispatchOrders.stream().filter(item -> item.getIsLoad() == 0 && item.getLoadingServiceProviderId() == null).collect(Collectors.toList());
        if (!collect2.isEmpty()){
            String disNos = collect2.stream().map(TmsDispatchOrder::getDispatchNo).collect(Collectors.joining(","));
            return AjaxResult.error("调度单"+disNos+"未补充装卸货信息");
        }
        List<TmsDispatchOrder> receivableList = tmsDispatchOrders.stream().filter(item -> item.getAccountsReceivableStatus() == 0).collect(Collectors.toList());
        if (!receivableList.isEmpty()){
            List<TmsDispatchOrder> collect = receivableList.stream().map(item -> {