#
zjj
2024-03-21 c3a45951d49c7a2c6e19efaa91556c9032719c79
#
3个文件已修改
5 ■■■■ 已修改文件
src/main/java/com/zy/asrs/task/TaskLogScheduler.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/enums/RgvModeType.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/SiemensCrnThread.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -22,6 +22,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
/**
 * 定时将任务(完成、取消)转成日志
@@ -105,6 +106,7 @@
                            .setUri(wmsUrl)
                            .setPath("wcsManager/wcsInterface/taskStatusFeedback")
                            .setJson(JSON.toJSONString(taskOverToWms))
                            .setTimeout(60, TimeUnit.SECONDS)
                            .build()
                            .doPost();
                }catch (Exception e){
src/main/java/com/zy/core/enums/RgvModeType.java
@@ -7,6 +7,7 @@
    HAND(1, "手动"),
    HALF_AUTO(2, "半自动"),
    AUTO(3, "自动"),
    AUTO3(4, "其它4"),
    AUTO2(100, "其它"),
    ;
src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -313,7 +313,7 @@
        try{
            //堆垛机任务写入后,回读一次,看是否成功
            Thread.sleep(500);
            OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 24);
            OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 20);
            if (resultRead.IsSuccess) {
                CrnCommand one = new CrnCommand();
                one.setAckFinish(siemensNet.getByteTransform().TransInt16(resultRead.Content, 0));