From 5c514485be44d423a39075c0eba68856da8bfb73 Mon Sep 17 00:00:00 2001
From: LSH <1>
Date: 星期二, 14 五月 2024 16:43:44 +0800
Subject: [PATCH] #站点初始化
---
src/main/java/com/zy/asrs/entity/param/BasDevpInitParam.java | 44 ++++++++++++++
src/main/java/com/zy/asrs/controller/BasDevpController.java | 28 +++++++++
src/main/webapp/static/js/basDevp/basDevp.js | 44 ++++++++++++++
src/main/webapp/views/index.html | 8 +-
src/main/webapp/views/basDevp/basDevp.html | 26 ++++++++
src/main/webapp/views/login.html | 2
6 files changed, 147 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasDevpController.java b/src/main/java/com/zy/asrs/controller/BasDevpController.java
index cd89e40..c0c14ac 100644
--- a/src/main/java/com/zy/asrs/controller/BasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/BasDevpController.java
@@ -6,7 +6,10 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.param.BasDevpInitParam;
import com.zy.asrs.service.BasDevpService;
+import com.zy.common.model.Shelves;
import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
@@ -24,6 +27,31 @@
@Autowired
private BasDevpService basDevpService;
+ @RequestMapping(value = "/basDevp/init/auth")
+ @ManagerAuth(memo = "鍒濆鍖栫珯鐐�")
+ public R init(BasDevpInitParam param) {
+ List<BasDevp> list = new ArrayList<>();
+ for (int devNo = param.getStartDev() ; devNo<=param.getEndDev() ; devNo++){
+ BasDevp basDevp = basDevpService.selectById(devNo);
+ if (Cools.isEmpty(basDevp)){
+ BasDevp basDevp1 = new BasDevp();
+ basDevp1.setDevNo(devNo);
+ basDevp1.setInEnable("Y");
+ basDevp1.setOutEnable("Y");
+ basDevp1.setAutoing("Y");
+ basDevp1.setLoading("Y");
+ basDevp1.setCanining("Y");
+ basDevp1.setCanouting("Y");
+ basDevp1.setModiUser(getUserId());
+ basDevp1.setModiTime(new Date());
+ basDevp1.setEmptyMk("N");
+ list.add(basDevp1);
+ }
+ }
+ basDevpService.insertBatch(list);
+ return R.ok("鍒濆鍖栨垚鍔�");
+ }
+
@RequestMapping(value = "/basDevp/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
diff --git a/src/main/java/com/zy/asrs/entity/param/BasDevpInitParam.java b/src/main/java/com/zy/asrs/entity/param/BasDevpInitParam.java
new file mode 100644
index 0000000..57cd9e4
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/BasDevpInitParam.java
@@ -0,0 +1,44 @@
+package com.zy.asrs.entity.param;
+
+import com.core.common.BaseRes;
+import com.core.exception.CoolException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by vincent on 2020/6/13
+ */
+public class BasDevpInitParam {
+
+ // 绔欑偣鍙�
+ // 璧峰绔欑偣鍙�
+ private Integer startDev;
+
+ // 缁堟绔欑偣鍙�
+ private Integer endDev;
+
+
+ public Integer getStartDev() {
+ if (null == startDev) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ return startDev;
+ }
+
+ public void setStartDev(Integer startDev) {
+ this.startDev = startDev;
+ }
+
+ public Integer getEndDev() {
+ if (null == endDev) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ return endDev;
+ }
+
+ public void setEndDev(Integer endDev) {
+ this.endDev = endDev;
+ }
+
+}
diff --git a/src/main/webapp/static/js/basDevp/basDevp.js b/src/main/webapp/static/js/basDevp/basDevp.js
index 535e6e7..af7c113 100644
--- a/src/main/webapp/static/js/basDevp/basDevp.js
+++ b/src/main/webapp/static/js/basDevp/basDevp.js
@@ -200,6 +200,28 @@
}
});
break;
+ case 'init':
+ layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞跺垵濮嬪寲绔欑偣', formType: 1, shadeClose: true}, function(pass, idx){
+ http.get(baseUrl+"/locMast/init/pwd", {pwd: pass}, function (res) {
+ if (res.data) {
+ layer.open({
+ type: 1,
+ title: '鍒濆鍖栫珯鐐�',
+ area: ["400px"],
+ maxmin: true,
+ shadeClose: true,
+ content: $("#resetLocDiv"),
+ success: function (layero, index) {
+
+ }
+ })
+ } else {
+ layer.msg("鍙ｄ护閿欒");
+ }
+ layer.close(idx);
+ })
+ });
+ break;
case 'refreshData':
tableIns.reload({
page: {
@@ -275,6 +297,28 @@
}
});
+ // 鍒濆鍖栦繚瀛�
+ form.on('submit(initDo)', function (data) {
+ $.ajax({
+ url: baseUrl+"/basDevp/init/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ layer.msg(res.msg);
+ layer.closeAll();
+ tableReload(false);
+ } else if (res.code === 403){
+ parent.location.href = "/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+
// 鐩戝惉琛屽伐鍏蜂簨浠�
table.on('tool(basDevp)', function(obj){
var data = obj.data;
diff --git a/src/main/webapp/views/basDevp/basDevp.html b/src/main/webapp/views/basDevp/basDevp.html
index 18d4f9f..1df3f13 100644
--- a/src/main/webapp/views/basDevp/basDevp.html
+++ b/src/main/webapp/views/basDevp/basDevp.html
@@ -35,6 +35,7 @@
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-primary" id="btn-init" lay-event="init">鍒濆鍖�</button>
<button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
</div>
@@ -53,6 +54,31 @@
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
+<!-- 閲嶇疆搴撲綅寮圭獥 -->
+<div id="resetLocDiv" style="margin: 20px 0 10px 30px; display: none">
+ <div class="layui-form layui-form-pane">
+ <!-- 绔欑偣 -->
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">璧锋绔欑偣</label>
+ <div class="layui-input-inline" style="width: 100px;">
+ <input type="text" name="startDev" autocomplete="off" class="layui-input" lay-verify="required|number">
+ </div>
+ <div class="layui-form-mid">-</div>
+ <div class="layui-input-inline" style="width: 100px;">
+ <input type="text" name="endDev" autocomplete="off" class="layui-input" lay-verify="required|number">
+ </div>
+ </div>
+ </div>
+ <div id="prompt" style="text-indent: 10px;">
+ <span class="not-null">鍒濆鍖栫珯鐐癸紝璇疯皑鎱庢搷浣滐紒</span>
+ </div>
+ <!-- 鎸夐挳 -->
+ <div style="text-align: center; margin-top: 20px">
+ <button class="layui-btn layui-btn-radius layui-btn-normal" id="initDo" lay-submit lay-filter="initDo">纭畾</button>
+ </div>
+ </div>
+</div>
</body>
</html>
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 274b0d4..84a617f 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
- <title>寰愬伐姹変簯 - 鑷姩鍖栫珛浣撲粨搴� - AS / RS</title>
+ <title>娴欐睙涓壃绔嬪簱 - 鑷姩鍖栫珛浣撲粨搴� - AS / RS</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -29,7 +29,7 @@
<!-- <img src="../static/image/logo.png" style="display: inline-block; width: 40%;height: auto">-->
<!-- <span style="margin-top: 0; letter-spacing: 10px">涓壃绔嬪簱</span>-->
<img src="../static/image/favicon.ico"/>
- <cite>寰愬伐姹変簯</cite>
+ <cite>娴欐睙涓壃绔嬪簱</cite>
</div>
<ul class="layui-nav layui-layout-left">
@@ -78,7 +78,7 @@
<div class="layui-body"></div>
<!-- 搴曢儴 -->
<div class="layui-footer layui-text">
- copyright 漏 2023 <a href="https://zoneyung.com/" target="_blank">寰愬伐姹変簯</a> all rights reserved.
+ copyright 漏 2023 <a href="https://zoneyung.com/" target="_blank">娴欐睙涓壃绔嬪簱</a> all rights reserved.
<span class="pull-right">Version 1.0.0</span>
</div>
@@ -94,7 +94,7 @@
<script type="text/javascript" src="../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../static/js/common.js"></script>
<script>
- console.log('%c 寰愬伐姹変簯 %c 1.0.0','background-color:rgb(53,73,94);color: #fff;border-radius:2px 0 0 2px;padding:2px 4px;','background-color:rgb(25,190,107);color: #fff;border-radius:0 2px 2px 0;padding:2px 4px;font: 9pt "Apercu Regular", Georgia, "Times New Roman", Times, serif;');
+ console.log('%c 娴欐睙涓壃绔嬪簱 %c 1.0.0','background-color:rgb(53,73,94);color: #fff;border-radius:2px 0 0 2px;padding:2px 4px;','background-color:rgb(25,190,107);color: #fff;border-radius:0 2px 2px 0;padding:2px 4px;font: 9pt "Apercu Regular", Georgia, "Times New Roman", Times, serif;');
$(function () {
if ("" === localStorage.getItem('token')) {
top.location.href = baseUrl + "/login";
diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index 3d0d638..3e3f1e0 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
- <title>寰愬伐姹変簯 鈹� login of zoneyung wms</title>
+ <title>娴欐睙涓壃绔嬪簱 鈹� login of zoneyung wms</title>
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1">
<meta name="description" content="study of Instancing with three.js">
<meta name="keywords" content="undefined, Yoichi Kobayashi, WebGL, three.js">
--
Gitblit v1.9.1