代码优化

skyouc

22 小时以前 ebdfa825c07189b5f8e89f147d96d1bc612589db

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java

@@ -71,7 +71,7 @@
        List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
        Map<Long, List<TaskItem>> maps = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getSource));
        maps.keySet().forEach(key -> {
                AsnOrderItem orderItem = asnOrderItemService.getById(key);
                WkOrderItem orderItem = asnOrderItemService.getById(key);
                if (Objects.isNull(orderItem)) {
                    throw new CoolException("单据明细不存在！！");
                }
@@ -120,13 +120,13 @@
                throw new CoolException("波次对应关联单未找到");
            }
            List<Long> ids = waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toList());
            ArrayList<AsnOrderItem> list = new ArrayList<>();
            ArrayList<WkOrderItem> list = new ArrayList<>();
            List<WkOrder> wkOrderList = asnOrderService.list(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, ids));
            for (WkOrder wkOrder : wkOrderList) {
                AsnOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<AsnOrderItem>()
                        .eq(AsnOrderItem::getAsnId, wkOrder.getId())
                        .eq(AsnOrderItem::getMatnrCode, taskItem.getMatnrCode())
                        .eq(AsnOrderItem::getSplrBatch, taskItem.getBatch())
                WkOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<WkOrderItem>()
                        .eq(WkOrderItem::getAsnId, wkOrder.getId())
                        .eq(WkOrderItem::getMatnrCode, taskItem.getMatnrCode())
                        .eq(WkOrderItem::getSplrBatch, taskItem.getBatch())
                );
                if (null != orderItem){
                    list.add(orderItem);
@@ -134,7 +134,7 @@


            }
            containerWaveDto.setAsnOrderItems(list);
            containerWaveDto.setWkOrderItems(list);
            containerWaveDtos.add(containerWaveDto);
        }

@@ -158,17 +158,17 @@

        for (ContainerWaveDto containerWaveDto : containerWaveParam.getContainerWaveDtos()) {
            //做一次校验，判断前端所有出库数量是否超过本托出库数量
            double sum = containerWaveDto.getAsnOrderItems().stream().mapToDouble(AsnOrderItem::getDemandQty).sum();
            double sum = containerWaveDto.getWkOrderItems().stream().mapToDouble(WkOrderItem::getDemandQty).sum();
            BigDecimal total = new BigDecimal(String.valueOf(sum));
            BigDecimal anfme = new BigDecimal(containerWaveDto.getTaskItem().getAnfme().toString());
            if (!anfme.equals(total)){
                throw new CoolException("播种数量不等于容器出库数量，请检查");
            }
            for (AsnOrderItem oldOrderItem : containerWaveDto.getAsnOrderItems()) {
            for (WkOrderItem oldOrderItem : containerWaveDto.getWkOrderItems()) {
                if (Double.compare(oldOrderItem.getDemandQty(), 0.0) == 0) {
                    continue;
                }
                AsnOrderItem orderItem = asnOrderItemService.getById(oldOrderItem.getId());
                WkOrderItem orderItem = asnOrderItemService.getById(oldOrderItem.getId());
                BigDecimal num = new BigDecimal(orderItem.getWorkQty().toString()).subtract(new BigDecimal(orderItem.getQty().toString()));
                BigDecimal orderDemandQty = new BigDecimal(oldOrderItem.getDemandQty().toString());
                if (num.compareTo(orderDemandQty) < 0){
@@ -227,8 +227,8 @@
        return wkOrderList.stream().allMatch(item -> new BigDecimal(item.getAnfme().toString()).equals(new BigDecimal(item.getQty().toString())));
    }

    private Boolean checkOrderComplete(AsnOrderItem orderItem) {
        List<AsnOrderItem> asnOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnCode, orderItem.getAsnCode()));
        return asnOrderItems.stream().allMatch(item -> new BigDecimal(item.getAnfme().toString()).equals(new BigDecimal(item.getQty().toString())));
    private Boolean checkOrderComplete(WkOrderItem orderItem) {
        List<WkOrderItem> wkOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getAsnCode, orderItem.getAsnCode()));
        return wkOrderItems.stream().allMatch(item -> new BigDecimal(item.getAnfme().toString()).equals(new BigDecimal(item.getQty().toString())));
    }
}