Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

5 天以前 c8fde8647b48e7c7d9b3beb6e8c39459f07c9eb2

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.controller.params.PakinItem;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
@@ -39,6 +40,10 @@
    private WarehouseAreasItemService warehouseAreasItemService;
    @Autowired
    private LocService locService;
    @Autowired
    private TaskService taskService;
    @Autowired
    private TaskItemService taskItemService;


    /**
@@ -59,11 +64,11 @@
            throw new CoolException("参数错误：托盘码为空！！");
        }
        List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
        WaitPakin list = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
        WaitPakin pakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
                .notIn(WaitPakin::getIoStatus, asList)
                .eq(WaitPakin::getBarcode, waitPakin.getBarcode()));
        if (!Objects.isNull(list)) {
            throw new CoolException("托盘码：" + waitPakin.getBarcode() + "已被组托单：" + list.getCode() + "使用！！");
        if (!Objects.isNull(pakin)) {
            throw new CoolException("托盘码：" + waitPakin.getBarcode() + "已被组托单：" + pakin.getCode() + "使用！！");
        }
        List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, waitPakin.getBarcode()));
        if (!locs.isEmpty()) {
@@ -74,118 +79,73 @@
        double sum = waitPakin.getItems().stream().mapToDouble(PakinItem::getReceiptQty).sum();

        WaitPakin waitPakin1 = new WaitPakin();
        WaitPakin pakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
                .in(WaitPakin::getIoStatus, asList)
                .eq(WaitPakin::getBarcode, waitPakin.getBarcode()));
        if (Objects.isNull(pakin)) {
            String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_WAIT_PAKIN_CODE, null);
            if (StringUtils.isBlank(ruleCode)) {
                throw new CoolException("编码规则错误： 编码规则「SYS_WAIT_PAKIN_CODE」规则是不存在");
            }
            waitPakin1.setCode(ruleCode)
                    //状态修改为入库中
                    .setIoStatus(Short.parseShort(PakinIOStatus.PAKIN_IO_STATUS_DONE.val))
                    .setAnfme(sum)
                    .setUpdateBy(userId)
                    .setCreateBy(userId)
                    .setBarcode(waitPakin.getBarcode());
            if (!this.save(waitPakin1)) {
                throw new CoolException("主单保存失败！！");
            }
        } else {
            BeanUtils.copyProperties(pakin, waitPakin1);
            waitPakin1.setAnfme(sum);
            if (!this.saveOrUpdate(waitPakin1)) {
                throw new CoolException("主单修改失败！！");
            }
        String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_WAIT_PAKIN_CODE, null);
        if (StringUtils.isBlank(ruleCode)) {
            throw new CoolException("编码规则错误： 编码规则「SYS_WAIT_PAKIN_CODE」规则是不存在");
        }
        /**物料跟踪码*/

        List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>()
                .eq(WaitPakinItem::getPakinId, waitPakin1.getId()))
                ;
        if (!pakinItems.isEmpty()) {
            if (!waitPakinItemService.remove(new LambdaQueryWrapper<WaitPakinItem>()
                    .eq(WaitPakinItem::getPakinId, waitPakin1.getId())
                    )) {
                throw new CoolException("原单据清除失败！！");
            }
        waitPakin1.setCode(ruleCode)
                //状态修改为入库中
                .setIoStatus(Short.parseShort(PakinIOStatus.PAKIN_IO_STATUS_DONE.val))
                .setAnfme(sum)
                .setUpdateBy(userId)
                .setCreateBy(userId)
                .setBarcode(waitPakin.getBarcode());
        if (!this.save(waitPakin1)) {
            throw new CoolException("主单保存失败！！");
        }
//        /**物料跟踪码*/
//        List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>()
//                .eq(WaitPakinItem::getPakinId, waitPakin1.getId()))
//                ;
//        if (!pakinItems.isEmpty()) {
//            if (!waitPakinItemService.remove(new LambdaQueryWrapper<WaitPakinItem>()
//                    .eq(WaitPakinItem::getPakinId, waitPakin1.getId())
//                    )) {
//                throw new CoolException("原单据清除失败！！");
//            }
//        }
        List<WaitPakinItem> items = new ArrayList<>();
        for (PakinItem pakinItem1 : waitPakin.getItems()) {
            //不良标签组托
            if (!Objects.isNull(waitPakin.getType()) && waitPakin.getType().equals("defective")) {
                List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getAsnCode, pakinItem1.getAsnCode()));
                if (Objects.isNull(orderItems) || orderItems.isEmpty()) {
                    throw new CoolException("单据不存在！！");
                }
                for (AsnOrderItem item : orderItems) {
                    WaitPakinItem pakinItem = new WaitPakinItem();
                    pakinItem.setAnfme(item.getAnfme())
                            .setPakinId(waitPakin1.getId())
                            .setAsnId(item.getAsnId())
                            .setAsnCode(item.getAsnCode())
                            .setAsnItemId(item.getId())
                            .setBatch(item.getSplrBatch())
                            .setUnit(item.getStockUnit())
                            .setFieldsIndex(item.getFieldsIndex())
                            .setMatnrId(item.getMatnrId())
                            .setMaktx(item.getMaktx())
                            .setUpdateBy(userId)
                            .setCreateBy(userId)
                            .setMatnrCode(item.getMatnrCode());
                    AsnOrder order = asnOrderService.getById(item.getAsnId());
                    if (!Objects.isNull(order)) {
                        pakinItem.setType(null == order.getType() ?  null :order.getType())
                                .setWkType(null == order.getWkType() ? null : Short.parseShort(order.getWkType()) );
                    }
                    for (PakinItem waitPakinItem : waitPakin.getItems()) {
                        if (waitPakinItem.getTrackCode().equals(item.getTrackCode())) {
                            if (waitPakinItem.getReceiptQty() > item.getAnfme() || waitPakinItem.getReceiptQty().compareTo(0.0) >= 0) {
                                throw new CoolException("组托数量不能大于收货数量！！");
                            }
                            pakinItem.setAnfme(waitPakinItem.getReceiptQty()).setTrackCode(waitPakinItem.getTrackCode());
                        }
                    }
                    items.add(pakinItem);
                }
            } else {
                WarehouseAreasItem warehouseAreasItems = warehouseAreasItemService.getById(pakinItem1.getId());
                if (null == warehouseAreasItems) {
                    throw new CoolException("物料未送至收货区！！");
                }
                WaitPakinItem pakinItem = new WaitPakinItem();
                pakinItem.setAnfme(warehouseAreasItems.getAnfme())
                        .setPakinId(waitPakin1.getId())
                        .setAsnId(warehouseAreasItems.getAsnId())
                        .setAsnCode(warehouseAreasItems.getAsnCode())
                        .setAsnItemId(warehouseAreasItems.getId())
                        .setBatch(warehouseAreasItems.getSplrBatch())
                        .setUnit(warehouseAreasItems.getStockUnit())
                        .setFieldsIndex(warehouseAreasItems.getFieldsIndex())
                        .setMatnrId(warehouseAreasItems.getMatnrId())
                        .setMaktx(warehouseAreasItems.getMaktx())
                        .setUpdateBy(userId)
                        .setCreateBy(userId)
                        .setMatnrCode(warehouseAreasItems.getMatnrCode());
                AsnOrder order = asnOrderService.getById(warehouseAreasItems.getAsnId());
                if (!Objects.isNull(order)) {
                    pakinItem.setType(null == order.getType() ?  null :order.getType())
                            .setWkType(null == order.getWkType() ? null : Short.parseShort(order.getWkType()) );
                }

                for (PakinItem waitPakinItem : waitPakin.getItems()) {
                    if (waitPakinItem.getTrackCode().equals(warehouseAreasItems.getTrackCode())) {
                        if (waitPakinItem.getReceiptQty() > warehouseAreasItems.getAnfme() || waitPakinItem.getReceiptQty().compareTo(0.0) <= 0) {
                            throw new CoolException("组托数量不能大于收货数量且不能小于零！！");
                        }
                        pakinItem.setAnfme(waitPakinItem.getReceiptQty()).setTrackCode(waitPakinItem.getTrackCode());
                    }
                }
                items.add(pakinItem);

            WarehouseAreasItem warehouseAreasItems = warehouseAreasItemService.getById(pakinItem1.getId());
            if (null == warehouseAreasItems) {
                throw new CoolException("物料未送至收货区！！");
            }
            WaitPakinItem pakinItem = new WaitPakinItem();
            pakinItem.setAnfme(warehouseAreasItems.getAnfme())
                    .setPakinId(waitPakin1.getId())
                    .setSource(warehouseAreasItems.getId())
                    .setAsnId(warehouseAreasItems.getAsnId())
                    .setAsnCode(warehouseAreasItems.getAsnCode())
                    .setAsnItemId(warehouseAreasItems.getAsnItemId())
                    .setIsptResult(warehouseAreasItems.getIsptResult())
                    .setBatch(warehouseAreasItems.getSplrBatch())
                    .setUnit(warehouseAreasItems.getStockUnit())
                    .setFieldsIndex(warehouseAreasItems.getFieldsIndex())
                    .setMatnrId(warehouseAreasItems.getMatnrId())
                    .setMaktx(warehouseAreasItems.getMaktx())
                    .setUpdateBy(userId)
                    .setCreateBy(userId)
                    .setMatnrCode(warehouseAreasItems.getMatnrCode());
            AsnOrder order = asnOrderService.getById(warehouseAreasItems.getAsnId());
            if (!Objects.isNull(order)) {
                pakinItem.setType(null == order.getType() ? null : order.getType())
                        .setWkType(null == order.getWkType() ? null : Short.parseShort(order.getWkType()));
            }

            for (PakinItem waitPakinItem : waitPakin.getItems()) {
                if (waitPakinItem.getId().equals(warehouseAreasItems.getId())) {
                    if (waitPakinItem.getReceiptQty() > warehouseAreasItems.getAnfme() || waitPakinItem.getReceiptQty().compareTo(0.0) <= 0) {
                        throw new CoolException("组托数量不能大于收货数量且不能小于零！！");
                    }
                    pakinItem.setAnfme(waitPakinItem.getReceiptQty())
                            .setTrackCode(waitPakinItem.getTrackCode());
                }
            }
            items.add(pakinItem);

        }

        double sum1 = items.stream().mapToDouble(WaitPakinItem::getAnfme).sum();

        if (!waitPakinItemService.saveBatch(items)) {
@@ -194,12 +154,12 @@

        for (WaitPakinItem pakinItem : items) {
            WarehouseAreasItem one = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>()
                    .eq(WarehouseAreasItem::getTrackCode, pakinItem.getTrackCode())
                    .eq(!Cools.isEmpty(pakinItem.getBatch()),WarehouseAreasItem::getSplrBatch, pakinItem.getBatch()));
                    .eq(WarehouseAreasItem::getId, pakinItem.getSource()));
            if (Objects.isNull(one)) {
                throw new CoolException("收货区数据错误！！");
            }
            one.setWorkQty(one.getWorkQty() + pakinItem.getAnfme() + one.getQty()) ;
