From 114b4110c46d1976c53ca1373e45c63471e2c9ba Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期一, 07 七月 2025 08:37:30 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/ShuttleController.java | 18 +++++++----------- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 ++-- src/main/java/com/zy/core/enums/ShuttleTaskModeType.java | 4 +++- src/main/webapp/views/shuttle.html | 3 ++- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java index f9b68ff..6e033b9 100644 --- a/src/main/java/com/zy/asrs/controller/ShuttleController.java +++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java @@ -338,17 +338,13 @@ //鎵樼洏涓嬮檷 List<ShuttleCommand> commands = shuttleOperaUtils.getShuttleLiftCommand(assignCommand, shuttleThread, false); assignCommand.setCommands(commands); - } else if (shuttleTaskModeType == ShuttleTaskModeType.CHARGE) { - //鍏呯數寮�鍏� - boolean charge = false; - if (shuttleProtocol.getHasCharge()) { - //宸插厖鐢碉紝鍏抽棴鍏呯數 - charge = false; - }else { - //寮�鍚厖鐢� - charge = true; - } - List<ShuttleCommand> commands = shuttleOperaUtils.getShuttleChargeCommand(assignCommand, shuttleThread, charge); + } else if (shuttleTaskModeType == ShuttleTaskModeType.CHARGE_ON) { + //鍏呯數寮� + List<ShuttleCommand> commands = shuttleOperaUtils.getShuttleChargeCommand(assignCommand, shuttleThread, true); + assignCommand.setCommands(commands); + } else if (shuttleTaskModeType == ShuttleTaskModeType.CHARGE_OFF) { + //鍏呯數鍏� + List<ShuttleCommand> commands = shuttleOperaUtils.getShuttleChargeCommand(assignCommand, shuttleThread, false); assignCommand.setCommands(commands); } else if (shuttleTaskModeType == ShuttleTaskModeType.RESET) { //澶嶄綅 diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index 87e09c3..93ba72d 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -1360,7 +1360,7 @@ ShuttleAssignCommand assignCommand = new ShuttleAssignCommand(); assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo());//鍥涘悜绌挎杞﹀彿 assignCommand.setTaskNo(wrkMast.getWrkNo());//浠诲姟鍙� - assignCommand.setTaskMode(ShuttleTaskModeType.CHARGE.id);//鍑哄簱妯″紡 + assignCommand.setTaskMode(ShuttleTaskModeType.CHARGE_ON.id);//鍏呯數寮� assignCommand.setSourceLocNo(shuttleProtocol.getCurrentLocNo());//婧愬簱浣�(灏忚溅褰撳墠浣嶇疆) List<ShuttleCommand> commands = shuttleOperaUtils.getShuttleChargeCommand(assignCommand, shuttleThread, true); @@ -1401,7 +1401,7 @@ ShuttleAssignCommand assignCommand = new ShuttleAssignCommand(); assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo());//鍥涘悜绌挎杞﹀彿 assignCommand.setTaskNo(wrkMast.getWrkNo());//浠诲姟鍙� - assignCommand.setTaskMode(ShuttleTaskModeType.CHARGE.id);//鍑哄簱妯″紡 + assignCommand.setTaskMode(ShuttleTaskModeType.CHARGE_OFF.id);//鍏呯數鍏� assignCommand.setSourceLocNo(shuttleProtocol.getCurrentLocNo());//婧愬簱浣�(灏忚溅褰撳墠浣嶇疆) List<ShuttleCommand> commands = shuttleOperaUtils.getShuttleChargeCommand(assignCommand, shuttleThread, false); diff --git a/src/main/java/com/zy/core/enums/ShuttleTaskModeType.java b/src/main/java/com/zy/core/enums/ShuttleTaskModeType.java index 339f7ab..1475078 100644 --- a/src/main/java/com/zy/core/enums/ShuttleTaskModeType.java +++ b/src/main/java/com/zy/core/enums/ShuttleTaskModeType.java @@ -8,7 +8,7 @@ RESET(3, "鐘舵�佸浣�"), MOVE_LOC_NO(4, "绉诲姩鍒扮洰鏍囧簱浣�"), MOVE_LOC_NO_TASK(5, "绉诲姩鍒扮洰鏍囧簱浣�(鐢熸垚绉诲姩浠诲姟)"), - CHARGE(6, "鍏呯數"), + MOVE_LIFT(7, "绉诲姩鍒版彁鍗囨満"), AVOID(8, "閬胯浠诲姟"), TRANSPORT(9, "鎼繍浠诲姟"), @@ -17,6 +17,8 @@ SHUTTLE_DEMO_OPEN(12, "婕旂ず妯″紡-寮�"), SHUTTLE_DEMO_CLOSE(13, "婕旂ず妯″紡-鍏�"), UPDATE_LOCATION(14, "鏇存柊鍧愭爣"), + CHARGE_ON(15, "鍏呯數-寮�"), + CHARGE_OFF(16, "鍏呯數-鍏�"), ; public Integer id; diff --git a/src/main/webapp/views/shuttle.html b/src/main/webapp/views/shuttle.html index 09f102e..01c3d7f 100644 --- a/src/main/webapp/views/shuttle.html +++ b/src/main/webapp/views/shuttle.html @@ -127,7 +127,8 @@ <div class="button-group"> <button class="item" onclick="shuttleOperator(1)">鎵樼洏椤跺崌</button> <button class="item" onclick="shuttleOperator(2)">鎵樼洏涓嬮檷</button> - <button class="item" onclick="shuttleOperator(6)">鍏呯數寮�鍏�</button> + <button class="item" onclick="shuttleOperator(15)">鍏呯數寮�</button> + <button class="item" onclick="shuttleOperator(16)">鍏呯數鍏�</button> <button class="item" onclick="shuttleOperator(3)">澶嶄綅</button> <button class="item" onclick="shuttleOperator(12)">婕旂ず妯″紡-寮�</button> <button class="item" onclick="shuttleOperator(13)">婕旂ず妯″紡-鍏�</button> -- Gitblit v1.9.1