skyouc
2024-12-26 32afdc40d71b62ed0a2e0693cd56564816b188e5
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
@@ -63,10 +63,11 @@
                    .set(Task::getOriginLoc, arrivedParam.getSlotCode())
                    .eq(Task::getBarcode, arrivedParam.getContainerCode()));
        } else {
            taskService.update(new LambdaUpdateWrapper<Task>()
            boolean update = taskService.update(new LambdaUpdateWrapper<Task>()
                    .set(Task::getTaskSts, TaskStsType.WCS_EXECUTE_OUT_ARRIVED.id)
                    .set(Task::getOriginLoc, arrivedParam.getSlotCode())
                    .eq(Task::getBarcode, arrivedParam.getContainerCode()));
        }
        return R.success("success");
@@ -75,17 +76,15 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void receiveTaskStatus(TasksStatusCallbackParam callbackParam, String stockType) {
        Long type = 100L;
        List<Task> list = taskService.list(new LambdaQueryWrapper<Task>()
                .eq(Task::getBarcode, callbackParam.getContainerCode())
                .ge(Task::getTaskType, type)
                .eq(Task::getTaskNo, callbackParam.getTaskCode()));
        if (!Collections.isEmpty(list)) {
            list.forEach(task -> {
                    TaskStsType taskStsType = null;
                    if (stockType.equals("inStock")) { //入库任务
                        if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_TOTE_LOAD.event)) { //上报取箱状态
                            if (task.getTaskSts() == TaskStsType.WCS_CONTAINER_RECEIVE.id) {
                            if (task.getTaskSts() == TaskStsType.WCS_CONVEYOR_START.id) {
                                taskStsType = TaskStsType.WCS_TOTE_LOAD;
                            } else {
                                String errMsg = "任务编号:" + task.getTaskNo() +  "状态为不匹配,"  + "不能执行:" + TaskStsType.WCS_TOTE_LOAD.desc + "任务";