//            one.setAnfme(one.getAnfme() - pakinItem.getAnfme())
            one.setWorkQty(one.getWorkQty() + pakinItem.getAnfme() + one.getQty());
            if (one.getWorkQty() > one.getAnfme()) {
                throw new CoolException("组托数量不能大于收货数量！！");
            }
@@ -207,8 +167,6 @@
                throw new CoolException("收货区执行数量修改失败！！");
            }
        }



        waitPakin1.setAnfme(sum1);
        if (!this.updateById(waitPakin1)) {
@@ -221,10 +179,10 @@
    }

    /**
     * @author Ryan
     * @description 组托解绑
     * @param
     * @return
     * @author Ryan
     * @description 组托解绑
     * @time 2025/3/29 14:42
     */
    @Override
@@ -232,27 +190,129 @@
    public synchronized WaitPakin unBind(WaitPakinParam param) {
        String barcode = param.getBarcode();
        if (StringUtils.isNotBlank(barcode)) {
            WaitPakin waitPakins = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, barcode), false);
            WaitPakin waitPakins = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, barcode));
            if (Objects.isNull(waitPakins)) {
                throw new CoolException("组托不存在！！");
            }
            List<PakinItem> paramItems = param.getItems();

            if (Objects.isNull(paramItems) || paramItems.isEmpty()) {
                throw new CoolException("解绑物料不能为空！！");
            }
            List<Long> list = paramItems.stream().map(PakinItem::getMatnrId).collect(Collectors.toList());
            List<Long> list = paramItems.stream().map(PakinItem::getId).collect(Collectors.toList());
            List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>()
                    .eq(WaitPakinItem::getPakinId, waitPakins.getId())
                    .in(WaitPakinItem::getMatnrId, list));
                    .in(WaitPakinItem::getId, list)
                    );
            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<Long> list2 = pakinItems.stream().map(WaitPakinItem::getSource).collect(Collectors.toList());
            List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService.listByIds(list2);
            for (int i1 = 0; i1 < pakinItems.size(); i1++) {
                for (PakinItem item : paramItems) {
                    if (item.getId().equals(pakinItems.get(i1).getId())) {
                        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 i = 0; i < warehouseAreasItems.size(); i++) {
                            if (warehouseAreasItems.get(i).getId().equals(pakinItems.get(i1).getSource())) {
                                double v = warehouseAreasItems.get(i).getWorkQty() - item.getReceiptQty();
                                warehouseAreasItems.get(i).setWorkQty(v);
                                if (!warehouseAreasItemService.updateById(warehouseAreasItems.get(i))) {
                                    throw new CoolException("收货区数量修改失败！！");
                                }
                            }
                        }
                    }
                }
            }

            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("组托删除失败！！");
                }
            } else {
                waitPakins.setAnfme(waitPakins.getAnfme() - anfmes);
                if (!waitPakinService.updateById(waitPakins)) {
                    throw new CoolException("组托数据修改失败！！");
                }
            }
            return waitPakins;
        }
        return new WaitPakin();
    }

    /**
     * @author Ryan
     * @date 2025/5/7
     * @description: 删除组拖信息
     * @version 1.0
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R removePakin(List<Long> pakinIds) {
        List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>()
                .in(WaitPakinItem::getPakinId, pakinIds));
        if (!pakinItems.isEmpty()) {
            List<Long> list = pakinItems.stream().map(WaitPakinItem::getId).collect(Collectors.toList());
            List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getSource, list));
            if (!taskItems.isEmpty()) {
                return R.error("组拖档有明细任务");
            }

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

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

            if (areasItems.isEmpty()) {
                return R.error("收货区数据不存在！！");
            }

            Map<Long, List<WaitPakinItem>> listMap = pakinItems.stream().collect(Collectors.groupingBy(WaitPakinItem::getSource));
            for (WarehouseAreasItem item : areasItems) {
                List<WaitPakinItem> pakin = listMap.get(item.getId());
                if (Objects.isNull(pakin)) {
                    continue;
                }
                double sum = pakin.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
                item.setWorkQty(item.getWorkQty() - sum)
                        .setAnfme(item.getAnfme() + sum);
                if (!warehouseAreasItemService.updateById(item)) {
                    throw new CoolException("收货区数据回滚失败！！");
                }
            }

            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);
    }
}