From e9cdecd287c7ab88ae4b4ad28a9f9343ed9ae23f Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期四, 08 九月 2022 13:38:26 +0800 Subject: [PATCH] # --- src/main/webapp/views/crn.html | 7 +++++++ src/main/java/com/zy/asrs/controller/CrnController.java | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java index 6376556..a5df21b 100644 --- a/src/main/java/com/zy/asrs/controller/CrnController.java +++ b/src/main/java/com/zy/asrs/controller/CrnController.java @@ -290,6 +290,23 @@ return crnControl(command)?R.ok():R.error(); } + @ManagerAuth(memo = "绉昏溅") + @PostMapping("/operator/steMove") + public R crnSteMove(CrnOperatorParam param){ + CrnCommand command = new CrnCommand(); + command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� + command.setTaskNo((short) 0); // 宸ヤ綔鍙� + command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� + command.setTaskMode(CrnTaskModeType.STE_MOVE); // 浠诲姟妯″紡 + command.setSourcePosX(param.getSourceRow()); // 婧愬簱浣嶆帓 + command.setSourcePosY(param.getSourceBay()); // 婧愬簱浣嶅垪 + command.setSourcePosZ(param.getSourceLev()); // 婧愬簱浣嶅眰 + command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺� + command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒� + command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞� + return crnControl(command)?R.ok():R.error(); + } + @ManagerAuth(memo = "绔欏埌绔�") @PostMapping("/operator/siteMove") public R crnSiteMove(CrnOperatorParam param){ diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html index 7c3986f..95b2c06 100644 --- a/src/main/webapp/views/crn.html +++ b/src/main/webapp/views/crn.html @@ -195,6 +195,7 @@ <button class="item" onclick="put()">鍏ュ簱</button> <button class="item" onclick="take()">鍑哄簱</button> <button class="item" onclick="stockMove()">搴撲綅杞Щ</button> + <button class="item" onclick="steMove()">绉昏溅</button> <button class="item" onclick="siteMove()">绔欏埌绔�</button> <!-- <button class="item" onclick="bacOrigin()">鍥炲師鐐�</button>--> <!-- <button class="item" onclick="reverseOrigin()">鍙嶅師鐐�</button>--> @@ -402,6 +403,12 @@ }); } + function steMove() { + http.post(baseUrl+"/crn/operator/steMove", getReqParam(), function (res) { + layer.msg(res.msg); + }); + } + // 绔欏埌绔� function siteMove() { http.post(baseUrl+"/crn/operator/siteMove", getReqParam(), function (res) { -- Gitblit v1.9.1