From f517c3f941d7c7e40b8d6dadc02fea97fa440fd1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 13 六月 2020 09:41:00 +0800
Subject: [PATCH] #
---
src/main/webapp/views/locMast/locMast.html | 26 +++--
src/main/java/com/zy/asrs/controller/LocMastController.java | 48 +++++++++
src/main/java/com/zy/asrs/entity/param/LocMastInitParam.java | 119 +++++++++++++++++++++++
src/main/webapp/static/js/locMast/locMast.js | 64 +++++++-----
src/main/java/com/zy/common/service/CommonService.java | 2
5 files changed, 218 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 7e061ad..5c8122e 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -5,14 +5,16 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.service.LocMastService;
-import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.param.LocMastInitParam;
+import com.zy.asrs.service.LocMastService;
+import com.zy.common.model.Shelves;
+import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -129,4 +131,44 @@
return R.ok();
}
+ @RequestMapping(value = "/locMast/init/auth")
+ @ManagerAuth(memo = "鍒濆鍖栧簱浣�")
+// @Transactional
+ public R init(LocMastInitParam param) {
+ List<LocMast> list = new ArrayList<>();
+ for (int r=param.getStartRow(); r<=param.getEndRow(); r++){
+ for (int b=param.getStartBay(); b<=param.getEndBay(); b++) {
+ for (int l=param.getStartLev(); l<=param.getEndLev(); l++) {
+ // 鑾峰彇搴撲綅鍙�
+ String locNo = String.format("%02d", r) + String.format("%03d", b) + String.format("%02d", l);
+ // 鑾峰彇鍫嗗灈鏈哄彿
+ int crnNo = 0;
+ Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount());
+ for (List<Integer> node : shelves.nodes){
+ if (node.contains(r)) {
+ crnNo = shelves.nodes.indexOf(node) + 1;
+ }
+ }
+ LocMast locMast = new LocMast();
+ locMast.setLocNo(locNo);
+ locMast.setLocType("O");
+ locMast.setRow1(r); // 鎺�
+ locMast.setBay1(b); // 鍒�
+ locMast.setLev1(l); // 灞�
+ locMast.setCrnNo(crnNo); // 鍫嗗灈鏈�
+ if (null != param.getWhsType()) {
+ locMast.setWhsType(Long.valueOf(param.getWhsType()));
+ }
+ locMast.setAppeUser(getUserId());
+ locMast.setAppeTime(new Date());
+ locMast.setModiUser(getUserId());
+ locMast.setModiTime(new Date());
+ list.add(locMast);
+ }
+ }
+ }
+ locMastService.delete(new EntityWrapper<>());
+ locMastService.insertBatch(list);
+ return R.ok("鍒濆鍖栨垚鍔�");
+ }
}
diff --git a/src/main/java/com/zy/asrs/entity/param/LocMastInitParam.java b/src/main/java/com/zy/asrs/entity/param/LocMastInitParam.java
new file mode 100644
index 0000000..7f22809
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/LocMastInitParam.java
@@ -0,0 +1,119 @@
+package com.zy.asrs.entity.param;
+
+import com.core.common.BaseRes;
+import com.core.exception.CoolException;
+
+/**
+ * Created by vincent on 2020/6/13
+ */
+public class LocMastInitParam {
+
+ // 璧峰鎺�
+ private Integer startRow;
+
+ // 缁堟鎺�
+ private Integer endRow;
+
+ // 璧峰鍒�
+ private Integer startBay;
+
+ // 缁堟鍒�
+ private Integer endBay;
+
+ // 璧峰灞�
+ private Integer startLev;
+
+ // 缁堟灞�
+ private Integer endLev;
+
+ // 鍫嗗灈鏈烘暟閲�
+ private Integer crnAmount;
+
+ // 搴撲綅绫诲瀷锛� 1锛氫綆搴撲綅 2锛氶珮搴撲綅
+ private Integer whsType;
+
+ public Integer getStartRow() {
+ if (null == startRow) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ return startRow;
+ }
+
+ public void setStartRow(Integer startRow) {
+ this.startRow = startRow;
+ }
+
+ public Integer getEndRow() {
+ if (null == endRow) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ return endRow;
+ }
+
+ public void setEndRow(Integer endRow) {
+ this.endRow = endRow;
+ }
+
+ public Integer getStartBay() {
+ if (null == startBay) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ return startBay;
+ }
+
+ public void setStartBay(Integer startBay) {
+ this.startBay = startBay;
+ }
+
+ public Integer getEndBay() {
+ if (null == endBay) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ return endBay;
+ }
+
+ public void setEndBay(Integer endBay) {
+ this.endBay = endBay;
+ }
+
+ public Integer getStartLev() {
+ if (null == startLev) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ return startLev;
+ }
+
+ public void setStartLev(Integer startLev) {
+ this.startLev = startLev;
+ }
+
+ public Integer getEndLev() {
+ if (null == endLev) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ return endLev;
+ }
+
+ public void setEndLev(Integer endLev) {
+ this.endLev = endLev;
+ }
+
+ public Integer getCrnAmount() {
+ if (crnAmount == null) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ return crnAmount;
+ }
+
+ public void setCrnAmount(Integer crnAmount) {
+ this.crnAmount = crnAmount;
+ }
+
+ public Integer getWhsType() {
+ return whsType;
+ }
+
+ public void setWhsType(Integer whsType) {
+ this.whsType = whsType;
+ }
+}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 130c7ea..117d794 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -14,7 +14,7 @@
import java.util.List;
/**
- * 鍙屾繁寮忚揣鏋舵牳蹇冨姛鑳�
+ * 璐ф灦鏍稿績鍔熻兘
* Created by vincent on 2020/6/11
*/
@Service
diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index e6d6d32..b147a64 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -202,35 +202,24 @@
});
break;
case "init":
- layer.open({
- type: 1,
- title: '鍒濆鍖栧簱浣�',
- maxmin: true,
- area: ["400px"],
- shadeClose: true,
- content: $("#resetLocDiv"),
- success: function (layero, index) {
+ layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞堕噸缃簱浣�', formType: 1, shadeClose: true}, function(pass, idx){
+ if (pass === "123456") {
+ layer.open({
+ type: 1,
+ title: '鍒濆鍖栧簱浣�',
+ area: ["400px"],
+ maxmin: true,
+ shadeClose: true,
+ content: $("#resetLocDiv"),
+ success: function (layero, index) {
+ }
+ })
+ } else {
+ layer.msg("鍙ｄ护閿欒");
}
- })
- // layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞堕噸缃簱浣�', formType: 1, shadeClose: true}, function(pass, idx){
- // if (pass === "123456") {
- // layer.open({
- // type: 1,
- // title: '鍒濆鍖栧簱浣�',
- // maxmin: true,
- // shadeClose: true,
- // content: $("#resetLocDiv"),
- // success: function (layero, index) {
- //
- // }
- // })
- // } else {
- // layer.msg("鍙ｄ护閿欒");
- // }
- // layer.close(idx);
- // doSwitch(0, pass); // 鍋滄wcs绯荤粺
- // });
+ layer.close(idx);
+ });
break;
}
});
@@ -428,6 +417,27 @@
}
});
+ // 鍒濆鍖栦繚瀛�
+ form.on('submit(initDo)', function (data) {
+ $.ajax({
+ url: baseUrl+"/locMast/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();
+ } else if (res.code === 403){
+ parent.location.href = "/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+
// 鏁版嵁淇濆瓨鍔ㄤ綔
form.on('submit(save)', function () {
if (banMsg != null){
diff --git a/src/main/webapp/views/locMast/locMast.html b/src/main/webapp/views/locMast/locMast.html
index ed4156d..a468020 100644
--- a/src/main/webapp/views/locMast/locMast.html
+++ b/src/main/webapp/views/locMast/locMast.html
@@ -88,18 +88,18 @@
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
<!-- 閲嶇疆搴撲綅寮圭獥 -->
-<div id="resetLocDiv" style="margin: 20px 0 20px 30px">
+<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="startRow" autocomplete="off" class="layui-input" lay-verify="number">
+ <input type="text" name="startRow" 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="endRow" autocomplete="off" class="layui-input" lay-verify="number">
+ <input type="text" name="endRow" autocomplete="off" class="layui-input" lay-verify="required|number">
</div>
</div>
</div>
@@ -108,11 +108,11 @@
<div class="layui-inline">
<label class="layui-form-label">璧锋鍒�</label>
<div class="layui-input-inline" style="width: 100px;">
- <input type="text" name="startBay" autocomplete="off" class="layui-input" lay-verify="number">
+ <input type="text" name="startBay" 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="endbay" autocomplete="off" class="layui-input" lay-verify="number">
+ <input type="text" name="endBay" autocomplete="off" class="layui-input" lay-verify="required|number">
</div>
</div>
</div>
@@ -121,20 +121,26 @@
<div class="layui-inline">
<label class="layui-form-label">璧锋灞�</label>
<div class="layui-input-inline" style="width: 100px;">
- <input type="text" name="startLev" autocomplete="off" class="layui-input" lay-verify="number">
+ <input type="text" name="startLev" 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="endLev" autocomplete="off" class="layui-input" lay-verify="number">
+ <input type="text" name="endLev" autocomplete="off" class="layui-input" lay-verify="required|number">
</div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍫嗗灈鏈烘暟閲�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="crnAmount" lay-verify="required|number" autocomplete="off" class="layui-input">
</div>
</div>
<!-- 搴撲綅绫诲瀷 -->
<div class="layui-form-item">
- <label class="layui-form-label">搴撲綅绫诲瀷</label>
+ <label class="layui-form-label">绫诲瀷(閫夊～)</label>
<div class="layui-input-inline">
- <select name="locType">
- <option selected="" style="color: #1E9FFF">璇烽�夋嫨绫诲瀷锛堥�夊～锛�</option>
+ <select name="whsType">
+ <option style="display: none"></option>
<option value="1">浣庡簱浣�</option>
<option value="2">楂樺簱浣�</option>
</select>
--
Gitblit v1.9.1