Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

chen.lin

14 小时以前 79843611908e58f9538f8d8ebac62d3f0d01712c

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

@@ -31,8 +31,8 @@
import com.vincent.rsf.server.manager.service.impl.LocServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.manager.enums.LocStsType;
import com.vincent.rsf.server.system.entity.User;
import com.vincent.rsf.server.system.service.impl.UserServiceImpl;
import com.vincent.rsf.server.system.entity.*;
import com.vincent.rsf.server.system.service.impl.*;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -86,6 +86,14 @@
    private RemotesInfoProperties.RcsApi rcsApi;
    @Autowired
    private UserServiceImpl userService;
    @Autowired
    private TaskInstanceServiceImpl taskInstanceService;
    @Autowired
    private TaskInstanceNodeServiceImpl taskInstanceNodeService;
    @Autowired
    private FlowStepInstanceServiceImpl flowStepInstanceService;
    @Autowired
    private FlowInstanceServiceImpl flowInstanceService;


    @Override
@@ -477,9 +485,40 @@
        if (Objects.isNull(task)) {
            throw new CoolException("任务不存在可以结束！！");
        }
        FlowStepInstance flowStepInstance = flowStepInstanceService.getOne(new LambdaQueryWrapper<FlowStepInstance>()
                .eq(FlowStepInstance::getTaskNo, task.getTaskCode())
                .eq(FlowStepInstance::getWmsNowTaskStatus, task.getTaskStatus())
                .eq(FlowStepInstance::getStatus, (short) 1).last("limit 1"));
        if (Cools.isEmpty(flowStepInstance)){
            return R.error(task.getTaskCode()+"任务号==>未查询到相关任务执行流程！！！");
        }
        if (!MissionStepType.getTaskRECEIVE().contains(flowStepInstance.getStepType())){
            return R.error(task.getTaskCode()+"任务号==>相关任务类型非接收型，步骤错乱！！！");
        }

        FlowInstance flowInstance = flowInstanceService.getById(flowStepInstance.getFlowInstanceId());
        if (Cools.isEmpty(flowInstance)) {
            return R.error(task.getTaskCode()+"任务号==>未查询到相关任务执行流程！！！");
        }
        List<FlowStepInstance> flowStepInstances = flowStepInstanceService.list(new LambdaQueryWrapper<FlowStepInstance>()
                .eq(FlowStepInstance::getFlowInstanceId, flowInstance.getId()).eq(FlowStepInstance::getStatus, (short) 0));
        flowInstance.setStatus(flowStepInstances.isEmpty()? (short) 2:(short) 1);
        TaskInstanceNode taskInstanceNode = taskInstanceNodeService.getById(flowInstance.getNodeInstanceId());
        if (Cools.isEmpty(taskInstanceNode)) {
            return R.error(task.getTaskCode()+"任务号==>未查询到相关任务执行流程！！！");
        }
        taskInstanceNode.setStatus(flowInstance.getStatus());
        TaskInstance taskInstance = taskInstanceService.getById(flowInstance.getTaskId());
        if (Cools.isEmpty(taskInstance)) {
            return R.error(task.getTaskCode()+"任务号==>未查询到相关任务执行流程！！！");
        }


        /**料箱搬运中， 修改站点状态*/
        if (params.getEventType().equals(CallBackEvent.CALL_BACK_EVENT_BIN.event)) {
            if (!flowStepInstance.getStepType().equals(MissionStepType.MISSION_STEP_TYPE_RECEIVE_BIN.type)) {
                return R.error(task.getTaskCode()+"任务号==>未查询到相关任务执行流程！！！");
            }
            if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)
@@ -504,92 +543,47 @@
                    || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_OUT.type)) {


                /**修改出库站点状态*/
                BasStation station = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
                        .eq(BasStation::getStationName, task.getOrgLoc()));
                if (Objects.isNull(station)) {
                    throw new CoolException("数据错误，站点不存在！！");
                }
                if (station.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
                    station.setUseStatus(LocStsType.LOC_STS_TYPE_O.type);
                    station.setBarcode(null);
                    if (!basStationService.updateById(station)) {
                        throw new CoolException("站点状态修改失败！！");
                    }
                }
