#

zjj

9 天以前 bfb371013dcc740384b02a0ba678d6322a8bf97b

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

@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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;
@@ -38,6 +40,10 @@
    private WarehouseAreasItemService warehouseAreasItemService;
    @Autowired
    private LocService locService;
    @Autowired
    private TaskService taskService;
    @Autowired
    private TaskItemService taskItemService;


    /**
@@ -58,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()) {
@@ -73,43 +79,31 @@
        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()) {
            //不良标签组托
@@ -156,6 +150,7 @@
                WaitPakinItem pakinItem = new WaitPakinItem();
                pakinItem.setAnfme(warehouseAreasItems.getAnfme())
                        .setPakinId(waitPakin1.getId())
                        .setSource(warehouseAreasItems.getId())
                        .setAsnId(warehouseAreasItems.getAsnId())
                        .setAsnCode(warehouseAreasItems.getAsnCode())
                        .setAsnItemId(warehouseAreasItems.getId())
@@ -194,11 +189,12 @@
        for (WaitPakinItem pakinItem : items) {
            WarehouseAreasItem one = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>()
                    .eq(WarehouseAreasItem::getTrackCode, pakinItem.getTrackCode())
                    .eq(WarehouseAreasItem::getSplrBatch, pakinItem.getBatch()));
                    .eq(!Cools.isEmpty(pakinItem.getBatch()),WarehouseAreasItem::getSplrBatch, pakinItem.getBatch()));
            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("组托数量不能大于收货数量！！");
            }
@@ -206,8 +202,6 @@
                throw new CoolException("收货区执行数量修改失败！！");
            }
        }



        waitPakin1.setAnfme(sum1);
        if (!this.updateById(waitPakin1)) {
@@ -254,4 +248,57 @@
        }
        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.listByIds(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("收货区数据回滚失败！！");
            }
        }

        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("明细删除失败！！");
        }
        return R.ok("Delete Success").add(pakinIds);


    }
}