From ec37295a8adbb8a6a850e1fddf5957ae5ad662e3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 19 八月 2020 08:52:18 +0800
Subject: [PATCH] #
---
src/main/webapp/views/crn.html | 4 ++--
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/controller/CrnController.java | 37 ++++++++++++++++++-------------------
3 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 79d8420..a974cd1 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -31,7 +31,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
/**
* 鍫嗗灈鏈烘帴鍙�
@@ -237,23 +236,6 @@
return crnControl(command)?R.ok():R.error();
}
- @ManagerAuth(memo = "鍧愭爣绉诲姩")
- @PostMapping("/operator/coorMove")
- public R crnCoorMove(CrnOperatorParam param){
- CrnCommand command = new CrnCommand();
- command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
- command.setTaskNo((short) 0); // 宸ヤ綔鍙�
- command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
- command.setTaskMode(CrnTaskModeType.OFFSET_MOVE); // 浠诲姟妯″紡
- command.setSourcePosX((short) 0); // 婧愬簱浣嶆帓
- command.setSourcePosY(param.getSourceBay()); // 婧愬簱浣嶅垪
- command.setSourcePosZ(param.getSourceLev()); // 婧愬簱浣嶅眰
- command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
- command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
- command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
- return crnControl(command)?R.ok():R.error();
- }
-
@ManagerAuth(memo = "鍥炲師鐐�")
@PostMapping("/operator/bacOrigin")
public R crnBacOrigin(CrnOperatorParam param){
@@ -267,7 +249,7 @@
command.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰
command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
- command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
+ command.setDestinationPosZ((short) 0); // 鐩爣搴撲綅灞�
return crnControl(command)?R.ok():R.error();
}
@@ -288,6 +270,23 @@
return crnControl(command)?R.ok():R.error();
}
+ @ManagerAuth(memo = "鍧愭爣绉诲姩")
+ @PostMapping("/operator/coorMove")
+ public R crnCoorMove(CrnOperatorParam param){
+ CrnCommand command = new CrnCommand();
+ command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+ command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+ command.setTaskMode(CrnTaskModeType.OFFSET_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/taskComplete")
public R crnTaskComplete(CrnOperatorParam param){
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 a8a9195..6b2276e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -516,7 +516,7 @@
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
// 鐘舵�侊細绛夊緟纭 骞朵笖 浠诲姟瀹屾垚浣� = 1
- if (crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.taskFinish == 1 && crnProtocol.getTaskNo() != 0) {
+ if (crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.getTaskNo() != 0) {
// 鑾峰彇鍏ュ簱寰呯‘璁ゅ伐浣滄。
WrkMast wrkMast = wrkMastMapper.selectPakInStep3(crnProtocol.getTaskNo().intValue());
if (wrkMast == null) {
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 4e761e7..a8fda83 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -90,7 +90,7 @@
<span class="select-title">鍫嗗灈鏈哄彿</span>
<div class="select-container">
<label><input type="radio" name="crnSelect" value="1" checked> 1鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="2"> 2鍙峰爢鍨涙満</label>
+<!-- <label><input type="radio" name="crnSelect" value="2"> 2鍙峰爢鍨涙満</label>-->
</div>
</div>
<!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
@@ -148,9 +148,9 @@
<button class="item" onclick="take()">鍑哄簱</button>
<button class="item" onclick="stockMove()">搴撲綅杞Щ</button>
<button class="item" onclick="siteMove()">绔欏埌绔�</button>
- <button class="item" onclick="coorMove()">鍧愭爣绉诲姩</button>
<button class="item" onclick="bacOrigin()">鍥炲師鐐�</button>
<button class="item" onclick="reverseOrigin()">鍙嶅師鐐�</button>
+ <button class="item" onclick="coorMove()">鍧愭爣绉昏</button>
<button class="item" onclick="taskComplete()">浠诲姟瀹屾垚</button>
<!-- <button class="item" onclick="pause()">鏆傚仠</button>-->
<!-- <button class="item" onclick="boot()">鍚姩</button>-->
--
Gitblit v1.9.1