1

skyouc

14 小时以前 dc40d8612fb49ad1282eca24d7bc1b3112c1f604

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

@@ -309,6 +309,9 @@
        waitPakins.forEach(pakin -> {
            BasContainer container = basContainerService.getOne(new LambdaUpdateWrapper<BasContainer>()
                    .eq(BasContainer::getCode, pakin.getBarcode()));
            if (Objects.isNull(container)) {
                throw new CoolException("容器未维护入库，请维护后再操作！！");
            }
            /**获取库位*/
            String targetLoc = LocManageUtil.getTargetLoc(warehouseArea.getId(), container.getContainerType());
            if (Cools.isEmpty(targetLoc)) {
@@ -1214,27 +1217,27 @@
        }


        if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) {
            if (!this.update(new LambdaUpdateWrapper<Task>()
                    .eq(Task::getId, task.getId())
                    .set(Task::getUpdateBy, loginUserId)
                    .set(Task::getUpdateTime, new Date())
                    .set(Task::getTaskStatus, TaskStsType.WAVE_SEED.id))) {
                throw new CoolException("库存状态更新失败！！");
            }
        } else {
            if (!this.update(new LambdaUpdateWrapper<Task>()
                    .eq(Task::getId, task.getId())
                    .set(Task::getUpdateBy, loginUserId)
                    .set(Task::getUpdateTime, new Date())
                    .set(Task::getTaskStatus, TaskStsType.WAVE_SEED.id))) {
                throw new CoolException("库存状态更新失败！！");
            }
//            //全板出库，删除临时库存
//            if (!locItemWorkingService.remove(new LambdaQueryWrapper<LocItemWorking>().eq(LocItemWorking::getTaskId, task.getId()))) {
//                throw new CoolException("临时库存清除失败！！");
//        if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) {
//            if (!this.update(new LambdaUpdateWrapper<Task>()
//                    .eq(Task::getId, task.getId())
//                    .set(Task::getUpdateBy, loginUserId)
//                    .set(Task::getUpdateTime, new Date())
//                    .set(Task::getTaskStatus, TaskStsType.WAVE_SEED.id))) {
//                throw new CoolException("库存状态更新失败！！");
//            }
        }
//        } else {
//            if (!this.update(new LambdaUpdateWrapper<Task>()
//                    .eq(Task::getId, task.getId())
//                    .set(Task::getUpdateBy, loginUserId)
//                    .set(Task::getUpdateTime, new Date())
//                    .set(Task::getTaskStatus, TaskStsType.WAVE_SEED.id))) {
//                throw new CoolException("库存状态更新失败！！");
//            }
////            //全板出库，删除临时库存
////            if (!locItemWorkingService.remove(new LambdaQueryWrapper<LocItemWorking>().eq(LocItemWorking::getTaskId, task.getId()))) {
////                throw new CoolException("临时库存清除失败！！");
////            }
//        }

    }