zy-asrs-master.git

			@@ -112,9 +112,17 @@
			}

			//判断设备是否空闲
			if (!shuttleThread.isIdle(() -> {
			return shuttleProtocol.getTaskNo().equals(taskNo);
			})) {
			if (!shuttleThread.isDeviceIdle()) {
			return false;
			}
			// if (!shuttleThread.isIdle(() -> {
			// return shuttleProtocol.getTaskNo().equals(taskNo);
			// })) {
			// return false;
			// }

			//判断工作号是否相同
			if (!shuttleProtocol.getTaskNo().equals(taskNo)) {
			return false;
			}

			@@ -28,6 +28,8 @@

			boolean isIdle(ExecuteSupport support);//是否空闲

			boolean isDeviceIdle();//设备是否空闲

			boolean isRequireCharge();//是否满足充电状态

			boolean isCharging();//是否充电中

			@@ -420,6 +420,22 @@
			}

			@Override
			public boolean isDeviceIdle() {
			if (this.shuttleProtocol.getDeviceStatus() == null
			\|\| this.shuttleProtocol.getPakMk() == null
			\|\| this.shuttleProtocol.getErrorCode() == null
			) {
			return false;
			}

			boolean res = (this.shuttleProtocol.getDeviceStatus() == 3 \|\| this.shuttleProtocol.getDeviceStatus() == 11)
			&& this.shuttleProtocol.getPakMk()
			&& this.shuttleProtocol.getErrorCode().equals("0")
			;
			return res;
			}

			@Override
			public boolean isRequireCharge() {
			if (this.shuttleProtocol.getDeviceStatus() == null
			\|\| this.shuttleProtocol.getPakMk() == null

	zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/ShuttleThread.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史