From c3739bbeee3972d27423f6f1d71e2d20c30df240 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期日, 19 六月 2022 11:01:28 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs
---
src/main/java/com/zy/asrs/controller/OrderController.java | 3 +++
src/main/webapp/views/order/order.html | 3 ++-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index d79943c..26ecbbe 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -89,6 +89,9 @@
@ManagerAuth(memo = "鎵嬪姩娣诲姞璁㈠崟")
@Transactional
public R formAdd(@RequestBody OrderDomainParam param){
+ if(Cools.isEmpty(param.getOrderNo())){
+ param.setOrderNo("HAND" + snowflakeIdWorker.nextId());
+ }
Order order = orderService.selectByNo(param.getOrderNo());
if (order != null) {
return R.error("鍗曟嵁缂栧彿宸插瓨鍦�");
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index d89f0c4..938579a 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -141,7 +141,8 @@
<div class="layui-form-item">
<label class="layui-form-label">鍗曟嵁缂栧彿锛�</label>
<div class="layui-input-block">
- <input id="orderNo" name="orderNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" lay-verify="required"/>
+ <input id="orderNo" name="orderNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" />
+<!-- lay-verify="required"-->
</div>
</div>
<div class="layui-form-item" style="position: relative;">
--
Gitblit v1.9.1