DO单修改及优化

skyouc

7 天以前 06d7fb698ce6d0efc7ff4224c6b68d2f50feb716

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

@@ -7,6 +7,7 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.entity.enums.TaskType;
import com.vincent.rsf.server.manager.controller.params.GenerateTaskParams;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.PakinIOStatus;
import com.vincent.rsf.server.manager.mapper.TaskMapper;
@@ -49,7 +50,17 @@
    private StockService stockService;
    @Autowired
    private StockItemService stockItemService;
    @Autowired
    private DeviceSiteService deviceSiteService;

    @Autowired
    private OrderService orderService;

    @Autowired
    private OrderItemService orderItemService;

    @Autowired
    private LocItemService locItemService;


    /**
@@ -62,17 +73,22 @@
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public synchronized R generateTasks(List<WaitPakin> waitPakin, Long loginUserId) {
        if (Objects.isNull(waitPakin) || waitPakin.isEmpty()) {
    public synchronized R generateTasks(GenerateTaskParams waitPakin, Long loginUserId) {
        if (Objects.isNull(waitPakin) || waitPakin.getWaitPakins().isEmpty()) {
            throw new CoolException("参数不能为空！！");
        }

        DeviceSite deviceSite = deviceSiteService.getById(waitPakin.getSiteId());
        if (Objects.isNull(deviceSite)) {
            throw new CoolException("站点不存在！！");
        }
        /**获取组拖*/
        List<Long> ids = waitPakin.stream().map(WaitPakin::getId).collect(Collectors.toList());
        List<Long> ids = waitPakin.getWaitPakins().stream().map(WaitPakin::getId).collect(Collectors.toList());
        List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>()
                .in(WaitPakin::getId, ids)
                .eq(WaitPakin::getIoStatus, Short.parseShort(PakinIOStatus.QLY_ISPT_STAS_DONE.val)));
                .eq(WaitPakin::getIoStatus, Short.parseShort(PakinIOStatus.PAKIN_IO_STATUS_DONE.val)));
        if (waitPakins.isEmpty()) {
            throw new CoolException("组拖信息不存在！！");
            throw new CoolException("请检查组拖状态是否完成！！");
        }
        waitPakins.forEach(pakin -> {
            List<TaskItem> taskItems = new ArrayList<>();
@@ -86,18 +102,34 @@
                    .setTaskType(TaskType.TASK_TYPE_IN.type.shortValue())
                    .setTargLoc(LocManageUtil.getTargetLoc())
                    .setBarcode(pakin.getBarcode())
                    .setTargSite(deviceSite.getDeviceCode())
                    .setCreateBy(loginUserId)
                    .setUpdateBy(loginUserId)
                    .setTargSite(LocManageUtil.getTargetSite());
                    .setUpdateBy(loginUserId);

            if (!Objects.isNull(waitPakin.getSiteId()) && waitPakin.getSiteId() > 0) {
                DeviceSite site = deviceSiteService.getById(waitPakin.getSiteId());
                task.setTargSite(site.getSite() + "");
            } else {
                task.setTargSite(LocManageUtil.getTargetSite());
            }
            if (!Objects.isNull(waitPakin.getLocCode()) && StringUtils.isNotBlank(waitPakin.getLocCode())) {
                List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, waitPakin.getLocCode()));
//                if (!locs.isEmpty()) {
//                    throw new CoolException("库位错误：相同库位应只一条")
//                }
                Loc loc = locs.stream().findFirst().get();
                task.setTargSite(loc.getCode());
            } else {
                task.setTargSite(LocManageUtil.getTargetSite());
            }

            if (!this.save(task)) {
                throw new CoolException("任务保存失败！！");
            }
            if (!locService.update(new LambdaUpdateWrapper<Loc>().eq(Loc::getCode, pakin.getCode())
            if (!locService.update(new LambdaUpdateWrapper<Loc>().eq(Loc::getCode, task.getTargLoc())
                    .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_S.type).set(Loc::getBarcode, pakin.getBarcode()))) {
                throw new CoolException("库位预约失败！！");
            }

            /**获取组拖明细**/
            List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, pakin.getId()));
            if (waitPakinItems.isEmpty()) {
@@ -106,6 +138,10 @@
            waitPakinItems.forEach(item -> {
                TaskItem taskItem = new TaskItem();
                BeanUtils.copyProperties(item, taskItem);
//                AsnOrder order = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getId, item.getAsnId()));
//                if (Objects.isNull(order)) {
//                    throw new CoolException("数据错误: 单据不存在！！");
//                }
                taskItem.setTaskId(task.getId())
                        .setOrderType(OrderType.ORDER_RECEIPT.type)
                        .setSource(item.getId())
@@ -121,15 +157,18 @@
            }
        });

        waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>()
                        .in(WaitPakin::getId, ids)
                .set(WaitPakin::getIoStatus, PakinIOStatus.QLY_ISPT_STAS_TASK_EXCE.val));
        if (!waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>()
                .in(WaitPakin::getId, ids)
                .set(WaitPakin::getUpdateBy, loginUserId)
                .set(WaitPakin::getCreateBy, loginUserId)
                .set(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_TASK_EXCE.val))) {
            throw new CoolException("组拖状态修改失败！！");
        }
        return R.ok("任务生成完毕！");
    }


    /**
     * 完成任务
     * 完成任务 更新库位明细信息，将单据库存更新到单据库存表
     * @param tasks
     * @throws Exception
     */
