料箱码查询优化

cl

2026-04-21 228b881e5a893ec010a194ac42011a4169d0c590

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java

@@ -17,6 +17,7 @@
import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.common.utils.QuantityUtils;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -69,6 +70,8 @@
    private AsnOrderService asnOrderService;
    @Autowired
    private TaskService taskService;
    @Autowired
    private WaitPakinItemService waitPakinItemService;

    @Override
    public boolean notifyInspect(List<WkOrder> orders) {
@@ -379,6 +382,16 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R removeOrders(List<Long> ids) {
        long existOrderCnt = this.count(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, ids));
        if (existOrderCnt == 0) {
            return R.ok("单据已不存在或已删除");
        }
        // 已组托不可删除，需先解除组托
        long palletizedCount = waitPakinItemService.count(new LambdaQueryWrapper<WaitPakinItem>()
                .in(WaitPakinItem::getAsnId, ids).eq(WaitPakinItem::getDeleted, 0));
        if (palletizedCount > 0) {
            throw new CoolException("单据已组托，请先解除组托后再删除！！");
        }
        for (Long id : ids) {
            List<WkOrderItem> list = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
                    .eq(WkOrderItem::getOrderId, id));
@@ -435,11 +448,13 @@
        DashboardDto dto = new DashboardDto();
        //获取入库数量
        DashboardDto trandDto = this.baseMapper.getDashbord(OrderType.ORDER_IN.type, TaskType.TASK_TYPE_IN.type + "");
        dto.setInAnf(trandDto.getAnfme()).setTaskIn(trandDto.getRealAnfme()).setTotalIn(trandDto.getAnfme() + trandDto.getRealAnfme());
        dto.setInAnf(trandDto.getAnfme()).setTaskIn(trandDto.getRealAnfme()).setWaitIn(countPendingInOrders())
                .setTotalIn(trandDto.getAnfme() + trandDto.getRealAnfme());

        //获取出库单数量
        DashboardDto outTrand = this.baseMapper.getDashbord(OrderType.ORDER_OUT.type, TaskType.TASK_TYPE_OUT.type + "");
        dto.setOutAnf(outTrand.getAnfme()).setTaskOut(outTrand.getRealAnfme()).setTotalOut(outTrand.getAnfme() + outTrand.getRealAnfme());
        dto.setOutAnf(outTrand.getAnfme()).setTaskOut(outTrand.getRealAnfme()).setWaitOut(countPendingOutOrders())
                .setTotalOut(outTrand.getAnfme() + outTrand.getRealAnfme());

        //获取执行中任务数量
        List<Task> tasks = taskService.list(new LambdaQueryWrapper<>());
@@ -447,6 +462,30 @@
            dto.setTaskQty(tasks.size());
        }
        return R.ok().add(dto);
    }

    /** 未完成入库单：非已完成/取消/关闭 */
    private int countPendingInOrders() {
        return Math.toIntExact(this.count(new LambdaQueryWrapper<WkOrder>()
                .eq(WkOrder::getType, OrderType.ORDER_IN.type)
                .eq(WkOrder::getDeleted, 0)
                .and(w -> w.isNull(WkOrder::getExceStatus).or()
                        .notIn(WkOrder::getExceStatus,
                                AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val,
                                AsnExceStatus.ASN_EXCE_STATUS_TASK_CANCEL.val,
                                AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val))));
    }

    /** 未完成出库单：非已完成/取消/关闭 */
    private int countPendingOutOrders() {
        return Math.toIntExact(this.count(new LambdaQueryWrapper<WkOrder>()
                .eq(WkOrder::getType, OrderType.ORDER_OUT.type)
                .eq(WkOrder::getDeleted, 0)
                .and(w -> w.isNull(WkOrder::getExceStatus).or()
                        .notIn(WkOrder::getExceStatus,
                                AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val,
                                AsnExceStatus.ASN_EXCE_STATUS_TASK_CANCEL.val,
                                AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val))));
    }

    /**
@@ -510,30 +549,38 @@
//            throw new CoolException("收货数量不能为零！！");
//        }
        WkOrder order = this.getById(asrder.getId());
        AsnOrderLog orderLog = new AsnOrderLog();
//        order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
        BeanUtils.copyProperties(order, orderLog);
        orderLog.setId(null);
        orderLog.setAsnId(order.getId());

//        if (!this.saveOrUpdate(order)) {
//            throw new CoolException("状态修改失败！！");
//        }
//        orderLog.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val);
        if (!asnOrderLogService.save(orderLog)) {
            throw new CoolException("主单历史档添加失败！！");
        AsnOrderLog one = asnOrderLogService.getOne(new LambdaQueryWrapper<AsnOrderLog>().eq(AsnOrderLog::getCode, order.getCode()), false);
        AsnOrderLog orderLog;
        if (Objects.isNull(one)) {
            orderLog = new AsnOrderLog();
            BeanUtils.copyProperties(order, orderLog);
            orderLog.setId(null);
            orderLog.setAsnId(order.getId());
            if (!asnOrderLogService.save(orderLog)) {
                throw new CoolException("主单历史档添加失败！！");
            }
        } else {
            long existingLogId = one.getId();
            BeanUtils.copyProperties(order, one);
            one.setId(existingLogId);
            one.setAsnId(order.getId());
            if (!asnOrderLogService.updateById(one)) {
                throw new CoolException("主单历史档更新失败！！");
            }
            orderLog = one;
            asnOrderItemLogService.remove(new LambdaQueryWrapper<AsnOrderItemLog>().eq(AsnOrderItemLog::getLogId, existingLogId));
        }
        List<AsnOrderItemLog> logs = new ArrayList<>();
        List<WkOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
        items.forEach(item -> {
            AsnOrderItemLog itemLog = new AsnOrderItemLog();
            BeanUtils.copyProperties(item, itemLog);
            itemLog.setAsnItemId(itemLog.getId())
            itemLog.setAsnItemId(item.getId())
                    .setId(null)
                    .setLogId(orderLog.getId())
                    .setAsnId(item.getOrderId());
            logs.add(itemLog);
        });

        if (!asnOrderItemLogService.saveBatch(logs)) {
            throw new CoolException("通知单明细历史档保存失败！！");
        }
@@ -544,4 +591,26 @@
            throw new CoolException("原单据删除失败！！");
        }
    }

    @Override
    public void fillPalletQty(List<WkOrder> orders) {
        if (orders == null || orders.isEmpty()) {
            return;
        }
        List<Long> orderIds = orders.stream().map(WkOrder::getId).filter(Objects::nonNull).collect(Collectors.toList());
        if (orderIds.isEmpty()) {
            return;
        }
        List<WaitPakinItem> allItems = waitPakinItemService.list(
                new LambdaQueryWrapper<WaitPakinItem>().in(WaitPakinItem::getAsnId, orderIds).eq(WaitPakinItem::getDeleted, 0));
        Map<Long, Double> sumByAsnId = allItems.stream()
                .collect(Collectors.groupingBy(WaitPakinItem::getAsnId,
                        Collectors.summingDouble(w -> w.getAnfme() != null ? w.getAnfme() : 0.0)));
        sumByAsnId.replaceAll((k, v) -> QuantityUtils.roundToScale(v));
        for (WkOrder order : orders) {
            if (order.getId() != null) {
                order.setPalletQty(sumByAsnId.getOrDefault(order.getId(), 0.0));
            }
        }
    }
}