#合并订单出库，统一转波次出库前最新代码

Junjie

2024-09-13 a1a7c03eae40f4b0344fce652e1a240cf5283624

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java

@@ -21,18 +21,40 @@

    @Autowired
    private TaskService taskService;

    @Autowired
    private TaskDetlService taskDetlService;

    @Autowired
    private TaskDetlFieldService taskDetlFieldService;

    @Autowired
    private LocService locService;

    @Autowired
    private LocDetlService locDetlService;

    @Autowired
    private LocDetlFieldService locDetlFieldService;

    @Autowired
    private WaitPakinService waitPakinService;

    @Autowired
    private WaitPakinLogService waitPakinLogService;

    @Autowired
    private TaskDetlLogService taskDetlLogService;

    @Autowired
    private TaskDetlFieldLogService taskDetlFieldLogService;

    @Autowired
    private OrderService orderService;

    @Autowired
    private OrderDetlService orderDetlService;


    @Scheduled(cron = "0/3 * * * * ? ")
    @Transactional
@@ -47,64 +69,15 @@

            for (Task task : list) {
                //同步数据
                Long hostId = task.getHostId();
                switch (task.getTaskType().intValue()) {
                    case 1://入库
                        Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getTargetLoc()).eq(Loc::getHostId, hostId));
                        if(loc == null) {
                            throw new CoolException("库位不存在");
                        }

                        if(loc.getLocStsId() != LocStsType.S.val()){
                            throw new CoolException("库位状态不处于S.入库预约");
                        }

                        loc.setLocStsId(LocStsType.F.val());
                        loc.setUpdateTime(new Date());
                        loc.setBarcode(task.getBarcode());
                        if (!locService.updateById(loc)) {
                            throw new CoolException("库位状态更新失败");
                        }


                        List<TaskDetl> taskDetls = taskDetlService.getTaskDetlByTaskId(task.getId());
                        if(taskDetls.isEmpty()) {
                            throw new CoolException("任务明细不存在");
                        }

                        //添加库存明细
                        for (TaskDetl taskDetl : taskDetls) {
                            LocDetl locDetl = new LocDetl();
                            locDetl.setLocId(loc.getId());
                            locDetl.setLocNo(loc.getLocNo());
                            locDetl.setMatId(taskDetl.getMatId());
                            locDetl.setMatnr(taskDetl.getMat$().getMatnr());
                            locDetl.setOrderNo(taskDetl.getOrderNo());
                            locDetl.setBatch(taskDetl.getBatch());
                            locDetl.setAnfme(taskDetl.getAnfme());
                            locDetl.setHostId(hostId);
                            if (!locDetlService.save(locDetl)) {
                                throw new CoolException("插入库存明细失败");
                            }

                            //添加库存明细扩展字段
                            List<TaskDetlField> detlFields = taskDetlFieldService.list(new LambdaQueryWrapper<TaskDetlField>().eq(TaskDetlField::getDetlId, taskDetl.getId()).eq(TaskDetlField::getHostId, hostId));
                            for (TaskDetlField detlField : detlFields) {
                                LocDetlField locDetlField = new LocDetlField();
                                locDetlField.setDetlId(locDetl.getId());
                                locDetlField.setFieldId(detlField.getFieldId());
                                locDetlField.setName(detlField.getName());
                                locDetlField.setHostId(hostId);
                                if (!locDetlFieldService.save(locDetlField)) {
                                    throw new CoolException("插入明细扩展字段失败");
                                }
                            }
                        }

                        //删除组托通知档
                        waitPakinService.remove(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, task.getBarcode()).eq(WaitPakin::getHostId, hostId));

                        executeTask1(task);
                        break;
                    case 53://拣料再入库
                        executeTask53(task);
                        break;
                    default:
                        throw new CoolException("未知任务类型");
                }

                task.setTaskSts(100L);//100.库存更新完成
@@ -116,7 +89,7 @@
        } catch (Exception e) {
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
        }finally {
        } finally {
            InterceptorIgnoreHelper.clearIgnoreStrategy();
        }
    }
