任务生成问题修复 库位判断问题修复

skyouc

2025-04-01 5b6f41cd1459210faf744f7dec543c02a31a0df7

任务生成问题修复
库位判断问题修复

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java

@@ -430,7 +430,7 @@

            detlsDto.setAsnCode(asnOrderItem.getAsnCode())
                    .setMaktx(asnOrderItem.getMaktx())
                    .setBarcode(asnOrderItem.getBarcode())
                    .setBarcode(asnOrderItem.getTrackCode())
                    .setPoCode(asnOrderItem.getPoCode())
                    .setAnfme(asnOrderItem.getAnfme())
                    .setPurQty(asnOrderItem.getPurQty())

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java

@@ -147,7 +147,6 @@
     * 是否删除 1: 是  0: 否  
     */
    @ApiModelProperty(value= "是否删除 1: 是  0: 否  ")
    @TableLogic
    private Integer deleted;

    /**

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

@@ -55,18 +55,12 @@
        if (waitPakins.isEmpty()) {
            throw new CoolException("组拖信息不存在！！");
        }
        /**获取组拖明细**/
        List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().in(WaitPakinItem::getPakinId, ids));
        if (waitPakinItems.isEmpty()) {
            throw new CoolException("数据错误：组拖明细不存在");
        }
        String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
        if (StringUtils.isBlank(ruleCode)) {
            throw new CoolException("编码错误：请确认编码「SYS_TASK_CODE」是否已生成!!");
        }

        List<Task> tasks = new ArrayList<>();
        waitPakins.forEach(pakin -> {
            List<TaskItem> taskItems = new ArrayList<>();
            String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
            if (StringUtils.isBlank(ruleCode)) {
                throw new CoolException("编码错误：请确认编码「SYS_TASK_CODE」是否已生成!!");
            }
            Task task = new Task();
            task.setTaskCode(ruleCode)
                    .setTaskStatus(TaskStsType.GENERATE_IN.id.shortValue())
@@ -74,19 +68,15 @@
                    .setTargLoc(LocManageUtil.getTargetLoc())
                    .setBarcode(pakin.getBarcode())
                    .setTargSite(LocManageUtil.getTargetSite());
            tasks.add(task);
        });

        if (!this.saveBatch(tasks)) {
            throw new CoolException("任务保存失败！！");
        }
        List<Long> orderIds = tasks.stream().map(Task::getId).collect(Collectors.toList());
        List<Task> taskList = this.list(new LambdaQueryWrapper<Task>().in(Task::getId, orderIds));
        if (taskList.isEmpty()) {
            throw new CoolException("数据错误：订单ID不能为空！！");
        }
        for (Task task : taskList) {
            List<TaskItem> taskItems = new ArrayList<>();
            if (!this.save(task)) {
                throw new CoolException("任务保存失败！！");
            }
            /**获取组拖明细**/
            List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, pakin.getId()));
            if (waitPakinItems.isEmpty()) {
                throw new CoolException("数据错误：组拖明细不存在");
            }
            waitPakinItems.forEach(item -> {
                TaskItem taskItem = new TaskItem();
                BeanUtils.copyProperties(item, taskItem);
@@ -100,7 +90,9 @@
            if (!taskItemService.saveBatch(taskItems)) {
                throw new CoolException("任务明细保存失败！！");
            }
        }
        });
        //TODO 任务生成完成需修改任务ASN订单状态为执行中，组拖删除需判断是否有子任务在执行

        return R.ok("任务生成完毕！");
    }


 rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java

@@ -27,7 +27,7 @@

        Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type), false);

        return Objects.isNull(loc) ? loc.getCode() : null;
        return !Objects.isNull(loc) ? loc.getCode() : null;
    }


@@ -42,6 +42,6 @@
        //TODO 站点策略后续排期
        DeviceSiteService deviceSite = SpringUtils.getBean(DeviceSiteService.class);
        DeviceSite loc = deviceSite.getOne(new LambdaQueryWrapper<DeviceSite>().eq(DeviceSite::getStatus, 1), false);
        return Objects.isNull(loc) ? loc.getSite() : null;
        return !Objects.isNull(loc) ? loc.getSite() : null;
    }
}