From 3494dd089e4cee3fcb61ec3db28c74af790a0635 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 17 十月 2024 14:10:03 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/ShuttleTaskModeType.java | 27 ++++++++++++++-------------
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java | 10 +++++-----
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java | 18 +++++++++---------
3 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java
index 6bcfefc..5d825f1 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java
@@ -79,10 +79,10 @@
redisCommand.setAssignCommand(assignCommand);//鍛戒护
//浠诲姟鏁版嵁淇濆瓨鍒皉edis
if (redisUtil.set(DeviceRedisConstant.SHUTTLE_WORK_FLAG + assignCommand.getTaskNo(), JSON.toJSONString(redisCommand, SerializerFeature.DisableCircularReferenceDetect))) {
- if (assignCommand.getTaskMode() == ShuttleTaskModeType.PAK_IN.id
- || assignCommand.getTaskMode() == ShuttleTaskModeType.PAK_OUT.id
- || assignCommand.getTaskMode() == ShuttleTaskModeType.MOVE_LOC_NO.id
- || assignCommand.getTaskMode() == ShuttleTaskModeType.SHUTTLE_MOVE_LOC_NO.id) {
+ if (assignCommand.getTaskMode() == ShuttleTaskModeType.SHUTTLE_MOVE.id
+ || assignCommand.getTaskMode() == ShuttleTaskModeType.TRANSPORT.id
+ || assignCommand.getTaskMode() == ShuttleTaskModeType.MOVE_PALLET_LIFT.id
+ || assignCommand.getTaskMode() == ShuttleTaskModeType.MOVE_PALLET_DOWN.id) {
//涓嬪彂琛岄┒璺緞
CommandResponse response = shuttleThread.movePath(assignCommand.getNodes(), assignCommand.getDeviceTaskNo());
Boolean result = response.getResult();
@@ -270,7 +270,7 @@
basShuttleOpt.setTaskNo(redisCommand.getTaskNo());
basShuttleOpt.setShuttleNo(Integer.parseInt(device.getDeviceNo()));
- basShuttleOpt.setMode(ShuttleCommandModeType.get(command.getMode()).desc);
+ basShuttleOpt.setMode(ShuttleTaskModeType.get(assignCommand.getTaskMode()).desc);
basShuttleOpt.setSourceLocNo(assignCommand.getSourceLocNo());
basShuttleOpt.setDistLocNo(assignCommand.getLocNo());
basShuttleOpt.setCommand(JSON.toJSONString(command));
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java
index f0b0556..ede36ee 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java
@@ -125,7 +125,7 @@
return true;
}
shuttleCommands = this.shuttleAssignCommand(motion.getOrigin(), motion.getTarget(), NavigationMapType.NORMAL.id, assignCommand, shuttleThread);
- shuttleTaskModeType = ShuttleTaskModeType.SHUTTLE_MOVE_LOC_NO;
+ shuttleTaskModeType = ShuttleTaskModeType.SHUTTLE_MOVE;
break;
case SHUTTLE_TRANSPORT://绌挎杞﹁浇璐ц璧�
// 濡傛灉宸茬粡鍦ㄥ綋鍓嶆潯鐮佸垯杩囨护
@@ -167,16 +167,16 @@
return true;
}
shuttleCommands = this.shuttleAssignCommand(motion.getOrigin(), motion.getTarget(), NavigationMapType.NORMAL.id, assignCommand, shuttleThread);
- shuttleTaskModeType = ShuttleTaskModeType.SHUTTLE_MOVE_LOC_NO;
+ shuttleTaskModeType = ShuttleTaskModeType.TRANSPORT_TO_CONVEYOR;
break;
case SHUTTLE_MOVE_LIFT_PALLET://绌挎杞﹂《鍗囧苟绉诲姩
shuttleCommands = this.shuttleAssignCommand(motion.getOrigin(), motion.getTarget(), NavigationMapType.DFX.id, assignCommand, shuttleThread);
- shuttleTaskModeType = ShuttleTaskModeType.PAK_IN;
+ shuttleTaskModeType = ShuttleTaskModeType.MOVE_PALLET_LIFT;
shuttleCommands.add(0, shuttleThread.getLiftCommand(motion.getTaskNo(), true));
break;
case SHUTTLE_MOVE_DOWN_PALLET://绌挎杞︾Щ鍔ㄥ苟鎵樼洏涓嬮檷
shuttleCommands = this.shuttleAssignCommand(motion.getOrigin(), motion.getTarget(), NavigationMapType.DFX.id, assignCommand, shuttleThread);
- shuttleTaskModeType = ShuttleTaskModeType.PAK_IN;
+ shuttleTaskModeType = ShuttleTaskModeType.MOVE_PALLET_DOWN;
shuttleCommands.add(shuttleCommands.size(), shuttleThread.getLiftCommand(motion.getTaskNo(), false));
break;
case SHUTTLE_MOVE_FROM_LIFT://鍑烘彁鍗囨満
@@ -216,7 +216,7 @@
// }
shuttleCommands = this.shuttleInOutLiftCommand(motion.getOrigin(), motion.getTarget(), NavigationMapType.NORMAL.id, assignCommand, shuttleThread);
- shuttleTaskModeType = ShuttleTaskModeType.SHUTTLE_MOVE_LOC_NO;
+ shuttleTaskModeType = ShuttleTaskModeType.MOVE_OUT_LIFT;
break;
case SHUTTLE_MOVE_TO_LIFT://杩涙彁鍗囨満
// 鍒ゆ柇鎻愬崌鏈虹姸鎬�
@@ -253,15 +253,15 @@
// }
shuttleCommands = this.shuttleAssignCommand(motion.getOrigin(), motion.getTarget(), NavigationMapType.NORMAL.id, assignCommand, shuttleThread);
- shuttleTaskModeType = ShuttleTaskModeType.SHUTTLE_MOVE_LOC_NO;
+ shuttleTaskModeType = ShuttleTaskModeType.MOVE_TO_LIFT;
break;
case SHUTTLE_CHARGE_ON://鍏呯數寮�
- shuttleTaskModeType = ShuttleTaskModeType.CHARGE;
+ shuttleTaskModeType = ShuttleTaskModeType.CHARGE_ON;
shuttleCommands.add(shuttleThread.getChargeCommand(motion.getTaskNo(), true));
assignCommand.setCharge(Boolean.TRUE);
break;
case SHUTTLE_CHARGE_OFF://鍏呯數鍏�
- shuttleTaskModeType = ShuttleTaskModeType.CHARGE;
+ shuttleTaskModeType = ShuttleTaskModeType.CHARGE_OFF;
shuttleCommands.add(shuttleThread.getChargeCommand(motion.getTaskNo(), false));
assignCommand.setCharge(Boolean.TRUE);
break;
@@ -278,7 +278,7 @@
shuttleCommands.add(shuttleThread.getUpdateLocationCommand(motion.getTaskNo(), motion.getTarget()));
break;
case SHUTTLE_MOVE_STANDBY://绌挎杞︾Щ鍔ㄥ埌寰呮満浣�
- shuttleTaskModeType = ShuttleTaskModeType.SHUTTLE_MOVE_LOC_NO;
+ shuttleTaskModeType = ShuttleTaskModeType.SHUTTLE_MOVE;
//鑾峰彇鍏ㄩ儴寰呮満浣�
List<String> standbyLocs = JSON.parseArray(motion.getTemp(), String.class);
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/ShuttleTaskModeType.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/ShuttleTaskModeType.java
index 0aa9c0f..baae48e 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/ShuttleTaskModeType.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/ShuttleTaskModeType.java
@@ -3,8 +3,8 @@
public enum ShuttleTaskModeType {
INIT(0, "鍒濆"), // 鍒濆
- PAK_IN(1, "鍏ュ簱"),
- PAK_OUT(2, "鍑哄簱"),
+ MOVE_PALLET_LIFT(1, "绉诲姩骞舵墭鐩橀《鍗�"),
+ MOVE_PALLET_DOWN(2, "绉诲姩骞舵墭鐩樹笅闄�"),
PALLET_LIFT(3, "鎵樼洏椤跺崌"),
PALLET_DOWN(4, "鎵樼洏涓嬮檷"),
X_NEGATIVE(5, "X-鏂瑰悜"),
@@ -16,17 +16,18 @@
SEARCH_RIGHT(11, "璐熸柟鍚�(宸�)瀵诲簱浣�"),
SEARCH_TOP(12, "璐熸柟鍚�(鍓�)瀵诲簱浣�"),
SEARCH_BOTTOM(13, "璐熸柟鍚�(鍚�)瀵诲簱浣�"),
- MOVE_LOC_NO(14, "绉诲姩鍒扮洰鏍囧簱浣�"),
- CHARGE(15, "鍏呯數"),
- MOVE_LIFT(16, "绉诲姩鍒版彁鍗囨満"),
- AVOID(17, "閬胯浠诲姟"),
- TRANSPORT(18, "鎼繍浠诲姟"),
- SHUTTLE_MOVE_LOC_NO(19, "灏忚溅绉诲簱浠诲姟"),
- SHUTTLE_LOC_TO_LOC(20, "搴撲綅绉昏浆"),
- SHUTTLE_CONTROL(21, "灏忚溅绠″埗"),
- SHUTTLE_CANCEL_CONTROL(22, "灏忚溅鍙栨秷绠″埗"),
- MOVE_LOC_NO_WRK_MAST(23, "绉诲姩鍒扮洰鏍囧簱浣�(鐢熸垚绉诲姩浠诲姟)"),
- SHUTTLE_UPDATE_LOCATION(24, "灏忚溅鍧愭爣鏇存柊"),
+ CHARGE_ON(14, "鍏呯數寮�"),
+ CHARGE_OFF(15, "鍏呯數鍏�"),
+ MOVE_TO_LIFT(16, "灏忚溅杩涙彁鍗囨満"),
+ MOVE_OUT_LIFT(17, "灏忚溅鍑烘彁鍗囨満"),
+ AVOID(18, "閬胯浠诲姟"),
+ TRANSPORT(19, "灏忚溅杞借揣绉诲姩"),
+ TRANSPORT_TO_CONVEYOR(20, "灏忚溅杞借揣杩涜緭閫佺嚎"),
+ SHUTTLE_MOVE(21, "灏忚溅绉诲姩"),
+ SHUTTLE_CONTROL(22, "灏忚溅绠″埗"),
+ SHUTTLE_CANCEL_CONTROL(23, "灏忚溅鍙栨秷绠″埗"),
+ MOVE_LOC_NO_WRK_MAST(24, "绉诲姩鍒扮洰鏍囧簱浣�(鐢熸垚绉诲姩浠诲姟)"),
+ SHUTTLE_UPDATE_LOCATION(25, "灏忚溅鍧愭爣鏇存柊"),
;
public Integer id;
--
Gitblit v1.9.1