From 59139c3f3f6e5d0994b1488b718ed62317f309c9 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 25 七月 2020 15:03:01 +0800
Subject: [PATCH] #当前本版十分完美、冻结
---
src/main/java/com/zy/asrs/controller/StaDescController.java | 8 ++++++++
src/main/java/com/zy/common/model/Shelves.java | 2 +-
src/main/webapp/static/js/staDesc/staDesc.js | 6 +++---
src/main/webapp/views/staDesc/staDesc_detail.html | 14 +++++++-------
4 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/StaDescController.java b/src/main/java/com/zy/asrs/controller/StaDescController.java
index 5c32944..8d85caf 100644
--- a/src/main/java/com/zy/asrs/controller/StaDescController.java
+++ b/src/main/java/com/zy/asrs/controller/StaDescController.java
@@ -60,6 +60,14 @@
@RequestMapping(value = "/staDesc/add/auth")
@ManagerAuth(memo = "绔欑偣璺緞娣诲姞")
public R add(StaDesc staDesc) {
+ int sameRes = staDescService.selectCount(new EntityWrapper<StaDesc>()
+ .eq("type_no", staDesc.getTypeNo())
+ .eq("stn_no", staDesc.getStnNo())
+ .eq("crn_no", staDesc.getCrnNo())
+ .eq("crn_stn", staDesc.getCrnStn()));
+ if (sameRes > 0) {
+ return R.error("璺緞宸插瓨鍦�");
+ }
staDesc.setModiUser(getUserId());
staDesc.setModiTime(new Date());
staDesc.setAppeUser(getUserId());
diff --git a/src/main/java/com/zy/common/model/Shelves.java b/src/main/java/com/zy/common/model/Shelves.java
index 8f9c058..17515ce 100644
--- a/src/main/java/com/zy/common/model/Shelves.java
+++ b/src/main/java/com/zy/common/model/Shelves.java
@@ -61,7 +61,7 @@
*
* 璐ф灦鍛戒腑瑙勫垯濡備笅锛�
* 瀹夎浣嶇疆锛� [1] [2] | [3] [4] -------- [5] [6] | [7] [8]
- * 鍛戒腑椤哄簭锛� 1 -> 5 -> 4 -> 8 -> 2 -> 6 -> 3 -> 9 -> 1 ...
+ * 鍛戒腑椤哄簭锛� 1 -> 5 -> 4 -> 8 -> 2 -> 6 -> 3 -> 7 -> 1 ...
*
* 1.璇ヨ鍒欓�備笉闄愬埗璐ф灦鏁伴噺锛屾�绘暟涓庣粍鍒湪鏋勯�犲櫒涓缃�
* 2.濡傛湁搴忓垪鍙疯捣濮嬮棶棰橈紝鐢ㄥ亸绉婚噺瑙勯伩鍗冲彲
diff --git a/src/main/webapp/static/js/staDesc/staDesc.js b/src/main/webapp/static/js/staDesc/staDesc.js
index fc63e60..8e38517 100644
--- a/src/main/webapp/static/js/staDesc/staDesc.js
+++ b/src/main/webapp/static/js/staDesc/staDesc.js
@@ -83,7 +83,7 @@
success: function (res) {
layer.closeAll();
if (res.code === 200){
- tableReload(false);
+ $(".layui-laypage-btn")[0].click();
} else if (res.code === 403){
top.location.href = baseUrl+"/";
}else {
@@ -126,7 +126,7 @@
type: 2,
title: '鏂板',
maxmin: true,
- area: [top.detailWidth, top.detailHeight],
+ area: ['40%', top.detailHeight],
shadeClose: false,
content: 'staDesc_detail.html',
success: function(layero, index){
@@ -240,7 +240,7 @@
type: 2,
title: '淇敼',
maxmin: true,
- area: [top.detailWidth, top.detailHeight],
+ area: ['40%', top.detailHeight],
shadeClose: false,
content: 'staDesc_detail.html',
success: function(layero, index){
diff --git a/src/main/webapp/views/staDesc/staDesc_detail.html b/src/main/webapp/views/staDesc/staDesc_detail.html
index 70ebbde..a9f3cae 100644
--- a/src/main/webapp/views/staDesc/staDesc_detail.html
+++ b/src/main/webapp/views/staDesc/staDesc_detail.html
@@ -14,7 +14,7 @@
<!-- 璇︽儏 -->
<div id="data-detail" class="layer_self_wrap">
- <form id="detail" class="layui-form">
+ <form id="detail" class="layui-form" style="text-align: center">
<!--
<div class="layui-inline" style="display: none">
<label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
@@ -29,7 +29,7 @@
<input id="typeId" class="layui-input" type="text" onkeyup="check(this.id, 'staDesc')" lay-verify="number" >
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:80%;">
<label class="layui-form-label"><span class="not-null">*</span>鍏ュ嚭搴撶被鍨嬶細</label>
<div class="layui-input-inline cool-auto-complete">
<input id="typeNo" class="layui-input" type="text" onkeyup="check(this.id, 'staDesc')" lay-verify="required|number" style="display: none">
@@ -47,7 +47,7 @@
<input id="typeDesc" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:80%;">
<label class="layui-form-label"><span class="not-null">*</span>浣滀笟绔欑偣锛�</label>
<div class="layui-input-inline cool-auto-complete">
<input id="stnNo" class="layui-input" type="text" onkeyup="check(this.id, 'staDesc')" lay-verify="required|number" style="display: none">
@@ -59,13 +59,13 @@
</div>
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:80%;">
<label class="layui-form-label">绔欑偣鍚嶇О锛�</label>
<div class="layui-input-inline">
<input id="stnDesc" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:80%;">
<label class="layui-form-label"><span class="not-null">*</span>鍫嗗灈鏈哄彿锛�</label>
<div class="layui-input-inline cool-auto-complete">
<input id="crnNo" class="layui-input" type="text" onkeyup="check(this.id, 'staDesc')" lay-verify="required|number" style="display: none">
@@ -77,7 +77,7 @@
</div>
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:80%;">
<label class="layui-form-label">鍫嗗灈鏈虹珯鐐癸細</label>
<div class="layui-input-inline cool-auto-complete">
<input id="crnStn" class="layui-input" type="text" lay-verify="number" style="display: none">
@@ -89,7 +89,7 @@
</div>
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:80%;">
<label class="layui-form-label">澶囥��銆�娉細</label>
<div class="layui-input-inline">
<input id="memo" class="layui-input" type="text">
--
Gitblit v1.9.1