出库类型修改

958836976@qq.com

2024-12-23 19d3488298119d50a94a54903623bf0088d3359c

出库类型修改

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java

@@ -166,18 +166,23 @@




    /**

     * 出库任务--- 每隔3秒，获取当前出库任务列表状态为WCS_EXECUTE_OUT_TASK_DONE的任务，并通知ESS流动输送线

     * 出库任务--- 每隔3秒，获取当前出库任务列表状态为WCS_EXECUTE_OUT_ARRIVED的任务，并通知ESS流动输送线

     * */

//    @Scheduled(cron = "0/3 * * * * ? ")

    @Transactional(rollbackFor = Exception.class)

    public void conveyorToNotify() {

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

                .eq(Task::getTaskSts, TaskStsType.WCS_EXECUTE_OUT_TASK_DONE.id).eq(Task::getStatus, 0));

                .eq(Task::getTaskSts, TaskStsType.WCS_EXECUTE_OUT_ARRIVED.id).eq(Task::getStatus, 0));

        tasks.forEach(task -> {

            try {

                ConveyorStarParam conveyorStarParam = new ConveyorStarParam();

                conveyorStarParam.setSlotCode(task.getOriginLoc())

                        .setContainerCode(task.getBarcode());

                if (task.getTaskType() == 101) { //任务类型为101全盘出库，直接取下容器，传200

                    conveyorStarParam.setDirection("200");

                } else if (task.getTaskType() == 103) { //如果为任务类型为103，需走回库操作，传100

                    conveyorStarParam.setDirection("100");

                }

                //调用三方接口，将任务推送至ESS平台

                MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();

                // 设置请求参数

@@ -195,9 +200,16 @@
                    CommonReponse commonReponse = JSON.toJavaObject(JSON.parseObject(exchange.getBody()), CommonReponse.class);

                    if (commonReponse.getCode() == 0) {

                        //流动通知下发完成后，修改任务状态为输送线流动中。。

                        taskService.update(new LambdaUpdateWrapper<Task>()

                                .eq(Task::getId, task.getId())

                                .set(Task::getTaskType, TaskStsType.WCS_EXECUTE_OUT_CONVEYOR.id));

                        if (task.getTaskType() == 101) {

                            taskService.update(new LambdaUpdateWrapper<Task>()

                                    .eq(Task::getId, task.getId())

                                    .set(Task::getTaskType, TaskStsType.COMPLETE_OUT.id));

                        } else {

                            taskService.update(new LambdaUpdateWrapper<Task>()

                                    .eq(Task::getId, task.getId())

                                    .set(Task::getTaskType, TaskStsType.WCS_EXECUTE_OUT_CONVEYOR.id));

                        }



                        log.info(task.getTaskNo() + "下发流动通知"  + commonReponse.getMsg());

                    } else {

                        throw new CoolException("下发流动通知失败！！");

@@ -221,7 +233,7 @@
     * //TODO 1. 正常出库后，清除任务，

     * //TODO 2. 出库后还有库存，需要添加容器回库操作

     */

    //    @Scheduled(cron = "0/3 * * * * ? ")

    //@Scheduled(cron = "0/3 * * * * ? ")

    @Transactional(rollbackFor = Exception.class)

    public void waveToTask() {

        //获取当前任务档中，所有为待出库状态的任务档，按时间升序排列

@@ -280,6 +292,5 @@
                throw new CoolException(reponse.getMsg());

            }

        }



    }

}


 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());

//                        }

                    }



                });


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/TaskStsType.java

@@ -21,6 +21,7 @@
    WCS_PUTAWAY_SUSPEND(13L, "入库任务挂起"),



    COMPLETE_IN(99L, "入库完成"),



    UPDATED_IN(100L, "库存更新完成"),



    GENERATE_OUT(101L, "生成出库任务"),


 zy-asrs-wms/src/main/resources/application.yml

@@ -37,7 +37,7 @@
  #  global-config:

  #    field-strategy: 0

  configuration:

#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

    map-underscore-to-camel-case: true

    cache-enabled: true

  global-config: