zhang
2 天以前 33664d7d7f8478fb961f8fbda44c885fd854bf3d
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/ValidService.java
@@ -37,7 +37,7 @@
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    public List<Task> validBusDto(List<TaskDto> taskDtoList) {
    public List<Task> validTaskDtoList(List<TaskDto> taskDtoList) {
        List<Task> taskList = new ArrayList<>();
        for (TaskDto taskDto : taskDtoList) {
            if (Cools.isEmpty(taskDto.getSeqNum())) {
@@ -56,13 +56,16 @@
                    throw new BusinessException("oriLoc: " + taskDto.getOriLoc() + " doesn't exist!");
                }
                task.setOriLoc(oriLoc.getId());
//                task.setOriCode(oriLoc.getCode());
            }
            if (!Cools.isEmpty(taskDto.getOriSta())) {
                Sta oriSta = staService.selectByStaNo(taskDto.getOriSta());
                Sta oriSta = staService.selectByStaNoOrName(taskDto.getOriSta());
                if (null == oriSta) {
                    throw new BusinessException("oriSta: " + taskDto.getOriSta() + " doesn't exist!");
                }
                task.setOriSta(oriSta.getId());
//                task.setOriCode(oriSta.getCode());
            }
            // dest --------------------------
            if (!Cools.isEmpty(taskDto.getDestLoc())) {
@@ -74,7 +77,7 @@
                task.setDestCode(destLoc.getCode());
            }
            if (!Cools.isEmpty(taskDto.getDestSta())) {
                Sta destSta = staService.selectByStaNo(taskDto.getDestSta());
                Sta destSta = staService.selectByStaNoOrName(taskDto.getDestSta());
                if (null == destSta) {
                    throw new BusinessException("destSta: " + taskDto.getDestSta() + " doesn't exist!");
                }
@@ -125,8 +128,8 @@
                    oriLoc = locService.getById(task.getOriLoc());
                    destLoc = locService.getById(task.getDestLoc());
                    startCode = codeService.getById(oriLoc.getCode());
                    endCode = codeService.getById(destLoc.getCode());
                    startCode = codeService.getCacheById(oriLoc.getCode());
                    endCode = codeService.getCacheById(destLoc.getCode());
                    if (null == startCode) {
                        throw new BusinessException("oriLoc:" + oriLoc.getLocNo() + " hasn't been bound to a QrCode yet");
                    }
@@ -143,8 +146,8 @@
                    oriLoc = locService.getById(task.getOriLoc());
                    destSta = staService.getById(task.getDestSta());
                    startCode = codeService.getById(oriLoc.getCode());
                    endCode = codeService.getById(destSta.getCode());
                    startCode = codeService.getCacheById(oriLoc.getCode());
                    endCode = codeService.getCacheById(destSta.getCode());
                    if (null == startCode) {
                        throw new BusinessException("oriLoc:" + oriLoc.getLocNo() + " hasn't been bound to QrCode yet");
                    }
@@ -161,8 +164,8 @@
                    oriSta = staService.getById(task.getOriSta());
                    destLoc = locService.getById(task.getDestLoc());
                    startCode = codeService.getById(oriSta.getCode());
                    endCode = codeService.getById(destLoc.getCode());
                    startCode = codeService.getCacheById(oriSta.getCode());
                    endCode = codeService.getCacheById(destLoc.getCode());
                    if (null == startCode) {
                        throw new BusinessException("oriSta:" + oriSta.getStaNo() + " hasn't bound to QrCode yet");
                    }
@@ -179,8 +182,8 @@
                    oriSta = staService.getById(task.getOriSta());
                    destSta = staService.getById(task.getDestSta());
                    startCode = codeService.getById(oriSta.getCode());
                    endCode = codeService.getById(destSta.getCode());
                    startCode = codeService.getCacheById(oriSta.getCode());
                    endCode = codeService.getCacheById(destSta.getCode());
                    if (null == startCode) {
                        throw new BusinessException("oriSta:" + oriSta.getStaNo() + " hasn't been bound to a QrCode yet");
                    }