#

Junjie

2023-08-08 5b655229cdb052858e80c6f5ae55077354187c4a

 src/main/java/com/zy/asrs/utils/CommandUtils.java

@@ -29,20 +29,20 @@

        CommandInfo commandInfo = null;
        WrkMast wrkMast = null;
        int taskNo = 0;
        int wmsWrkNo = 0;
        int wrkNo = 0;
        String taskNo = null;
        switch (type) {
            case Crn:
                CrnCommand command = (CrnCommand) task.getData();
                taskNo = command.getTaskNo();
                if (taskNo != 0) {
                    wrkMast = wrkMastService.selectById(taskNo);
                    wmsWrkNo = wrkMast.getWmsWrkNo();
                wrkNo = command.getTaskNo();
                if (wrkNo != 0) {
                    wrkMast = wrkMastService.selectById(wrkNo);
                    taskNo = wrkMast.getTaskNo();
                }

                commandInfo = new CommandInfo();
                commandInfo.setWrkNo(taskNo);
                commandInfo.setWmsWrkNo(wmsWrkNo);
                commandInfo.setWrkNo(wrkNo);
                commandInfo.setTaskNo(taskNo);
                commandInfo.setCommandStatus(1);
                commandInfo.setStartTime(new Date());
                commandInfo.setDevice("crn");
@@ -53,15 +53,15 @@
                break;
            case Devp:
                StaProtocol staProtocol = (StaProtocol) task.getData();
                taskNo = staProtocol.getWorkNo();
                if (taskNo != 0) {
                    wrkMast = wrkMastService.selectById(taskNo);
                    wmsWrkNo = wrkMast.getWmsWrkNo();
                wrkNo = staProtocol.getWorkNo();
                if (wrkNo != 0) {
                    wrkMast = wrkMastService.selectById(wrkNo);
                    taskNo = wrkMast.getTaskNo();
                }

                commandInfo = new CommandInfo();
                commandInfo.setWrkNo(taskNo);
                commandInfo.setWmsWrkNo(wmsWrkNo);
                commandInfo.setWrkNo(wrkNo);
                commandInfo.setTaskNo(taskNo);
                commandInfo.setCommandStatus(1);
                commandInfo.setStartTime(new Date());
                commandInfo.setDevice("devp");
@@ -73,15 +73,15 @@
            case Led:
                List<LedCommand> data = (List<LedCommand>) task.getData();
                for (LedCommand ledCommand : data) {
                    taskNo = ledCommand.getWorkNo();
                    if (taskNo != 0) {
                        wrkMast = wrkMastService.selectById(taskNo);
                        wmsWrkNo = wrkMast.getWmsWrkNo();
                    wrkNo = ledCommand.getWorkNo();
                    if (wrkNo != 0) {
                        wrkMast = wrkMastService.selectById(wrkNo);
                        taskNo = wrkMast.getTaskNo();
                    }

                    commandInfo = new CommandInfo();
                    commandInfo.setWrkNo(ledCommand.getWorkNo());
                    commandInfo.setWmsWrkNo(wmsWrkNo);
                    commandInfo.setTaskNo(taskNo);
                    commandInfo.setCommandStatus(1);
                    commandInfo.setStartTime(new Date());
                    commandInfo.setDevice("led");