//                /**修改出库站点状态*/
//                BasStation station = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
//                        .eq(BasStation::getStationName, task.getOrgLoc()));
//                if (Objects.isNull(station)) {
//                    throw new CoolException("数据错误，站点不存在！！");
//                }
//                if (station.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
//                    station.setUseStatus(LocStsType.LOC_STS_TYPE_O.type);
//                    station.setBarcode(null);
//                    if (!basStationService.updateById(station)) {
//                        throw new CoolException("站点状态修改失败！！");
//                    }
//                }
            }
            /**取箱完成， 修改任务状态*/
        } else
        if (params.getEventType().equals(CallBackEvent.CALL_BACK_EVENT_END.event)) {
            if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_IN.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_IN.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {

                if (!task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
                    BasStation station = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getOrgSite()));
                    if (Objects.isNull(station)) {
                        throw new CoolException("数据错误，站点不存在！！");
                    }
                    if (station.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
                        station.setUseStatus(LocStsType.LOC_STS_TYPE_O.type);
                        if (!basStationService.updateById(station)) {
                            throw new CoolException("站点状态修改失败！！");
                        }
                    }
                }

                if (!taskService.update(new LambdaUpdateWrapper<Task>()
                        .lt(Task::getTaskStatus, TaskStsType.COMPLETE_IN.id)
                        .eq(Task::getTaskCode, task.getTaskCode())
                        .set(Task::getTaskStatus, TaskStsType.COMPLETE_IN.id))) {
                    throw new CoolException("任务状态修改失败！！");
                }
            } else if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_OUT.type)) {


                /**修改出库站点状态*/
                BasStation station = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
                        .eq(BasStation::getStationName, task.getTargSite()));
                if (Objects.isNull(station)) {
                    throw new CoolException("数据错误，站点不存在！！");
                }
                if (station.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
                    station.setUseStatus(LocStsType.LOC_STS_TYPE_F.type);
                    if (!basStationService.updateById(station)) {
                        throw new CoolException("站点状态修改失败！！");
                    }
                }

                if (!taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())
                        .lt(Task::getTaskStatus, TaskStsType.COMPLETE_OUT.id)
                        .set(Task::getTaskStatus, TaskStsType.AWAIT.id))) {
                    throw new CoolException("任务状态修改失败！！");
                }
        } else if (params.getEventType().equals(CallBackEvent.CALL_BACK_EVENT_END.event)) {
            if (flowStepInstance.getStepType().equals(MissionStepType.MISSION_STEP_TYPE_RECEIVE_BIN.type)) {
                return R.error(task.getTaskCode()+"任务号==>请先出站请求！！！");
            }
        } else if (params.getEventType().equals(CallBackEvent.CALL_BACK_EVENT_TRANSFER.event)) {
            if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_IN.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_IN.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
                if (!taskService.update(new LambdaUpdateWrapper<Task>()
                        .lt(Task::getTaskStatus, TaskStsType.WCS_EXECUTE_IN.id)
                        .eq(Task::getTaskCode, task.getTaskCode())
                        .set(Task::getOrgSite, task.getTargSite())
                        .set(Task::getTaskStatus, TaskStsType.WCS_EXECUTE_IN.id))) {
                    throw new CoolException("任务状态修改失败！！");
                }
        }


        task.setTaskStatus(flowStepInstance.getWmsNextTaskStatus());
        flowStepInstance.setStatus((short)3);

        flowStepInstanceService.updateById(flowStepInstance);
        taskService.updateById(task);
        if (flowStepInstance.getWmsNextTaskStatus() != 9999) {
            FlowStepInstance nextFlowStepInstance = flowStepInstanceService.getOne(new LambdaQueryWrapper<FlowStepInstance>()
                    .eq(FlowStepInstance::getStatus, (short)0)
                    .eq(FlowStepInstance::getStepOrder, flowStepInstance.getStepOrder() + 1)
                    .eq(FlowStepInstance::getWmsNowTaskStatus, flowStepInstance.getWmsNextTaskStatus()));
            if (Cools.isEmpty(nextFlowStepInstance)) {
                return R.error(task.getTaskCode()+"任务号==>未查询到相关任务执行流程！！！");
            }
            nextFlowStepInstance.setStatus((short)1);

            flowStepInstanceService.updateById(nextFlowStepInstance);
        } else {
            taskInstance.setStatus((short)2);
            taskInstanceService.updateById(taskInstance);
        }
        log.info(JSONObject.toJSONString(params));
        return R.ok(JSONObject.toJSONString(params));
