zy-asrs-flow/src/config/setting.ts
@@ -1,5 +1,5 @@ // 接口地址 export const IP: string = '192.168.2.95'; export const IP: string = 'localhost'; export const PORT: number = 9090; export const API_BASE_URL: string = 'http://' + IP + ':' + PORT + '/wcs'; zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java
@@ -26,7 +26,6 @@ import com.zy.asrs.wcs.rcs.model.enums.SlaveType; import com.zy.asrs.wcs.rcs.model.protocol.ShuttleProtocol; import com.zy.asrs.wcs.rcs.thread.ShuttleThread; import org.aspectj.apache.bcel.generic.RET; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -244,7 +243,6 @@ if (shuttleThread == null) { return; } ShuttleProtocol shuttleProtocol = shuttleThread.getStatus(); if (shuttleProtocol == null) { return; zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/enums/SlaveType.java
@@ -14,7 +14,7 @@ public static SlaveType findInstance(String s){ for (SlaveType type : SlaveType.values()) { if (type.toString().toUpperCase().equals(s)) { if (type.toString().toUpperCase().equals(s.toUpperCase())) { return type; } } zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java
@@ -208,6 +208,9 @@ @Override public ShuttleProtocol getStatus() { if (this.shuttleProtocol == null) { return null; } return this.shuttleProtocol.clone(); }
