From d372135bd4cd8646a75fdd0074e75c117343da61 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期日, 29 一月 2023 10:51:16 +0800
Subject: [PATCH] #
---
src/main/webapp/views/locRule/locRule.html | 35 +++++++++++++++++++++++------------
src/main/java/com/zy/asrs/controller/LocRuleController.java | 18 ++++++++++++++++++
2 files changed, 41 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocRuleController.java b/src/main/java/com/zy/asrs/controller/LocRuleController.java
index 7dffe1e..89c28d6 100644
--- a/src/main/java/com/zy/asrs/controller/LocRuleController.java
+++ b/src/main/java/com/zy/asrs/controller/LocRuleController.java
@@ -61,6 +61,15 @@
@RequestMapping(value = "/locRule/add/auth")
@ManagerAuth
public R add(LocRule locRule) {
+ if ((locRule.getRowBeg() < locRule.getRowEnd()) || locRule.getRowBeg() <= 0 || locRule.getRowEnd() <= 0) {
+ return R.error("鎺掑尯闂撮敊璇�");
+ }
+ if ((locRule.getBayBeg() < locRule.getBayEnd()) || locRule.getBayBeg() <= 0 || locRule.getBayEnd() <= 0) {
+ return R.error("鍒楀尯闂撮敊璇�");
+ }
+ if ((locRule.getLevBeg() < locRule.getLevEnd()) || locRule.getLevBeg() <= 0 || locRule.getLevEnd() <= 0) {
+ return R.error("灞傚尯闂撮敊璇�");
+ }
Date now = new Date();
locRule.setStatus(1);
locRule.setCreateBy(getUserId());
@@ -77,6 +86,15 @@
if (Cools.isEmpty(locRule) || null==locRule.getId()){
return R.error();
}
+ if ((locRule.getRowBeg() < locRule.getRowEnd()) || locRule.getRowBeg() <= 0 || locRule.getRowEnd() <= 0) {
+ return R.error("鎺掑尯闂撮敊璇�");
+ }
+ if ((locRule.getBayBeg() < locRule.getBayEnd()) || locRule.getBayBeg() <= 0 || locRule.getBayEnd() <= 0) {
+ return R.error("鍒楀尯闂撮敊璇�");
+ }
+ if ((locRule.getLevBeg() < locRule.getLevEnd()) || locRule.getLevBeg() <= 0 || locRule.getLevEnd() <= 0) {
+ return R.error("灞傚尯闂撮敊璇�");
+ }
locRule.setUpdateBy(getUserId());
locRule.setUpdateTime(new Date());
locRuleService.updateById(locRule);
diff --git a/src/main/webapp/views/locRule/locRule.html b/src/main/webapp/views/locRule/locRule.html
index 24397fe..143c432 100644
--- a/src/main/webapp/views/locRule/locRule.html
+++ b/src/main/webapp/views/locRule/locRule.html
@@ -118,40 +118,51 @@
</div>
<div class="layui-col-md6">
+<!-- <div class="layui-inline">-->
+<!-- <label class="layui-form-label">鎺掕寖鍥�</label>-->
+<!-- <div class="layui-input-inline" style="width: 100px;">-->
+<!-- <input type="text" name="price_min" placeholder="锟�" autocomplete="off" class="layui-input">-->
+<!-- </div>-->
+<!-- <div class="layui-form-mid">-</div>-->
+<!-- <div class="layui-input-inline" style="width: 100px;">-->
+<!-- <input type="text" name="price_max" placeholder="锟�" autocomplete="off" class="layui-input">-->
+<!-- </div>-->
+<!-- </div>-->
+
<div class="layui-form-item">
- <label class="layui-form-label">寮�濮嬫帓: </label>
+ <label class="layui-form-label layui-form-required">寮�濮嬫帓: </label>
<div class="layui-input-block">
- <input class="layui-input" name="rowBeg" placeholder="璇疯緭鍏ュ紑濮嬫帓">
+ <input type="number" min="1" class="layui-input" name="rowBeg" placeholder="璇疯緭鍏ュ紑濮嬫帓" lay-vertype="tips" lay-verify="required" required="">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">缁撴潫鎺�: </label>
+ <label class="layui-form-label layui-form-required">缁撴潫鎺�: </label>
<div class="layui-input-block">
- <input class="layui-input" name="rowEnd" placeholder="璇疯緭鍏ョ粨鏉熸帓">
+ <input type="number" min="1" class="layui-input" name="rowEnd" placeholder="璇疯緭鍏ョ粨鏉熸帓" lay-vertype="tips" lay-verify="required" required="">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">寮�濮嬪垪: </label>
+ <label class="layui-form-label layui-form-required">寮�濮嬪垪: </label>
<div class="layui-input-block">
- <input class="layui-input" name="bayBeg" placeholder="璇疯緭鍏ュ紑濮嬪垪">
+ <input type="number" min="1" class="layui-input" name="bayBeg" placeholder="璇疯緭鍏ュ紑濮嬪垪" lay-vertype="tips" lay-verify="required" required="">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">缁撴潫鍒�: </label>
+ <label class="layui-form-label layui-form-required">缁撴潫鍒�: </label>
<div class="layui-input-block">
- <input class="layui-input" name="bayEnd" placeholder="璇疯緭鍏ョ粨鏉熷垪">
+ <input type="number" min="1" class="layui-input" name="bayEnd" placeholder="璇疯緭鍏ョ粨鏉熷垪" lay-vertype="tips" lay-verify="required" required="">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">寮�濮嬪眰: </label>
+ <label class="layui-form-label layui-form-required">寮�濮嬪眰: </label>
<div class="layui-input-block">
- <input class="layui-input" name="levBeg" placeholder="璇疯緭鍏ュ紑濮嬪眰">
+ <input type="number" min="1" class="layui-input" name="levBeg" placeholder="璇疯緭鍏ュ紑濮嬪眰" lay-vertype="tips" lay-verify="required" required="">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">缁撴潫灞�: </label>
+ <label class="layui-form-label layui-form-required">缁撴潫灞�: </label>
<div class="layui-input-block">
- <input class="layui-input" name="levEnd" placeholder="璇疯緭鍏ョ粨鏉熷眰">
+ <input type="number" min="1" class="layui-input" name="levEnd" placeholder="璇疯緭鍏ョ粨鏉熷眰" lay-vertype="tips" lay-verify="required" required="">
</div>
</div>
--
Gitblit v1.9.1