#

Junjie

2023-09-19 edacfca5a8e4e3abd4498eb81a34696b9ccd4c73

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

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

            shuttleData.put("moveAdvancePath", null);//穿梭车预计路径
            if (shuttleProtocol.getTaskNo() != 0) {
@@ -322,7 +325,7 @@
                    //复位
                    shuttleProtocol.setTaskNo(0);//工作号清空
                    shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);//任务状态-空闲
                    shuttleProtocol.setPakMk(true);//作业标记复位
                    shuttleProtocol.setPakMk(false);//作业标记复位
                    return R.ok();
                } else if (shuttleTaskModeType == ShuttleTaskModeType.SHUTTLE_CONTROL) {
                    //小车管制