#
luxiaotao1123
2022-03-14 d170b81d2befd6aa898168bdd68ab8ac04450224
#
2个文件已修改
27 ■■■■ 已修改文件
src/main/java/com/zy/core/model/command/SteCommand.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/SteThread.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/model/command/SteCommand.java
@@ -20,6 +20,12 @@
    // 作业类型
    private Short taskMode = 0;
    // 正在执行任务
    public Boolean execute;
    // 任务完成,等待WCS确认
    public Boolean waiting;
    @JSONField(serialize = false)
    private SteTaskModeType taskModeType;
src/main/java/com/zy/core/thread/SteThread.java
@@ -219,8 +219,12 @@
            return false;
        }
        command.setSteNo(slave.getId());
        short[] array = new short[10];
//        array[0] = command.getAckFinish();
        OperateResult result;
        // 开始任务
        if (!command.getWaiting()) {
            OperateResult result0 = siemensS7Net.Write("D0", command.getTaskNo());
            short[] array = new short[10];
            array[0] = command.getTaskMode();
//        array[1] = command.getTaskNo();
//        array[2] = command.getTaskMode();
//        array[3] = command.getSourcePosX();
@@ -230,12 +234,13 @@
//        array[7] = command.getDestinationPosY();
//        array[8] = command.getDestinationPosZ();
//        array[9] = command.getCommand();
        OperateResult result = siemensS7Net.Write("D0", array);
//        if (command.getAckFinish() == 0) {
//            short commandFinish = 1;
//            result = siemensS7Net.Write("D9", commandFinish);
//        }
            OperateResult result1 = siemensS7Net.Write("D0", array);
            // 确认开始任务
            result = siemensS7Net.Write("D0", true);
        // 任务完成
        } else {
            result = siemensS7Net.Write("D0", true);
        }
        try {
            // 日志记录