From 7fba108547c985f3a9e1736b32dc028bad3b63a1 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 21 一月 2025 16:12:57 +0800
Subject: [PATCH] 页面优化
---
src/main/webapp/views/orderView/orderView.html | 3 ++-
src/main/java/com/zy/asrs/controller/OrderController.java | 8 ++++----
src/main/webapp/views/home/navigation.html | 4 ++--
src/main/webapp/static/js/agvBasDevp/basDevp.js | 2 +-
src/main/webapp/views/agvBasDevp/basDevp.html | 10 ++++++++++
src/main/webapp/views/agvBasDevp/basDevp_detail.html | 6 ++++++
src/main/java/com/zy/common/web/BaseController.java | 15 +++++++++------
src/main/webapp/views/agvLocMast/locMast.html | 5 +++++
8 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 8cb8287..29a40fd 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -1032,13 +1032,13 @@
} else {
odNo += "_O";
}
-
+ Date date = new Date();
Order order = orderService.selectByNo(odNo);
if (null == order) {
order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
odNo, // 璁㈠崟缂栧彿
- null, // 鍗曟嵁鏃ユ湡
+ DateUtils.convert(date), // 鍗曟嵁鏃ユ湡
docType.getDocId(), // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
null, //
@@ -1121,7 +1121,7 @@
order2 = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
dbUuid, // 璁㈠崟缂栧彿
- null, // 鍗曟嵁鏃ユ湡
+ DateUtils.convert(date), // 鍗曟嵁鏃ユ湡
33L, // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
null, //
@@ -1199,7 +1199,7 @@
order3 = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
dbUuid, // 璁㈠崟缂栧彿
- null, // 鍗曟嵁鏃ユ湡
+ DateUtils.convert(date), // 鍗曟嵁鏃ユ湡
35L, // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
null, //
diff --git a/src/main/java/com/zy/common/web/BaseController.java b/src/main/java/com/zy/common/web/BaseController.java
index 79082c0..3f0647c 100644
--- a/src/main/java/com/zy/common/web/BaseController.java
+++ b/src/main/java/com/zy/common/web/BaseController.java
@@ -140,13 +140,16 @@
continue;
}
String column = null;
- if (field.isAnnotationPresent(TableField.class) && field.getAnnotation(TableField.class).exist()) {
- column = field.getAnnotation(TableField.class).value();
+ if (field.isAnnotationPresent(TableField.class)) {
+ if (field.getAnnotation(TableField.class).exist()) {
+ column = field.getAnnotation(TableField.class).value();
+ }
+ } else {
+ if (Cools.isEmpty(column)) {
+ column = field.getName();
+ }
}
- if (Cools.isEmpty(column)) {
- column = field.getName();
- }
- if (!set.contains(column)) {
+ if (!Cools.isEmpty(column) && !set.contains(column)) {
columns.add(column);
}
}
diff --git a/src/main/webapp/static/js/agvBasDevp/basDevp.js b/src/main/webapp/static/js/agvBasDevp/basDevp.js
index fc55079..61ff74d 100644
--- a/src/main/webapp/static/js/agvBasDevp/basDevp.js
+++ b/src/main/webapp/static/js/agvBasDevp/basDevp.js
@@ -21,7 +21,7 @@
{type: 'checkbox', fixed: 'left'}
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
,{field: 'devNo', align: 'center',sort:true,title: '鎺ラ┏浣嶅彿',width:150}
- // ,{field: 'decDesc', align: 'center',title: '璁惧鎻忚堪'}
+ ,{field: 'decDesc', align: 'center',title: '鍚嶇О'}
// ,{field: 'devMk', align: 'center',title: '澶囨敞'}
,{field: 'inEnable', align: 'center',title: '鍙叆', templet:function(row){
var html = "<input value='inEnable' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
diff --git a/src/main/webapp/views/agvBasDevp/basDevp.html b/src/main/webapp/views/agvBasDevp/basDevp.html
index fffc7ec..c803b20 100644
--- a/src/main/webapp/views/agvBasDevp/basDevp.html
+++ b/src/main/webapp/views/agvBasDevp/basDevp.html
@@ -21,6 +21,16 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
+ <input class="layui-input" type="text" name="dec_desc" placeholder="鍚嶇О" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="barcode" placeholder="璐ф灦鐮�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
<input class="layui-input" type="text" name="floor" placeholder="妤煎眰" autocomplete="off">
</div>
</div>
diff --git a/src/main/webapp/views/agvBasDevp/basDevp_detail.html b/src/main/webapp/views/agvBasDevp/basDevp_detail.html
index 09b3fac..59bfdf7 100644
--- a/src/main/webapp/views/agvBasDevp/basDevp_detail.html
+++ b/src/main/webapp/views/agvBasDevp/basDevp_detail.html
@@ -22,6 +22,12 @@
</div>
</div>
<div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鍚嶇О锛�</label>
+ <div class="layui-input-inline">
+ <input id="decDesc" class="layui-input" type="text" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
<label class="layui-form-label"><span class="not-null">*</span>妤硷細</label>
<div class="layui-input-inline">
<input id="floor" class="layui-input" type="text" lay-verify="required|number">
diff --git a/src/main/webapp/views/agvLocMast/locMast.html b/src/main/webapp/views/agvLocMast/locMast.html
index 155831b..fb576ba 100644
--- a/src/main/webapp/views/agvLocMast/locMast.html
+++ b/src/main/webapp/views/agvLocMast/locMast.html
@@ -30,6 +30,11 @@
</div>
</div>
<div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="barcode" placeholder="璐ф灦鐮�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
<div class="layui-input-inline cool-auto-complete">
<input id="locSts" class="layui-input" type="text" style="display: none" name="loc_sts">
<input id="locSts$" placeholder="搴撲綅鐘舵��" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" onfocus=this.blur()>
diff --git a/src/main/webapp/views/home/navigation.html b/src/main/webapp/views/home/navigation.html
index 64ce2a6..1c024ca 100644
--- a/src/main/webapp/views/home/navigation.html
+++ b/src/main/webapp/views/home/navigation.html
@@ -121,10 +121,10 @@
<a class="list fn_1 moveUpDownFla1" ew-href="order/order.html?resourceId=40517">
<p>鍗曟嵁绠＄悊</p>
</a>
- <a class="list fn_2 moveUpDownFla2" ew-href="wrkMast/wrkMast.html?resourceId=214">
+ <a class="list fn_2 moveUpDownFla2" ew-href="agvWrkMast/wrkMast.html?resourceId=70628">
<p>杩愯浠诲姟</p>
</a>
- <a class="list fn_3 moveUpDownFla1" ew-href="stoMan/stoQue.html?resourceId=10276">
+ <a class="list fn_3 moveUpDownFla1" ew-href="agvLocDetl/locDetl.html?resourceId=80637">
<p>搴撳瓨鏄庣粏</p>
</a>
</div>
diff --git a/src/main/webapp/views/orderView/orderView.html b/src/main/webapp/views/orderView/orderView.html
index c344e74..7b9d396 100644
--- a/src/main/webapp/views/orderView/orderView.html
+++ b/src/main/webapp/views/orderView/orderView.html
@@ -122,7 +122,8 @@
</div>
<div class="layui-card">
<div class="layui-card-body">
- <div class="text-danger">鎵嬪姩鍒犻櫎鎴栧畬缁撴椂锛屾槸鍒犻櫎鎴栧畬缁撴槑缁嗗搴旂殑璁㈠崟锛岃�屼笉鏄崟鏉¤鍗曟槑缁嗐��</div>
+ 鍗曟嵁锛氱敱ERP鎻愪緵鍗曟嵁缂栧彿銆佺被鍨嬨�佸崟鎹椂闂村強鐗╂枡鏄庣粏锛岀敓鎴愬叆搴撲綔涓氬崟锛屼负缁存姢绯荤粺楂樺彲鐢紝鐢ㄦ埛鍙嚜琛屾坊鍔犲叆搴撻�氱煡鍗曟暟鎹紝瀹屾垚鐙珛鐨勫叆搴撲綔涓氥��
+ <span class="text-danger">鎵嬪姩鍒犻櫎鎴栧畬缁撴椂锛屾槸鍒犻櫎鎴栧畬缁撴槑缁嗗搴旂殑璁㈠崟锛岃�屼笉鏄崟鏉¤鍗曟槑缁嗐��</span>
</div>
</div>
</div>
--
Gitblit v1.9.1