#

Junjie

2023-09-08 a206216c95cb4cc2b3a3c7c1e3d247d6ea87183f

#

 src/main/java/com/zy/asrs/controller/ShuttleController.java

@@ -75,10 +75,11 @@
                continue;
            }
            NyShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
            JSONObject shuttleData = JSON.parseObject(JSON.toJSONString(shuttleProtocol));
            if (shuttleProtocol == null || shuttleProtocol.getShuttleNo()==null) {
                list.add(shuttleData);
                continue;
            }
            JSONObject shuttleData = JSON.parseObject(JSON.toJSONString(shuttleProtocol));

            shuttleData.put("moveAdvancePath", null);//穿梭车预计路径
            if (shuttleProtocol.getTaskNo() != 0) {

 src/main/java/com/zy/core/thread/NyShuttleThread.java

@@ -117,6 +117,7 @@
            NyShuttleHttpCommand readStatusCommand = NyHttpUtils.getReadStatusCommand(slave.getId());
            JSONObject jsonObject = NyHttpUtils.requestCommand(socket, readStatusCommand);
            if (jsonObject == null) {
                shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.OFFLINE);
                OutputQueue.SHUTTLE.offer(MessageFormat.format("【{0}】四向穿梭车Socket状态信息失败 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
            }else {
                //手动状态/自动状态

 src/main/resources/application.yml

@@ -40,6 +40,9 @@
wms:
  url: localhost:8081/xzjlwms

robot:
  url: http://127.0.0.1:9090/tzskwcs

erp:
  db:
    driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
@@ -276,14 +279,14 @@
  # 四向穿梭车1
  shuttle[0]:
    id: 1
    ip: 192.168.0.101
    ip: 127.0.0.1
    port: 8888
    rack: 0
    slot: 0
  # 四向穿梭车2
  shuttle[1]:
    id: 2
    ip: 10.10.10.221
    ip: 192.168.4.15
    port: 8888
    rack: 0
    slot: 0

 src/main/webapp/views/console.html

@@ -418,8 +418,10 @@
                                if (res.code == 200) {
                                    let currentLevShuttle = []//当前楼层小车集合
                                    res.data.forEach((item,idx) => {
                                        if (item.point.z == that.currentLev) {
                                            currentLevShuttle.push(item)
                                        if (item.point != undefined && item.point != null) {
                                            if (item.point.z == that.currentLev) {
                                                currentLevShuttle.push(item);
                                            }
                                        }
                                    })
                                    that.currentLevShuttleList = currentLevShuttle