@@ -140,61 +179,42 @@
            return;
        }
        List<Long> list = tasks.stream().map(Task::getId).collect(Collectors.toList());
        List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, list));
        List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getTaskId, list));
        if (taskItems.isEmpty()) {
            throw new CoolException("任务明细不能为空！！");
            throw new CoolException("任务明细不存在！！");
        }
        List<String> locCodes = tasks.stream().map(Task::getTargLoc).collect(Collectors.toList());
        Map<Long, List<TaskItem>> listMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getTaskId));
        /**对任务明细按任务主单进行分组*/
        listMap.keySet().forEach(key -> {
            List<TaskItem> items = listMap.get(key);
            //更新库位明细
            try {
                saveLocItem(items, key);
            } catch (Exception e) {
                throw new CoolException("库位明细更新失败！！");
            }
        });

        /**对任务明细按订单进行分组*/
        Map<Long, List<TaskItem>> orderMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getOrderId));
        List<StockItem> stockItems = new ArrayList<>();
        Map<Long, List<TaskItem>> orderMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getSource));
        orderMap.keySet().forEach(key -> {
            AsnOrder order = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>()
                    .eq(AsnOrder::getId, key)
                    .select(AsnOrder::getId, AsnOrder::getPoCode, AsnOrder::getCode));
            Stock stock = new Stock();
            if (!Objects.isNull(order.getPoCode()) && StringUtils.isNotBlank(order.getPoCode())) {
                Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>().eq(Purchase::getCode, order.getPoCode()));
                if (!Objects.isNull(purchase)) {
                    stock.setPlatOrderNo(purchase.getPlatCode()).setPlatToken(purchase.getPlatId());
                }
            }
            String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_STOCK_CODE, null);
            if (StringUtils.isBlank(ruleCode)) {
                throw new CoolException("当前业务：" + SerialRuleCode.SYS_STOCK_CODE + "，编码规则不存在！！");
            }
            stock.setAsnId(order.getId()).setAsnCode(order.getCode());
            if (!stockService.save(stock)) {
                throw new CoolException("库存保存失败！！");
            WaitPakinItem pakinItem = waitPakinItemService.getById(key);
//            AsnOrder order = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>()
//                    .eq(AsnOrder::getId, key)
//                    .select(AsnOrder::getId, AsnOrder::getPoCode, AsnOrder::getCode));
            if (null == pakinItem) {
                throw new CoolException("数据错误：组拖数据不存在，请联系管理员！！");
            }
            List<TaskItem> items = orderMap.get(key);
            for (TaskItem item : items) {
                /**通过任务明细中的taskId查询,获取TASK的目标库位信息*/
                Task taskServiceOne = this.getOne(new LambdaQueryWrapper<Task>()
                        .select(Task::getId, Task::getTargLoc, Task::getOrgLoc, Task::getBarcode)
                        .eq(Task::getId, item.getTaskId()));
                Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, taskServiceOne.getTargLoc()));
                if (Objects.isNull(loc)) {
                    throw new CoolException("库位不存在！！");
                }
                AsnOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, item.getOrderItemId()));
                if (Objects.isNull(orderItem)) {
                    throw new CoolException("单据明细不存在！！");
                }
                StockItem stockItem = new StockItem();
                BeanUtils.copyProperties(orderItem, stockItem);
                stockItem.setAsnItemId(item.getOrderItemId())
                        .setBarcode(taskServiceOne.getBarcode())
                        .setLocId(loc.getId())
                        .setId(null)
                        .setStockId(stock.getId());
                stockItems.add(stockItem);
            }
            if (!stockItemService.saveBatch(stockItems)) {
                throw new CoolException("库存修改架失败！！");
            //保存库存明细
            try {
                saveStockItems(items, pakinItem);
            } catch (Exception e) {
                throw new CoolException("库存管理保存更新失败！！");
            }
        });
        /**修改库位状态为F.在库*/
        List<String> locCodes = tasks.stream().map(Task::getTargLoc).collect(Collectors.toList());
        if (!locService.update(new LambdaUpdateWrapper<Loc>().set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type).in(Loc::getCode, locCodes))) {
            throw new CoolException("库位状态修改失败！！");
        }
