From 0d51d316d7326558fadaf98a1d5a838bc7109bab Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期二, 02 六月 2020 16:26:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/client/domain/param/CrnOperatorParam.java | 106 +++++++++++++++
src/main/webapp/views/crn.html | 142 +++++++++++++++++---
src/main/webapp/static/js/common.js | 65 +++++++++
src/main/java/com/zy/client/controller/CrnController.java | 67 +++++++++
4 files changed, 356 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/client/controller/CrnController.java b/src/main/java/com/zy/client/controller/CrnController.java
index 50ac8c4..f0acb3e 100644
--- a/src/main/java/com/zy/client/controller/CrnController.java
+++ b/src/main/java/com/zy/client/controller/CrnController.java
@@ -2,10 +2,11 @@
import com.core.annotations.ManagerAuth;
import com.core.common.R;
+import com.zy.client.domain.enums.CrnStatusType;
+import com.zy.client.domain.param.CrnOperatorParam;
import com.zy.client.domain.vo.CommandLogVo;
import com.zy.client.domain.vo.CrnMsgTableVo;
import com.zy.client.domain.vo.CrnStateTableVo;
-import com.zy.client.domain.enums.CrnStatusType;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -90,4 +91,68 @@
return R.ok().add(str);
}
+ /****************************************************************/
+ /************************** 鎵嬪姩鎿嶄綔 ******************************/
+ /****************************************************************/
+
+ @ManagerAuth(memo = "鍏ュ簱")
+ @PostMapping("/operator/put")
+ public R crnPut(CrnOperatorParam param){
+ return R.ok("鍏ュ簱鎴愬姛");
+ }
+
+ @ManagerAuth(memo = "鍑哄簱")
+ @PostMapping("/operator/take")
+ public R crnTake(CrnOperatorParam param){
+ return R.ok("鍑哄簱鎴愬姛");
+ }
+
+ @ManagerAuth(memo = "搴撲綅杞Щ")
+ @PostMapping("/operator/stockMove")
+ public R crnStockMove(CrnOperatorParam param){
+ return R.ok("搴撲綅杞Щ鎴愬姛");
+ }
+
+ @ManagerAuth(memo = "绔欏埌绔�")
+ @PostMapping("/operator/siteMove")
+ public R crnSiteMove(CrnOperatorParam param){
+ return R.ok("绔欏埌绔欐垚鍔�");
+ }
+
+ @ManagerAuth(memo = "鍧愭爣绉诲姩")
+ @PostMapping("/operator/coorMove")
+ public R crnCoorMove(CrnOperatorParam param){
+ return R.ok("鍧愭爣绉诲姩鎴愬姛");
+ }
+
+ @ManagerAuth(memo = "鍥炲師鐐�")
+ @PostMapping("/operator/bacOrigin")
+ public R crnBacOrigin(CrnOperatorParam param){
+ return R.ok("鍥炲師鐐规垚鍔�");
+ }
+
+ @ManagerAuth(memo = "浠诲姟瀹屾垚")
+ @PostMapping("/operator/taskComplete")
+ public R crnTaskComplete(CrnOperatorParam param){
+ return R.ok("浠诲姟瀹屾垚");
+ }
+
+ @ManagerAuth(memo = "鏆傚仠")
+ @PostMapping("/operator/pause")
+ public R crnPause(CrnOperatorParam param){
+ return R.ok("鏆傚仠鎴愬姛");
+ }
+
+ @ManagerAuth(memo = "鍚姩")
+ @PostMapping("/operator/boot")
+ public R crnBoot(CrnOperatorParam param){
+ return R.ok("鍚姩鎴愬姛");
+ }
+
+ @ManagerAuth(memo = "娓呴櫎鍛戒护")
+ @PostMapping("/operator/clearCommand")
+ public R crnClearCommand(CrnOperatorParam param){
+ return R.ok("娓呴櫎鍛戒护鎴愬姛");
+ }
+
}
diff --git a/src/main/java/com/zy/client/domain/param/CrnOperatorParam.java b/src/main/java/com/zy/client/domain/param/CrnOperatorParam.java
new file mode 100644
index 0000000..972284f
--- /dev/null
+++ b/src/main/java/com/zy/client/domain/param/CrnOperatorParam.java
@@ -0,0 +1,106 @@
+package com.zy.client.domain.param;
+
+/**
+ * Created by vincent on 2020-06-02
+ */
+public class CrnOperatorParam {
+
+ // 鍫嗗灈鏈哄彿
+ private String crnNo;
+
+ // 婧愮珯
+ private String sourceStaNo;
+
+ // 婧愬簱浣�-鎺�
+ private String sourceRow;
+
+ // 婧愬簱浣�-鍒�
+ private String sourceBay;
+
+ // 婧愬簱浣�-灞�
+ private String sourceLev;
+
+ // 鐩爣绔�
+ private String staNo;
+
+ // 鐩爣搴撲綅-鎺�
+ private String row;
+
+ // 鐩爣搴撲綅-鍒�
+ private String bay;
+
+ // 鐩爣搴撲綅-灞�
+ private String lev;
+
+ public String getCrnNo() {
+ return crnNo;
+ }
+
+ public void setCrnNo(String crnNo) {
+ this.crnNo = crnNo;
+ }
+
+ public String getSourceStaNo() {
+ return sourceStaNo;
+ }
+
+ public void setSourceStaNo(String sourceStaNo) {
+ this.sourceStaNo = sourceStaNo;
+ }
+
+ public String getSourceRow() {
+ return sourceRow;
+ }
+
+ public void setSourceRow(String sourceRow) {
+ this.sourceRow = sourceRow;
+ }
+
+ public String getSourceBay() {
+ return sourceBay;
+ }
+
+ public void setSourceBay(String sourceBay) {
+ this.sourceBay = sourceBay;
+ }
+
+ public String getSourceLev() {
+ return sourceLev;
+ }
+
+ public void setSourceLev(String sourceLev) {
+ this.sourceLev = sourceLev;
+ }
+
+ public String getStaNo() {
+ return staNo;
+ }
+
+ public void setStaNo(String staNo) {
+ this.staNo = staNo;
+ }
+
+ public String getRow() {
+ return row;
+ }
+
+ public void setRow(String row) {
+ this.row = row;
+ }
+
+ public String getBay() {
+ return bay;
+ }
+
+ public void setBay(String bay) {
+ this.bay = bay;
+ }
+
+ public String getLev() {
+ return lev;
+ }
+
+ public void setLev(String lev) {
+ this.lev = lev;
+ }
+}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index c3a06a1..fa66fe0 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -94,3 +94,68 @@
}
}
+
+
+
+// http璇锋眰
+!function (n) {
+ "use strict";
+
+ var http = {
+ toAjax: function (params) {
+ $.ajax(params);
+ },
+ get: function (url, data, callback) {
+ http.toAjax({
+ method: 'GET',
+ url: url,
+ data: data,
+ dataType: 'json',
+ header: {'Content-Type': 'application/json'},
+ timeout: 10000,
+ cache: false,
+ success: function (result) {
+ callback(result);
+ },
+ error: function (res, type) {
+
+ }
+ })
+ },
+ post: function (url, param, callback, type) {
+ var headerType;
+ if (type === 'json') {
+ headerType = {'Content-Type': 'application/json'}
+ } else {
+ headerType = {'Content-Type': 'application/x-www-form-urlencoded'}
+ }
+ headerType['token'] = localStorage.getItem('token');
+ http.toAjax({
+ method: 'POST',
+ url: url,
+ data: param,
+ dataType: 'json',
+ headers: headerType,
+ timeout: 10000,
+ cache: false,
+ success: function (res) {
+ if (res.code === 200){
+ callback(res);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/login";
+ } else {
+ alert(res.msg);
+ }
+ },
+ error: function (res, type) {
+
+ }
+ })
+ },
+ };
+
+
+ "function" == typeof define && define.amd ? define(function () {
+ return http
+ }) : "object" == typeof module && module.exports ? module.exports = http : n.http = http
+}(this);
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 6eb1082..8a1ebca 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -87,8 +87,8 @@
<div id="crn-select" class="operator-item">
<span class="select-title">鍫嗗灈鏈哄彿</span>
<div class="select-container">
- <label><input type="radio" name="crn" value="1" checked> 1鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crn" value="2"> 2鍙峰爢鍨涙満</label>
+ <label><input type="radio" name="crnSelect" value="1" checked> 1鍙峰爢鍨涙満</label>
+ <label><input type="radio" name="crnSelect" value="2"> 2鍙峰爢鍨涙満</label>
</div>
</div>
<!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
@@ -97,19 +97,19 @@
<div class="select-container">
<div class="select-container-item">
<span>绔�</span>
- <label><input type="number" name="points" min="0" /></label>
+ <label><input id="sourceStaNo" type="number" name="points" min="0" /></label>
</div>
<div class="select-container-item">
<span>鎺�</span>
- <label><input type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
+ <label><input id="sourceRow" type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
</div>
<div class="select-container-item">
<span>鍒�</span>
- <label><input type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
+ <label><input id="sourceBay" type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
</div>
<div class="select-container-item">
<span>灞�</span>
- <label><input type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
+ <label><input id="sourceLev" type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
</div>
</div>
</div>
@@ -119,19 +119,19 @@
<div class="select-container">
<div class="select-container-item">
<span>绔�</span>
- <label><input type="number" name="points" min="0" /></label>
+ <label><input id="staNo" type="number" name="points" min="0" /></label>
</div>
<div class="select-container-item">
<span>鎺�</span>
- <label><input type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
+ <label><input id="row" type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
</div>
<div class="select-container-item">
<span>鍒�</span>
- <label><input type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
+ <label><input id="bay" type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
</div>
<div class="select-container-item">
<span>灞�</span>
- <label><input type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
+ <label><input id="lev" type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
</div>
</div>
</div>
@@ -142,16 +142,16 @@
<fieldset>
<legend>鎵嬪姩鎿嶄綔</legend>
<div class="button-group">
- <button class="item">鍏ュ簱</button>
- <button class="item">鍑哄簱</button>
- <button class="item">搴撲綅杞Щ</button>
- <button class="item">绔欏埌绔�</button>
- <button class="item">鍧愭爣绉诲姩</button>
- <button class="item">鍥炲師鐐�</button>
- <button class="item">浠诲姟瀹屾垚</button>
- <button class="item">鏆傚仠</button>
- <button class="item">鍚姩</button>
- <button class="item">娓呴櫎鍛戒护</button>
+ <button class="item" onclick="put()">鍏ュ簱</button>
+ <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="taskComplete()">浠诲姟瀹屾垚</button>
+ <button class="item" onclick="pause()">鏆傚仠</button>
+ <button class="item" onclick="boot()">鍚姩</button>
+ <button class="item" onclick="clearCommand()">娓呴櫎鍛戒护</button>
</div>
</fieldset>
</div>
@@ -172,6 +172,7 @@
// 鍒濆鍖�
var crnOutputDom = document.getElementById("crn-output");
$(document).ready(function() {
+ getCommandLog();
initCrnStateTable();
getCrnStateInfo();
initCrnMsgTable();
@@ -258,9 +259,9 @@
success: function (res) {
if (res.code === 200){
var table = res.data;
- if (table.length > crnStateTableBlankRows && table.length !== crnStateTableFullRows) {
+ if (table.length > crnStateTableBlankRows && table.length !== crnMsgTableFullRows) {
initCrnStateTable(table.length-crnStateTableBlankRows);
- crnStateTableFullRows = table.length;
+ crnMsgTableFullRows = table.length;
}
for (var i=1;i<=table.length;i++){
var tr = tableEl.find("tr").eq(i);
@@ -284,7 +285,102 @@
});
}
- // 杈撻�佽澶囨棩蹇楄緭鍑�
+ // 鍫嗗灈鏈烘墜鍔ㄦ搷浣滃尯 -----------------------------------------------------------------------
+
+ function getReqParam() {
+ var crnNo = $('input[name="crnSelect"]:checked').val();
+ var sourceStaNo = $('#sourceStaNo').val();
+ var sourceRow = $('#sourceRow').val();
+ var sourceBay = $('#sourceBay').val();
+ var sourceLev = $('#sourceLev').val();
+ var staNo = $('#staNo').val();
+ var row = $('#row').val();
+ var bay = $('#bay').val();
+ var lev = $('#lev').val();
+ return {
+ crnNo: crnNo,
+ sourceStaNo: sourceStaNo,
+ sourceRow: sourceRow,
+ sourceBay: sourceBay,
+ sourceLev: sourceLev,
+ staNo: staNo,
+ row: row,
+ bay: bay,
+ lev: lev
+ };
+ }
+
+ // 鍏ュ簱
+ function put() {
+ http.post(baseUrl+"/crn/operator/put", getReqParam(), function (res) {
+ alert(res.msg);
+ });
+ }
+
+ // 鍑哄簱
+ function take() {
+ http.post(baseUrl+"/crn/operator/take", getReqParam(), function (res) {
+ alert(res.msg);
+ });
+ }
+
+ // 搴撲綅杞Щ
+ function stockMove() {
+ http.post(baseUrl+"/crn/operator/stockMove", getReqParam(), function (res) {
+ alert(res.msg);
+ });
+ }
+
+ // 绔欏埌绔�
+ function siteMove() {
+ http.post(baseUrl+"/crn/operator/siteMove", getReqParam(), function (res) {
+ alert(res.msg);
+ });
+ }
+
+ // 鍧愭爣绉诲姩
+ function coorMove() {
+ http.post(baseUrl+"/crn/operator/coorMove", getReqParam(), function (res) {
+ alert(res.msg);
+ });
+ }
+
+ // 鍥炲師鐐�
+ function bacOrigin() {
+ http.post(baseUrl+"/crn/operator/bacOrigin", getReqParam(), function (res) {
+ alert(res.msg);
+ });
+ }
+
+ // 浠诲姟瀹屾垚
+ function taskComplete() {
+ http.post(baseUrl+"/crn/operator/taskComplete", getReqParam(), function (res) {
+ alert(res.msg);
+ });
+ }
+
+ // 鏆傚仠
+ function pause() {
+ http.post(baseUrl+"/crn/operator/pause", getReqParam(), function (res) {
+ alert(res.msg);
+ });
+ }
+
+ // 鍚姩
+ function boot() {
+ http.post(baseUrl+"/crn/operator/boot", getReqParam(), function (res) {
+ alert(res.msg);
+ });
+ }
+
+ // 娓呴櫎鍛戒护
+ function clearCommand() {
+ http.post(baseUrl+"/crn/operator/clearCommand", getReqParam(), function (res) {
+ alert(res.msg);
+ });
+ }
+
+ // 杈撻�佽澶囨棩蹇楄緭鍑� -----------------------------------------------------------------------
function getSiteOutput() {
$.ajax({
url: baseUrl + "/crn/output/site",
--
Gitblit v1.9.1