zc
2 天以前 2e929cc5c44e4072520aae4c8a9f40029da27405
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -68,18 +68,20 @@
        if (!tasks.isEmpty()) {
            throw new CoolException("当前托盘已有任务档在执行,不能再次组托!!");
        }
        List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, pakin.getId()));
        waitPakinItems.forEach(item -> {
            for (PakinItem pakinItem : waitPakin.getItems()) {
                WarehouseAreasItem warehouseAreasItems = warehouseAreasItemService.getById(pakinItem.getId());
                if (Objects.isNull(warehouseAreasItems)) {
                    throw new CoolException("物料未送至收货区或已组托完成移出收货区!!");
        if (!Objects.isNull(pakin)) {
            List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(!Objects.isNull(pakin.getId()) ,WaitPakinItem::getPakinId, pakin.getId()));
            waitPakinItems.forEach(item -> {
                for (PakinItem pakinItem : waitPakin.getItems()) {
                    WarehouseAreasItem warehouseAreasItems = warehouseAreasItemService.getById(pakinItem.getId());
                    if (Objects.isNull(warehouseAreasItems)) {
                        throw new CoolException("物料未送至收货区或已组托完成移出收货区!!");
                    }
                    if (item.getFieldsIndex().equals(warehouseAreasItems.getFieldsIndex())) {
                        throw new CoolException("票号:" + item.getExtendFields().get("crushNo") + "已组托,不可重复组托!!");
                    }
                }
                if (item.getFieldsIndex().equals(warehouseAreasItems.getFieldsIndex())) {
                    throw new CoolException("票号:" + item.getExtendFields().get("crushNo") + "已组托,不可重复组托!!");
                }
            }
        });
            });
        }
        List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, waitPakin.getBarcode()));
        if (!locs.isEmpty()) {
@@ -88,11 +90,6 @@
            throw new CoolException("托盘码:" + waitPakin.getBarcode() + "已被库位:" + join + "使用!!");
        }
        double sum = waitPakin.getItems().stream().mapToDouble(PakinItem::getReceiptQty).sum();
        Double waitSum = 0.0;
        if (!waitPakinItems.isEmpty()) {
             waitSum = waitPakinItems.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
        }
        Double total = Math.round((sum + waitSum) * 100) / 100.0;
        WaitPakin waitPakin1 = new WaitPakin();
        if (Objects.isNull(pakin)) {
@@ -162,7 +159,13 @@
        if (!waitPakinItemService.saveBatch(items)) {
            throw new CoolException("组托明细保存失败!!");
        }
//        Double sum1 = items.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
        List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, waitPakin1.getId()));
        Double waitSum = 0.0;
        if (!pakinItems.isEmpty()) {
            waitSum = pakinItems.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
        }
//        Double total = Math.round((sum + waitSum) * 100) / 100.0;
        for (WaitPakinItem pakinItem : items) {
            WarehouseAreasItem one = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>()
@@ -181,7 +184,7 @@
            }
        }
        waitPakin1.setAnfme(total);
        waitPakin1.setAnfme(waitSum);
        if (!this.updateById(waitPakin1)) {
            throw new CoolException("组托数量修改失败!!");
        }