@@ -126,13 +99,239 @@
    public void outExecute() {
        InterceptorIgnoreHelper.handle(IgnoreStrategy.builder().tenantLine(true).build());
        try {
            //获取出库完成任务
            List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, 199));
            if (list.isEmpty()) {
                return;
            }
            for (Task task : list) {
                //同步数据
                switch (task.getTaskType().intValue()) {
                    case 101://出库
                        executeTask101(task);
                        break;
                    case 103://拣料
                        executeTask103(task);
                        break;
                    default:
                        throw new CoolException("未知任务类型");
                }

                task.setTaskSts(200L);//200.库存更新完成
                if (!taskService.updateById(task)) {
                    throw new CoolException("库存更新失败");
                }
            }

        } catch (Exception e) {
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
        }finally {
        } finally {
            InterceptorIgnoreHelper.clearIgnoreStrategy();
        }
    }

    //入库
    private void executeTask1(Task task) {
        Long hostId = task.getHostId();

        Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getTargetLoc()).eq(Loc::getHostId, hostId));
        if (loc == null) {
            throw new CoolException("库位不存在");
        }

        if (loc.getLocStsId() != LocStsType.S.val()) {
            throw new CoolException("库位状态不处于S.入库预约");
        }

        loc.setLocStsId(LocStsType.F.val());
        loc.setUpdateTime(new Date());
        loc.setBarcode(task.getBarcode());
        if (!locService.updateById(loc)) {
            throw new CoolException("库位状态更新失败");
        }

        List<TaskDetl> taskDetls = taskDetlService.getTaskDetlByTaskId(task.getId());
        if (taskDetls.isEmpty()) {
            throw new CoolException("任务明细不存在");
        }

        //添加库存明细
        for (TaskDetl taskDetl : taskDetls) {
            LocDetl locDetl = new LocDetl();
            locDetl.setLocId(loc.getId());
            locDetl.setLocNo(loc.getLocNo());
            locDetl.setMatId(taskDetl.getMatId());
            locDetl.setMatnr(taskDetl.getMat$().getMatnr());
            locDetl.setOrderNo(taskDetl.getOrderNo());
            locDetl.setBatch(taskDetl.getBatch());
            locDetl.setAnfme(taskDetl.getAnfme());
            locDetl.setHostId(hostId);
            if (!locDetlService.save(locDetl)) {
                throw new CoolException("插入库存明细失败");
            }

            //添加库存明细扩展字段
            List<TaskDetlField> detlFields = taskDetlFieldService.list(new LambdaQueryWrapper<TaskDetlField>().eq(TaskDetlField::getDetlId, taskDetl.getId()).eq(TaskDetlField::getHostId, hostId));
            for (TaskDetlField detlField : detlFields) {
                LocDetlField locDetlField = new LocDetlField();
                locDetlField.setDetlId(locDetl.getId());
                locDetlField.setFieldId(detlField.getFieldId());
                locDetlField.setName(detlField.getName());
                locDetlField.setValue(detlField.getValue());
                locDetlField.setHostId(hostId);
                if (!locDetlFieldService.save(locDetlField)) {
                    throw new CoolException("插入明细扩展字段失败");
                }
            }
        }

        //组托通知档转历史档
        List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, task.getBarcode()).eq(WaitPakin::getHostId, hostId));
        if (waitPakins.isEmpty()) {
            throw new CoolException("组托通知档不存在");
        }
        for (WaitPakin waitPakin : waitPakins) {
            WaitPakinLog waitPakinLog = new WaitPakinLog();
            waitPakinLog.sync(waitPakin);
            if (!waitPakinLogService.save(waitPakinLog)) {
                throw new CoolException("组托通知档转历史档失败");
            }

            //删除组托通知档
            waitPakinService.removeById(waitPakin.getId());
        }
    }

    //拣料再入库
    private void executeTask53(Task task) {
        Long hostId = task.getHostId();

        Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getTargetLoc()).eq(Loc::getHostId, hostId));
        if (loc == null) {
            throw new CoolException("库位不存在");
        }

        if (loc.getLocStsId() != LocStsType.S.val()) {
            throw new CoolException("库位状态不处于S.入库预约");
        }

        loc.setLocStsId(LocStsType.F.val());
        loc.setUpdateTime(new Date());
        loc.setBarcode(task.getBarcode());
        if (!locService.updateById(loc)) {
            throw new CoolException("库位状态更新失败");
        }

        List<TaskDetl> taskDetls = taskDetlService.getTaskDetlByTaskId(task.getId());
        if (taskDetls.isEmpty()) {
            throw new CoolException("任务明细不存在");
        }

        //添加库存明细
        for (TaskDetl taskDetl : taskDetls) {
            double anfme = taskDetl.getStock() - taskDetl.getAnfme();
            if (anfme <= 0) {
                continue;
            }

            LocDetl locDetl = new LocDetl();
            locDetl.setLocId(loc.getId());
            locDetl.setLocNo(loc.getLocNo());
            locDetl.setMatId(taskDetl.getMatId());
            locDetl.setMatnr(taskDetl.getMat$().getMatnr());
            locDetl.setOrderNo(taskDetl.getOrderNo());
            locDetl.setBatch(taskDetl.getBatch());
            locDetl.setAnfme(anfme);
            locDetl.setHostId(hostId);
            if (!locDetlService.save(locDetl)) {
                throw new CoolException("插入库存明细失败");
            }

            //添加库存明细扩展字段
            List<TaskDetlField> detlFields = taskDetlFieldService.list(new LambdaQueryWrapper<TaskDetlField>().eq(TaskDetlField::getDetlId, taskDetl.getId()).eq(TaskDetlField::getHostId, hostId));
            for (TaskDetlField detlField : detlFields) {
                LocDetlField locDetlField = new LocDetlField();
                locDetlField.setDetlId(locDetl.getId());
                locDetlField.setFieldId(detlField.getFieldId());
                locDetlField.setName(detlField.getName());
                locDetlField.setValue(detlField.getValue());
                locDetlField.setHostId(hostId);
                if (!locDetlFieldService.save(locDetlField)) {
                    throw new CoolException("插入明细扩展字段失败");
                }
            }
        }
    }

    //出库
    private void executeTask101(Task task) {
        Long hostId = task.getHostId();
        Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getOriginLoc()).eq(Loc::getHostId, hostId));
        if (loc == null) {
            throw new CoolException("库位不存在");
        }
        if (loc.getLocStsId() != LocStsType.R.val()) {
            throw new CoolException("库位状态不处于R.出库预约");
        }
        List<TaskDetl> taskDetls = taskDetlService.getTaskDetlByTaskId(task.getId());
        if (taskDetls.isEmpty()) {
            throw new CoolException("任务明细不存在");
        }

        loc.setLocStsId(LocStsType.O.val());
        loc.setBarcode("");
        if (!locService.updateById(loc)) {
            throw new CoolException("库位状态更新失败");
        }
        List<LocDetl> detlList = locDetlService.list(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocId, loc.getId()).eq(LocDetl::getHostId, hostId));
        //删除库存明细
        for (LocDetl locDetl : detlList) {
            if (!locDetlService.removeById(locDetl)) {
                throw new CoolException("删除库存明细失败");
            }
            List<LocDetlField> detlFields = locDetlFieldService.list(new LambdaQueryWrapper<LocDetlField>().eq(LocDetlField::getDetlId, locDetl.getId()).eq(LocDetlField::getHostId, hostId));
            for (LocDetlField detlField : detlFields) {
                if (!locDetlFieldService.removeById(detlField)) {
                    throw new CoolException("删除明细扩展字段失败");
                }
            }
        }
    }

    //拣料出库
    private void executeTask103(Task task) {
        Long hostId = task.getHostId();
        Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getOriginLoc()).eq(Loc::getHostId, hostId));
        if (loc == null) {
            throw new CoolException("库位不存在");
        }
        if (loc.getLocStsId() != LocStsType.R.val()) {
            throw new CoolException("库位状态不处于R.出库预约");
        }
        List<TaskDetl> taskDetls = taskDetlService.getTaskDetlByTaskId(task.getId());
        if (taskDetls.isEmpty()) {
            throw new CoolException("任务明细不存在");
        }

        loc.setLocStsId(LocStsType.O.val());
        loc.setBarcode("");
        if (!locService.updateById(loc)) {
            throw new CoolException("库位状态更新失败");
        }
        List<LocDetl> detlList = locDetlService.list(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocId, loc.getId()).eq(LocDetl::getHostId, hostId));
        //删除库存明细
        for (LocDetl locDetl : detlList) {
            if (!locDetlService.removeById(locDetl)) {
                throw new CoolException("删除库存明细失败");
            }
            List<LocDetlField> detlFields = locDetlFieldService.list(new LambdaQueryWrapper<LocDetlField>().eq(LocDetlField::getDetlId, locDetl.getId()).eq(LocDetlField::getHostId, hostId));
            for (LocDetlField detlField : detlFields) {
                if (!locDetlFieldService.removeById(detlField)) {
                    throw new CoolException("删除明细扩展字段失败");
                }
            }
        }
    }

}