出库类型修改

958836976@qq.com

2024-12-23 19d3488298119d50a94a54903623bf0088d3359c

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java

@@ -75,21 +75,17 @@
    @Override

    @Transactional(rollbackFor = Exception.class)

    public void receiveTaskStatus(TasksStatusCallbackParam callbackParam, String stockType) {

        Long type = 1L;

        if (stockType.equals("outStock")) { //出库任务

            type = 101L;

        }

        Long type = 100L;

        List<Task> list = taskService.list(new LambdaQueryWrapper<Task>()

                .eq(Task::getBarcode, callbackParam.getContainerCode())

                .eq(Task::getTaskType, type)

                .ge(Task::getTaskType, type)

                .eq(Task::getTaskNo, callbackParam.getTaskCode()));

        if (!Collections.isEmpty(list)) {

            Long finalType = type;

            list.forEach(task -> {

                    TaskStsType taskStsType = null;

                    if (stockType.equals("inStock")) { //入库任务

                        if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_TOTE_LOAD.event)) { //上报取箱状态

                            if (task.getTaskType() == TaskStsType.WCS_CONTAINER_RECEIVE.id) {

                            if (task.getTaskSts() == TaskStsType.WCS_CONTAINER_RECEIVE.id) {

                                taskStsType = TaskStsType.WCS_TOTE_LOAD;

                            } else {

                                String errMsg = "任务编号：" + task.getTaskNo() +  "状态为不匹配，"  + "不能执行：" + TaskStsType.WCS_TOTE_LOAD.desc + "任务";

@@ -97,7 +93,7 @@
                                throw new CoolException(errMsg);

                            }

                        } else if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_TOTE_UNLOAD.event)) { //上报放箱状态

                            if (task.getTaskType() == TaskStsType.WCS_TOTE_LOAD.id) {

                            if (task.getTaskSts() == TaskStsType.WCS_TOTE_LOAD.id) {

                                taskStsType = TaskStsType.WCS_TOTE_UNLOAD;

                            } else {

                                String errMsg = "任务编号：" + task.getTaskNo() +  "状态为不匹配，"  + "不能执行：" + TaskStsType.WCS_TOTE_UNLOAD.desc + "任务";

@@ -105,7 +101,7 @@
                                throw new CoolException(errMsg);

                            }

                        } else if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_STATUS.event)) { //TODO 需确认上报任务中，任务完成是哪个事件，目前暂定task事件

                            if (task.getTaskType() == TaskStsType.WCS_TOTE_UNLOAD.id) {

                            if (task.getTaskSts() == TaskStsType.WCS_TOTE_UNLOAD.id) {

                                taskStsType = TaskStsType.WCS_PUTAWAY_SUCESS;

                            } else {

                                String errMsg = "任务编号：" + task.getTaskNo() +  "状态为不匹配，"  + "不能执行：" + TaskStsType.WCS_PUTAWAY_SUCESS.desc + "任务";

@@ -120,7 +116,6 @@
                                .set(Task::getExcudeStatus, callbackParam.getStatus())

                                .set(Task::getTaskDesc, callbackParam.getMessage())

                                .eq(Task::getBarcode, callbackParam.getContainerCode())

                                .eq(Task::getTaskType, finalType)

                                .eq(Task::getTaskNo, callbackParam.getTaskCode()));



                        if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_STATUS.event) && result) {

@@ -128,7 +123,8 @@
                        }

                    } else { //出库任务

                        if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_TOTE_LOAD.event)) { //上报取箱状态

                            if (task.getTaskType() == TaskStsType.WCS_EXECUTE_OUT.id) {

                            //TODO 定时器开启后，要删除 || task.getTaskType() == TaskStsType.GENERATE_OUT.id

                            if (task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT.id || task.getTaskSts() == TaskStsType.GENERATE_OUT.id) {

                                taskStsType = TaskStsType.WCS_EXECUTE_OUT_TOTE_LOAD;

                            } else {

                                String errMsg = "任务编号：" + task.getTaskNo() +  "状态为不匹配，"  + "不能执行：" + TaskStsType.WCS_EXECUTE_OUT_TOTE_LOAD.desc + "任务";

@@ -136,7 +132,7 @@
                                throw new CoolException(errMsg);

                            }

                        } else if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_TOTE_UNLOAD.event)) { //上报放箱状态

                            if (task.getTaskType() == TaskStsType.WCS_EXECUTE_OUT_TOTE_LOAD.id) {

                            if (task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT_TOTE_LOAD.id) {

                                taskStsType = TaskStsType.WCS_EXECUTE_OUT_TOTE_UNLOAD;

                            } else {

                                String errMsg = "任务编号：" + task.getTaskNo() +  "状态为不匹配，"  + "不能执行：" + TaskStsType.WCS_EXECUTE_OUT_TOTE_UNLOAD.desc + "任务";

@@ -144,7 +140,7 @@
                                throw new CoolException(errMsg);

                            }

                        } else if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_STATUS.event)) { //上报完成状态

                            if (task.getTaskType() == TaskStsType.WCS_EXECUTE_OUT_TOTE_UNLOAD.id) {

                            if (task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT_TOTE_UNLOAD.id) {

                                taskStsType = TaskStsType.WCS_EXECUTE_OUT_TASK_DONE;

                            } else {

                                String errMsg = "任务编号：" + task.getTaskNo() +  "状态为不匹配，"  + "不能执行：" + TaskStsType.WCS_EXECUTE_OUT_TASK_DONE.desc + "任务";

@@ -160,13 +156,9 @@
                                .set(Task::getTaskSts, taskStsType.id)

                                .set(Task::getExcudeStatus, callbackParam.getStatus())

                                .set(Task::getTaskDesc, callbackParam.getMessage())

                                .eq(Task::getTaskType, finalType)

                                .eq(Task::getBarcode, callbackParam.getContainerCode())

                                .eq(Task::getTaskNo, callbackParam.getTaskCode()));



//                        if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_STATUS.event) && result) {

////                            workService.completeTask(task.getId());

//                        }

                    }



                });