@@ -1046,18 +1040,68 @@
        if (Objects.isNull(params)) {
            return R.error("参数不能为空！！");
        }
        Task one = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getTaskCode, params.getSuperTaskNo()));
        if (Cools.isEmpty(one)) {
        Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getTaskCode, params.getSuperTaskNo()));
        if (Cools.isEmpty(task)) {
            return R.error(params.getSuperTaskNo()+"任务号==>未查询到相关任务！！！");
        }
        if (params.getMsgType().equals(WcsMsgTypeEvent.TASK_COMPLETE.event)){
            if (!Cools.isEmpty(one)) {
                one.setTaskStatus(one.getTaskType() < 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.AWAIT.id);
                if (!taskService.updateById(one)) {
//                    throw new CoolException("完成任务失败");
                    return R.error("完成任务失败").add(one);
            if (!Cools.isEmpty(task)) {
                FlowStepInstance flowStepInstance = flowStepInstanceService.getOne(new LambdaQueryWrapper<FlowStepInstance>()
                        .eq(FlowStepInstance::getTaskNo, task.getTaskCode())
                        .eq(FlowStepInstance::getWmsNowTaskStatus, task.getTaskStatus())
                        .eq(FlowStepInstance::getStatus, (short) 1).last("limit 1"));
                if (Cools.isEmpty(flowStepInstance)){
                    return R.error(params.getSuperTaskNo()+"任务号==>未查询到相关任务执行流程！！！");
                }
                return R.ok("任务完成成功").add(one);

                if (!MissionStepType.getTaskRECEIVE().contains(flowStepInstance.getStepType())){
                    return R.error(params.getSuperTaskNo()+"任务号==>相关任务类型非接收型，步骤错乱！！！");
                }

                FlowInstance flowInstance = flowInstanceService.getById(flowStepInstance.getFlowInstanceId());
                if (Cools.isEmpty(flowInstance)) {
                    return R.error(params.getSuperTaskNo()+"任务号==>未查询到相关任务执行流程！！！");
                }
                List<FlowStepInstance> flowStepInstances = flowStepInstanceService.list(new LambdaQueryWrapper<FlowStepInstance>()
                        .eq(FlowStepInstance::getFlowInstanceId, flowInstance.getId()).eq(FlowStepInstance::getStatus, (short) 0));
                flowInstance.setStatus(flowStepInstances.isEmpty()? (short) 2:(short) 1);
                TaskInstanceNode taskInstanceNode = taskInstanceNodeService.getById(flowInstance.getNodeInstanceId());
                if (Cools.isEmpty(taskInstanceNode)) {
                    return R.error(params.getSuperTaskNo()+"任务号==>未查询到相关任务执行流程！！！");
                }
                taskInstanceNode.setStatus(flowInstance.getStatus());
                TaskInstance taskInstance = taskInstanceService.getById(flowInstance.getTaskId());
                if (Cools.isEmpty(taskInstance)) {
                    return R.error(params.getSuperTaskNo()+"任务号==>未查询到相关任务执行流程！！！");
                }
                task.setTaskStatus(flowStepInstance.getWmsNextTaskStatus());
                flowStepInstance.setStatus((short)3);

                flowStepInstanceService.updateById(flowStepInstance);
                taskService.updateById(task);
                if (flowStepInstance.getWmsNextTaskStatus() != 9999) {
                    FlowStepInstance nextFlowStepInstance = flowStepInstanceService.getOne(new LambdaQueryWrapper<FlowStepInstance>()
                            .eq(FlowStepInstance::getStatus, (short)0)
                            .eq(FlowStepInstance::getStepOrder, flowStepInstance.getStepOrder() + 1)
                            .eq(FlowStepInstance::getWmsNowTaskStatus, flowStepInstance.getWmsNextTaskStatus()));
                    if (Cools.isEmpty(nextFlowStepInstance)) {
                        return R.error(task.getTaskCode()+"任务号==>未查询到相关任务执行流程！！！");
                    }
                    nextFlowStepInstance.setStatus((short)1);

                    flowStepInstanceService.updateById(nextFlowStepInstance);
                } else {
                    taskInstance.setStatus((short)2);
                    taskInstanceService.updateById(taskInstance);
                }
                return R.ok("任务完成成功").add(task);


//                one.setTaskStatus(one.getTaskType() < 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.AWAIT.id);
//                if (!taskService.updateById(one)) {
////                    throw new CoolException("完成任务失败");
//                    return R.error("完成任务失败").add(one);
//                }
            }
        } else if (params.getMsgType().equals(WcsMsgTypeEvent.TASK_CANCEL.event)){
//            if (!Cools.isEmpty(one)) {