@@ -202,4 +222,80 @@
            throw new CoolException("任务状态修改失败！！");
        }
    }

    /**
     * @author Ryan
     * @description 更新库位明细
     * @param
     * @return
     * @time 2025/4/15 15:28
     */
    @Transactional(rollbackFor = Exception.class)
    void saveLocItem(List<TaskItem> items, Long taskId) throws Exception {
        Task task = this.getById(taskId);
        if (Objects.isNull(task)) {
            throw new CoolException("任务不存在!!");
        }
        List<LocItem> locItems = new ArrayList<>();
        items.forEach(taskItem -> {
            Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()), false);
            LocItem item = new LocItem();
            BeanUtils.copyProperties(taskItem, item);
            item.setLocId(loc.getId()).setType(taskItem.getOrderType());
            locItems.add(item);
        });
        if (!locItemService.saveBatch(locItems)) {
            throw new CoolException("库位明细更新失败！！");
        }
    }

    /**
     * 生成库存明细
     * @param items
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    void saveStockItems(List<TaskItem> items, WaitPakinItem order) throws Exception {
        Stock stock = new Stock();
//        if (!Objects.isNull(order.getPoCode()) && StringUtils.isNotBlank(order.getPoCode())) {
//            Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>().eq(Purchase::getCode, order.getPoCode()));
//            if (!Objects.isNull(purchase)) {
//                stock.setPlatOrderNo(purchase.getPlatCode()).setPlatToken(purchase.getPlatId());
//            }
//        }
        String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_STOCK_CODE, null);
        if (StringUtils.isBlank(ruleCode)) {
            throw new CoolException("当前业务：" + SerialRuleCode.SYS_STOCK_CODE + "，编码规则不存在！！");
        }
        double sum = items.stream().mapToDouble(TaskItem::getAnfme).sum();
        stock.setSourceId(order.getId())
                .setCode(ruleCode)
                .setSourceCode(order.getAsnCode())
                .setAnfme(sum)
                .setWkType(order.getWkType())
                .setType(order.getType());
        if (!stockService.save(stock)) {
            throw new CoolException("库存保存失败！！");
        }

        List<StockItem> stockItems = new ArrayList<>();
        for (TaskItem item : items) {
            /**通过任务明细中的taskId查询,获取TASK的目标库位信息*/
//            AsnOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, item.getOrderItemId()));
//            if (Objects.isNull(orderItem)) {
//                throw new CoolException("单据明细不存在！！");
//            }
            StockItem stockItem = new StockItem();
            BeanUtils.copyProperties(item, stockItem);
            stockItem.setSourceItemId(item.getOrderItemId())
                    .setStockCode(stock.getCode())
                    .setSourceItemId(item.getOrderItemId())
                    .setId(null)
                    .setStockId(stock.getId());
            stockItems.add(stockItem);
        }
        if (!stockItemService.saveBatch(stockItems)) {
            throw new CoolException("库存修改架失败！！");
        }
    }
}