1

zhang

2 天以前 02e3fbfc96e08c9285daaa5a6ec53716c747a671

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/ValidService.java

@@ -49,6 +49,7 @@
            task.setSeqNum(taskDto.getSeqNum());
            task.setPriority(taskDto.getPriority());


            // ori --------------------------
            if (!Cools.isEmpty(taskDto.getOriLoc())) {
                Loc oriLoc = locService.selecatByLocNo(taskDto.getOriLoc());
@@ -59,7 +60,8 @@
//                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!");
                }
@@ -76,7 +78,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!");
                }
@@ -97,20 +99,24 @@
            if (null != task.getDestLoc() && null != task.getDestSta()) {
                throw new BusinessException("seNum:" + task.getSeqNum() + " is wrong，either destLoc and destSta must be present");
            }
            if (null != task.getOriSta()) {
                if (null != task.getDestLoc()) {
                    task.setTaskType(TaskTypeType.STA_TO_LOC.val());
            if (!Cools.isEmpty(taskDto.getTaskType())) {
                task.setTaskType(TaskTypeType.valueOf(taskDto.getTaskType()).val());
            } else {
                if (null != task.getOriSta()) {
                    if (null != task.getDestLoc()) {
                        task.setTaskType(TaskTypeType.STA_TO_LOC.val());
                    }
                    if (null != task.getDestSta()) {
                        task.setTaskType(TaskTypeType.STA_TO_STA.val());
                    }
                }
                if (null != task.getDestSta()) {
                    task.setTaskType(TaskTypeType.STA_TO_STA.val());
                }
            }
            if (null != task.getOriLoc()) {
                if (null != task.getDestLoc()) {
                    task.setTaskType(TaskTypeType.LOC_TO_LOC.val());
                }
                if (null != task.getDestSta()) {
                    task.setTaskType(TaskTypeType.LOC_TO_STA.val());
                if (null != task.getOriLoc()) {
                    if (null != task.getDestLoc()) {
                        task.setTaskType(TaskTypeType.LOC_TO_LOC.val());
                    }
                    if (null != task.getDestSta()) {
                        task.setTaskType(TaskTypeType.LOC_TO_STA.val());
                    }
                }
            }
        }
@@ -119,16 +125,18 @@
        for (Task task : taskList) {
            Code startCode = null;
            Code endCode = null;
            Loc oriLoc = null; Loc destLoc = null;
            Sta oriSta = null; Sta destSta = null;
            Loc oriLoc = null;
            Loc destLoc = null;
            Sta oriSta = null;
            Sta destSta = null;
            List<String> pathList = null;
            switch (Objects.requireNonNull(TaskTypeType.get(task.getTaskTypeEl()))) {
                case LOC_TO_LOC:
                    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");
                    }
@@ -145,8 +153,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");
                    }
@@ -163,8 +171,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");
                    }
@@ -181,8 +189,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");
                    }