From 9afb595b24138004879b62eee43ded425b497c58 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期二, 22 九月 2020 12:33:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 6 +++++-
src/main/webapp/views/pipeline.html | 14 ++++++++++++--
src/main/java/com/zy/asrs/controller/CrnController.java | 31 +++++++++++++++++++++++++++++++
src/main/webapp/static/js/common.js | 2 +-
src/main/webapp/views/login.html | 4 ++--
5 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 5bde266..79fda80 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -207,6 +207,7 @@
command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
+ staNoProcess(param, command);
return crnControl(command)?R.ok():R.error();
}
@@ -224,6 +225,7 @@
command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
+ staNoProcess(param, command);
return crnControl(command)?R.ok():R.error();
}
@@ -241,6 +243,7 @@
command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
+ staNoProcess(param, command);
return crnControl(command)?R.ok():R.error();
}
@@ -258,6 +261,7 @@
command.setDestinationPosX(param.getStaNo()); // 鐩爣搴撲綅鎺�
command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
+ staNoProcess(param, command);
return crnControl(command)?R.ok():R.error();
}
@@ -309,6 +313,7 @@
command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
+ staNoProcess(param, command);
return crnControl(command)?R.ok():R.error();
}
@@ -422,4 +427,30 @@
return false;
}
+ private void staNoProcess(CrnOperatorParam param, CrnCommand command){
+ if (param.getSourceStaNo()!=null) {
+ if (param.getSourceStaNo() == 5) {
+ command.setSourcePosX((short) 2); // 婧愬簱浣嶆帓
+ command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
+ command.setSourcePosZ((short) 1); // 婧愬簱浣嶅眰
+ } else if (param.getSourceStaNo() == 6) {
+ command.setSourcePosX((short) 1); // 婧愬簱浣嶆帓
+ command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
+ command.setSourcePosZ((short) 1); // 婧愬簱浣嶅眰
+ }
+ }
+ if (param.getStaNo()!=null) {
+ if (param.getStaNo() == 5) {
+ command.setDestinationPosX((short) 2); // 鐩爣搴撲綅鎺�
+ command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
+ } else if (param.getStaNo() == 6) {
+ command.setDestinationPosX((short) 1); // 鐩爣搴撲綅鎺�
+ command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
+ }
+ }
+ }
+
+
}
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 30500f8..10dc000 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -148,7 +148,8 @@
@ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
public R siteDetlUpdate(@RequestParam Integer siteId,
@RequestParam Short workNo,
- @RequestParam Short staNo){
+ @RequestParam Short staNo,
+ @RequestParam String pakMk){
for (DevpSlave devp : slaveProperties.getDevp()) {
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
Map<Integer, StaProtocol> station = devpThread.getStation();
@@ -161,6 +162,9 @@
if (staNo != null) {
staProtocol.setStaNo(staNo);
}
+ if (pakMk != null) {
+ staProtocol.setPakMk(pakMk.equals("Y"));
+ }
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
if (result) {
return R.ok();
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 2009a2e..53a1d93 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -140,7 +140,7 @@
if (res.code === 200){
callback(res);
} else if (res.code === 403){
- window.location.href = baseUrl+"/login";
+ parent.location.href = baseUrl+"/login";
} else {
layer.msg(res.msg, {icon: 2});
}
diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index b14f0c2..a2af569 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -14,8 +14,8 @@
body.login-bg {
color: #777;
height: 100%;
- background-image: linear-gradient(to right, #ff9569 0%, #e92758 100%);
- /*background-image: linear-gradient(-90deg, #29bdd9 0%, #276ace 100%);*/
+ /*background-image: linear-gradient(to right, #ff9569 0%, #e92758 100%);*/
+ background-image: linear-gradient(-90deg, #a2e7f3 0%, #98baee 100%);
/*background: -webkit-linear-gradient(red, blue); !* Safari 5.1 - 6.0 *!;*/
/*background-image: url("../static/image/login_bg.jpg");*/
/*background-repeat: no-repeat;*/
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 8c19df6..9dd0be1 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -96,6 +96,12 @@
<input id="staNo" name="staNo" type="number" class="layui-input" lay-verify="number" autocomplete="off">
</div>
</div>
+ <div class="form-item">
+ <label class="form-label">鍏ュ簱鏍囪:</label>
+ <div class="form-input">
+ <input id="pakMk" name="pakMk" type="text" class="layui-input" autocomplete="off">
+ </div>
+ </div>
<div class="form-item form-button-container">
<button class="form-button" id="save">淇濆瓨</button>
<button class="form-button" id="cancel" style="background-color: #D0D0D0">鍙栨秷</button>
@@ -280,7 +286,7 @@
offset: 'rt',
anim: 5,
shade: [0],
- area: ['340px', '215px'],
+ area: ['340px', '255px'],
closeBtn: 0,
content: $("#site-detl"),
success: function(layero, index){
@@ -288,12 +294,14 @@
$('#siteId').val(siteId);
$('#workNo').val(res.data.workNo);
$('#staNo').val(res.data.staNo);
+ $('#pakMk').val(res.data.pakMk);
})
},
end: function () {
$('#siteId').val("");
$('#workNo').val("");
$('#staNo').val("");
+ $('#pakMk').val("");
}
})
}
@@ -303,7 +311,8 @@
http.post(baseUrl+ "/site//detl/update", {
siteId: $('#siteId').val(),
workNo: $('#workNo').val(),
- staNo: $('#staNo').val()
+ staNo: $('#staNo').val(),
+ pakMk: $('#pakMk').val()
}, function (res) {
layer.msg("淇敼鎴愬姛",{icon: 1,});
})
@@ -312,6 +321,7 @@
$('#siteId').val("");
$('#workNo').val("");
$('#staNo').val("");
+ $('#pakMk').val("");
layer.close(layerDetl);
})
--
Gitblit v1.9.1