委托报关和委托装卸原判断逻辑不变，新增批量选择调度单

wujianwei

4 天以前 6006a8c90c8fbc12f42cfdf9985e4a2d372a2072

委托报关和委托装卸原判断逻辑不变，新增批量选择调度单

 tms/src/main/java/com/ruoyi/tms/controller/TmsDispatchOrderController.java

@@ -155,15 +155,15 @@

    @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:customsOrder')")
    @PostMapping(value = "/customsOrder")
    public AjaxResult customsOrder(@RequestBody TmsDispatchOrder tmsDispatchOrder)
    public AjaxResult customsOrder(@RequestBody List<TmsDispatchOrder> tmsDispatchOrders)
    {
        return toAjax(tmsDispatchOrderService.customsOrder(tmsDispatchOrder));
        return toAjax(tmsDispatchOrderService.customsOrder(tmsDispatchOrders));
    }
    @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:loadingOrder')")
    @PostMapping(value = "/loadingOrder")
    public AjaxResult loadingOrder(@RequestBody TmsDispatchOrder tmsDispatchOrder)
    public AjaxResult loadingOrder(@RequestBody List<TmsDispatchOrder> tmsDispatchOrders)
    {
        return toAjax(tmsDispatchOrderService.loadingOrder(tmsDispatchOrder));
        return toAjax(tmsDispatchOrderService.loadingOrder(tmsDispatchOrders));
    }

    /**

 tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java

@@ -32,8 +32,8 @@
    public AjaxResult close(Integer id);
    public AjaxResult connectHang(TmsDriverDispatch driverDispatch);
    public AjaxResult closeOrder(TmsDispatchOrder order);
    public int customsOrder(TmsDispatchOrder tmsDispatchOrder);
    public int loadingOrder(TmsDispatchOrder tmsDispatchOrder);
    public int customsOrder(List<TmsDispatchOrder> tmsDispatchOrders);
    public int loadingOrder(List<TmsDispatchOrder> tmsDispatchOrders);


    /**

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

@@ -300,47 +300,52 @@

    //填写委托报关信息
    @Override
    public int customsOrder(TmsDispatchOrder tmsDispatchOrder) {
        int result = tmsDispatchOrderMapper.update(new LambdaUpdateWrapper<TmsDispatchOrder>()
                .eq(TmsDispatchOrder::getId, tmsDispatchOrder.getId())
                .set(TmsDispatchOrder::getCustomsServiceProviderId, tmsDispatchOrder.getCustomsServiceProviderId())
                .set(TmsDispatchOrder::getCustomsServiceProviderName, tmsDispatchOrder.getCustomsServiceProviderName())
        );
    public int customsOrder(List<TmsDispatchOrder> tmsDispatchOrders) {
        int totalResult = 0;
        for (TmsDispatchOrder tmsDispatchOrder : tmsDispatchOrders) {
            int result = tmsDispatchOrderMapper.update(new LambdaUpdateWrapper<TmsDispatchOrder>()
                    .eq(TmsDispatchOrder::getId, tmsDispatchOrder.getId())
                    .set(TmsDispatchOrder::getCustomsServiceProviderId, tmsDispatchOrder.getCustomsServiceProviderId())
                    .set(TmsDispatchOrder::getCustomsServiceProviderName, tmsDispatchOrder.getCustomsServiceProviderName())
            );
            totalResult += result;

        if (result > 0) {
            TmsDispatchOrderLog log = new TmsDispatchOrderLog();
            log.setHeadId(tmsDispatchOrder.getId());
            log.setCreateBy(SecurityUtils.getUsername());
            log.setCreateTime(DateUtils.getNowDate());
            log.setNode("填写委托报关信息");
            if (result > 0) {
                TmsDispatchOrderLog log = new TmsDispatchOrderLog();
                log.setHeadId(tmsDispatchOrder.getId());
                log.setCreateBy(SecurityUtils.getUsername());
                log.setCreateTime(DateUtils.getNowDate());
                log.setNode("填写委托报关信息");

            tmsDispatchOrderLogService.insertTmsDispatchOrderLog(log);
                tmsDispatchOrderLogService.insertTmsDispatchOrderLog(log);
            }
        }

        return result;
        return totalResult;
    }

    //填写委托装卸信息
    @Override
    public int loadingOrder(TmsDispatchOrder tmsDispatchOrder) {
        int result = tmsDispatchOrderMapper.update(new LambdaUpdateWrapper<TmsDispatchOrder>()
                .eq(TmsDispatchOrder::getId, tmsDispatchOrder.getId())
                .set(TmsDispatchOrder::getLoadingServiceProviderId, tmsDispatchOrder.getLoadingServiceProviderId())
                .set(TmsDispatchOrder::getLoadingServiceProviderName, tmsDispatchOrder.getLoadingServiceProviderName())
        );
    public int loadingOrder(List<TmsDispatchOrder> tmsDispatchOrders) {
        int totalResult = 0;
        for (TmsDispatchOrder tmsDispatchOrder : tmsDispatchOrders) {
            int result = tmsDispatchOrderMapper.update(new LambdaUpdateWrapper<TmsDispatchOrder>()
                    .eq(TmsDispatchOrder::getId, tmsDispatchOrder.getId())
                    .set(TmsDispatchOrder::getLoadingServiceProviderId, tmsDispatchOrder.getLoadingServiceProviderId())
                    .set(TmsDispatchOrder::getLoadingServiceProviderName, tmsDispatchOrder.getLoadingServiceProviderName())
            );
            totalResult += result;

        if (result > 0) {
            TmsDispatchOrderLog log = new TmsDispatchOrderLog();
            log.setHeadId(tmsDispatchOrder.getId());
            log.setCreateBy(SecurityUtils.getUsername());
            log.setCreateTime(DateUtils.getNowDate());
            log.setNode("填写委托装卸信息");
            if (result > 0) {
                TmsDispatchOrderLog log = new TmsDispatchOrderLog();
                log.setHeadId(tmsDispatchOrder.getId());
                log.setCreateBy(SecurityUtils.getUsername());
                log.setCreateTime(DateUtils.getNowDate());
                log.setNode("填写委托装卸信息");


            tmsDispatchOrderLogService.insertTmsDispatchOrderLog(log);
                tmsDispatchOrderLogService.insertTmsDispatchOrderLog(log);
            }
        }

        return result;
        return totalResult;
    }

    @Override