Browse Source

PlanTaskSequence.option, loadHeight / unloadHeight

jx-test
修宁 5 months ago
parent
commit
c17dca99fe
  1. 6
      servo/src/main/java/com/galaxis/rcs/amr/AmrAgvItem.java
  2. 12
      servo/src/main/java/com/galaxis/rcs/plan/PlanTaskSequence.java

6
servo/src/main/java/com/galaxis/rcs/amr/AmrAgvItem.java

@ -596,6 +596,9 @@ public abstract class AmrAgvItem extends ExecutorItem {
} else { } else {
deviceTask.goodsSlotHeight = 1; deviceTask.goodsSlotHeight = 1;
} }
if (sequence.getUnloadHeight() > 0d) {
deviceTask.goodsSlotHeight = (int) Math.round(sequence.getLoadHeight() * 1000);
}
if (linkStore != null) { if (linkStore != null) {
for (Map<String, Object> store : linkStore) { for (Map<String, Object> store : linkStore) {
if (store.get("item").equals(plan.getTargetId()) && store.get("level").equals(plan.getTargetLevel()) && store.get("bay").equals(plan.getTargetBay()) && store.get("cell").equals(plan.getTargetCell())) { if (store.get("item").equals(plan.getTargetId()) && store.get("level").equals(plan.getTargetLevel()) && store.get("bay").equals(plan.getTargetBay()) && store.get("cell").equals(plan.getTargetCell())) {
@ -660,6 +663,9 @@ public abstract class AmrAgvItem extends ExecutorItem {
} else { } else {
deviceTask.goodsSlotHeight = 1; deviceTask.goodsSlotHeight = 1;
} }
if (sequence.getUnloadHeight() > 0d) {
deviceTask.goodsSlotHeight = (int) Math.round(sequence.getUnloadHeight() * 1000);
}
if (linkStore != null) { if (linkStore != null) {
for (Map<String, Object> store : linkStore) { for (Map<String, Object> store : linkStore) {
if (store.get("item").equals(plan.getTargetId()) && store.get("level").equals(plan.getTargetLevel()) && store.get("bay").equals(plan.getTargetBay()) && store.get("cell").equals(plan.getTargetCell())) { if (store.get("item").equals(plan.getTargetId()) && store.get("level").equals(plan.getTargetLevel()) && store.get("bay").equals(plan.getTargetBay()) && store.get("cell").equals(plan.getTargetCell())) {

12
servo/src/main/java/com/galaxis/rcs/plan/PlanTaskSequence.java

@ -211,18 +211,18 @@ public class PlanTaskSequence {
return this.taskList.size(); return this.taskList.size();
} }
public float getLoadHeight() { public double getLoadHeight() {
if (this.option == null || this.option.get("loadHeight") == null) { if (this.option == null || this.option.get("loadHeight") == null) {
return 0f; return 0d;
} }
return Conv.asFloat(this.option.get("loadHeight")); return Conv.asDouble(this.option.get("loadHeight"));
} }
public float getUnloadHeight() { public double getUnloadHeight() {
if (this.option == null || this.option.get("unloadHeight") == null) { if (this.option == null || this.option.get("unloadHeight") == null) {
return 0f; return 0d;
} }
return Conv.asFloat(this.option.get("unloadHeight")); return Conv.asDouble(this.option.get("unloadHeight"));
} }
public int completedCount() { public int completedCount() {

Loading…
Cancel
Save