From f70d87c8d714bb653841d705b5803f3e53b32671 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 25 八月 2022 16:20:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SteController.java | 32 +++++++++-
src/main/webapp/static/css/ste.css | 1
src/main/webapp/views/ste.html | 80 +++++++++++++++-----------
src/main/java/com/zy/asrs/domain/vo/SteDataVo.java | 25 ++++++++
4 files changed, 101 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SteController.java b/src/main/java/com/zy/asrs/controller/SteController.java
index 6cfc5dd..2dfef4f 100644
--- a/src/main/java/com/zy/asrs/controller/SteController.java
+++ b/src/main/java/com/zy/asrs/controller/SteController.java
@@ -10,6 +10,7 @@
import com.zy.asrs.domain.param.SteOperatorParam;
import com.zy.asrs.domain.vo.SteMsgTableVo;
import com.zy.asrs.domain.vo.SteStateTableVo;
+import com.zy.asrs.domain.vo.SteDataVo;
import com.zy.asrs.entity.BasSte;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.BasSteService;
@@ -27,9 +28,7 @@
import com.zy.core.thread.SteThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
@@ -151,6 +150,33 @@
return R.ok().add(str.toString());
}
+ @GetMapping("/detl/{steNo}")
+ public R steDetl(@PathVariable("steNo") Integer steNo){
+ SteDataVo vo = new SteDataVo();
+ for (SteSlave ste : slaveProperties.getSte()) {
+ if (steNo.equals(ste.getId())) {
+ vo.setSteNo(ste.getId());
+ BasSte basSte = basSteService.selectById(ste.getId());
+ if (!Cools.isEmpty(basSte)) {
+ vo.setRow(basSte.getRow());
+ vo.setBay(basSte.getBay());
+ vo.setLev(basSte.getLev());
+ vo.setCrnNo(basSte.getCrnNo());
+ vo.setWorkNo(basSte.getWrkNo());
+ }
+ break;
+ }
+ }
+ return R.ok().add(vo);
+ }
+
+ @PostMapping("/detl/update")
+ @ManagerAuth
+ public R steUpdate(SteDataVo vo){
+
+ return R.ok();
+ }
+
/****************************************************************/
/************************** 鎵嬪姩鎿嶄綔 ******************************/
diff --git a/src/main/java/com/zy/asrs/domain/vo/SteDataVo.java b/src/main/java/com/zy/asrs/domain/vo/SteDataVo.java
new file mode 100644
index 0000000..71ebde7
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/SteDataVo.java
@@ -0,0 +1,25 @@
+package com.zy.asrs.domain.vo;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2020-06-02
+ */
+@Data
+public class SteDataVo {
+
+ // 绌挎杞﹀彿
+ private Integer steNo;
+
+ // 宸ヤ綔鍙�
+ private Integer workNo;
+
+ private Integer row;
+
+ private Integer bay;
+
+ private Integer lev;
+
+ private Integer crnNo;
+
+}
diff --git a/src/main/webapp/static/css/ste.css b/src/main/webapp/static/css/ste.css
index d672224..75d4835 100644
--- a/src/main/webapp/static/css/ste.css
+++ b/src/main/webapp/static/css/ste.css
@@ -302,6 +302,7 @@
border-radius: 3px;
padding: 5px 8px;
width: 150px;
+ height: 30px;
font-size: 14px;
font-weight: bolder;
}
diff --git a/src/main/webapp/views/ste.html b/src/main/webapp/views/ste.html
index aa423f6..4555227 100644
--- a/src/main/webapp/views/ste.html
+++ b/src/main/webapp/views/ste.html
@@ -23,18 +23,15 @@
<div class="command-log">
<div data-steNo="1" class="ste-command-item" style="margin-top: 30px">
<label>1#</label>
- <button class="demoBtn pos-btn">淇敼浣嶇疆</button>
- <button class="demoBtn crn-btn">鍏宠仈鍫嗗灈鏈�</button>
+ <button class="demoBtn pos-btn">鏁版嵁缁存姢</button>
</div>
<div data-steNo="2" class="ste-command-item" style="margin-top: 30px">
<label>2#</label>
- <button class="demoBtn pos-btn">淇敼浣嶇疆</button>
- <button class="demoBtn crn-btn">鍏宠仈鍫嗗灈鏈�</button>
+ <button class="demoBtn pos-btn">鏁版嵁缁存姢</button>
</div>
<div data-steNo="3" class="ste-command-item" style="margin-top: 30px">
<label>3#</label>
- <button class="demoBtn pos-btn">淇敼浣嶇疆</button>
- <button class="demoBtn crn-btn">鍏宠仈鍫嗗灈鏈�</button>
+ <button class="demoBtn pos-btn">鏁版嵁缁存姢</button>
</div>
</div>
<!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
@@ -138,9 +135,9 @@
<div id="ste-detl" style="display: none">
<form>
<div class="form-item">
- <label class="form-label">绔欏彿:</label>
+ <label class="form-label">绌挎杞﹀彿:</label>
<div class="form-input">
- <input id="siteId" name="siteId" class="layui-input" lay-verify="required|number" autocomplete="off" disabled="disabled">
+ <input id="steNo" name="steNo" class="layui-input" lay-verify="required|number" autocomplete="off" disabled="disabled">
</div>
</div>
<div class="form-item">
@@ -150,15 +147,27 @@
</div>
</div>
<div class="form-item">
- <label class="form-label">鐩爣绔�:</label>
+ <label class="form-label">鎺�:</label>
<div class="form-input">
- <input id="staNo" name="staNo" type="number" class="layui-input" lay-verify="number" autocomplete="off">
+ <input id="row" name="row" type="number" class="layui-input" lay-verify="number" autocomplete="off">
</div>
</div>
<div class="form-item">
- <label class="form-label">鍏ュ簱鏍囪:</label>
+ <label class="form-label">鍒�:</label>
<div class="form-input">
- <input id="pakMk" name="pakMk" type="text" class="layui-input" autocomplete="off">
+ <input id="bay" name="bay" type="text" class="layui-input" autocomplete="off">
+ </div>
+ </div>
+ <div class="form-item">
+ <label class="form-label">灞�:</label>
+ <div class="form-input">
+ <input id="lev" name="lev" type="text" class="layui-input" autocomplete="off">
+ </div>
+ </div>
+ <div class="form-item">
+ <label class="form-label">鍫嗗灈鏈�:</label>
+ <div class="form-input">
+ <input id="crnNo" name="crnNo" type="text" class="layui-input" autocomplete="off">
</div>
</div>
<div class="form-item form-button-container">
@@ -169,15 +178,6 @@
</div>
</body>
</html>
-<script>
- layui.config({
- base: baseUrl + "/static/layui/lay/modules/"
- }).extend({
- dropdown: 'dropdown/dropdown',
- }).use(['dropdown'],function () {
- var dropdown = layui.dropdown;
- })
-</script>
<script>
// 绌虹櫧琛屾暟
var steStateTableBlankRows = 0;
@@ -226,29 +226,41 @@
offset: [$(this).offset().top + 30 + 'px', $(this).offset().left + 'px'],
anim: 5,
shade: [0],
- area: ['340px', '255px'],
+ area: ['310px', '340px'],
closeBtn: 0,
content: $("#ste-detl"),
success: function(layero, index){
- // http.get(baseUrl+ "/site/detl/"+siteId, null, function (res) {
- // $('#siteId').val(siteId);
- // $('#workNo').val(res.data.workNo);
- // $('#staNo').val(res.data.staNo);
- // $('#pakMk').val(res.data.pakMk);
- // })
+ http.get(baseUrl+ "/ste/detl/"+steNo, null, function (res) {
+ $('#steNo').val(steNo);
+ $('#workNo').val(res.data.workNo);
+ $('#row').val(res.data.row);
+ $('#bay').val(res.data.bay);
+ $('#lev').val(res.data.lev);
+ $('#crnNo').val(res.data.crnNo);
+ })
},
end: function () {
- $('#siteId').val("");
+ $('#steNo').val("");
$('#workNo').val("");
- $('#staNo').val("");
- $('#pakMk').val("");
+ $('#row').val("");
+ $('#bay').val("");
+ $('#lev').val("");
+ $('#crnNo').val("");
}
})
})
- $(document).on('click ','.crn-btn', function () {
- let steNo = Number($(this).parent().attr("data-steNo"));
- console.log(steNo)
+ $(document).on('click ','#save', function () {
+ http.post(baseUrl+ "/ste/detl/update", {
+ steNo: $('#steNo').val(),
+ workNo: $('#workNo').val(),
+ row: $('#row').val(),
+ bay: $('#bay').val(),
+ lev: $('#lev').val(),
+ crnNo: $('#crnNo').val(),
+ }, function (res) {
+ layer.msg("淇敼鎴愬姛",{icon: 1,});
+ })
})
// 绌挎杞︿俊鎭〃鑾峰彇 ---- 琛ㄤ竴
--
Gitblit v1.9.1