no message

skyouc

2025-05-08 190d2d153d6737830f6173c7de1b0bc03e6d7dac

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

@@ -195,6 +195,7 @@
                throw new CoolException("组托不存在！！");
            }
            List<PakinItem> paramItems = param.getItems();

            if (Objects.isNull(paramItems) || paramItems.isEmpty()) {
                throw new CoolException("解绑物料不能为空！！");
            }
@@ -205,16 +206,39 @@
            if (pakinItems.isEmpty()) {
                throw new CoolException("数据错误：组托明细不存在！！");
            }
            List<Long> ids = pakinItems.stream().map(WaitPakinItem::getId).collect(Collectors.toList());
            if (!waitPakinItemService.removeByIds(ids)) {
                throw new CoolException("组托明细解绑失败！！");
            }
//            List<Long> ids = pakinItems.stream().map(WaitPakinItem::getId).collect(Collectors.toList());
//            if (!waitPakinItemService.removeByIds(ids)) {
//                throw new CoolException("组托明细解绑失败！！");
//            }

            List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService.listByIds(list);
            for (int i1 = 0; i1 < pakinItems.size(); i1++) {
                for (PakinItem item : paramItems) {
                    if (item.getId().equals(pakinItems.get(i1).getSource())) {
                        if (pakinItems.get(i1).getAnfme().compareTo(item.getReceiptQty()) > 0) {
                            if (item.getReceiptQty().compareTo(0.00) == 0) {
                                throw new CoolException("解绑数量不能为零！！");
                            }
                            if (item.getReceiptQty().compareTo(pakinItems.get(i1).getAnfme() - pakinItems.get(i1).getWorkQty() - pakinItems.get(i1).getQty()) > 0) {
                                throw new CoolException("解绑数量不能大于剩余可执行数！！");
                            }
                           pakinItems.get(i1).setAnfme(pakinItems.get(i1).getAnfme() - item.getReceiptQty());
                           if (!waitPakinItemService.updateById(pakinItems.get(i1))) {
                               throw new CoolException("组托明细数量修改失败！！");
                           }
                        } else {
                            if (!waitPakinItemService.removeById(pakinItems.get(i1).getId())) {
                                throw new CoolException("组托明细删除失败！！");
                            }
                        }
                    }
                }
            }

            for (int a = 0; a < paramItems.size(); a++) {
                for (int i = 0; i < warehouseAreasItems.size(); i++) {
                    if (warehouseAreasItems.get(i).getId().equals(pakinItems.get(i1).getId())) {
                        double v = warehouseAreasItems.get(i).getWorkQty() - pakinItems.get(i1).getAnfme();
                    if (warehouseAreasItems.get(i).getId().equals(paramItems.get(a).getId())) {
                        double v = warehouseAreasItems.get(i).getWorkQty() - paramItems.get(a).getReceiptQty();
                        warehouseAreasItems.get(i).setWorkQty(v);
                        if (!warehouseAreasItemService.updateById(warehouseAreasItems.get(i))) {
                            throw new CoolException("收货区数量修改失败！！");
@@ -222,8 +246,9 @@
                    }
                }
            }
            double anfmes = warehouseAreasItems.stream().mapToDouble(WarehouseAreasItem::getAnfme).sum();

            double anfmes = paramItems.stream().mapToDouble(PakinItem::getReceiptQty).sum();
//            double anfmes = warehouseAreasItems.stream().mapToDouble(WarehouseAreasItem::getAnfme).sum();
            if (waitPakins.getAnfme().compareTo(anfmes) <= 0) {
                if (!waitPakinService.removeById(waitPakins.getId())) {
                    throw new CoolException("组托删除失败！！");
@@ -256,11 +281,11 @@
            if (!taskItems.isEmpty()) {
                return R.error("组拖档有明细任务");
            }
        }

        Set<Long> sourceIds = pakinItems.stream().map(WaitPakinItem::getSource).collect(Collectors.toSet());

        List<WarehouseAreasItem> areasItems = warehouseAreasItemService.listByIds(sourceIds);
            List<WarehouseAreasItem> areasItems = warehouseAreasItemService.list(new LambdaQueryWrapper<WarehouseAreasItem>()
                    .in(WarehouseAreasItem::getId, sourceIds));

        if (areasItems.isEmpty()) {
            return R.error("收货区数据不存在！！");
@@ -280,17 +305,17 @@
            }
        }

        if (!waitPakinService.removeByIds(pakinIds)) {
            return R.error("Delete Fail");
        }

        Set<Long> pakinItemIds = pakinItems.stream().map(WaitPakinItem::getId).collect(Collectors.toSet());

        if (!waitPakinItemService.removeByIds(pakinItemIds)) {
            throw new CoolException("明细删除失败！！");
        }
        }

        if (!waitPakinService.removeByIds(pakinIds)) {
            return R.error("Delete Fail");
        }

        return R.ok("Delete Success").add(pakinIds);


    }
}