From b68d5f1ee33498ea2c2aa9b29ba532b62fa4a8cb Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 22 十月 2025 08:32:53 +0800
Subject: [PATCH] *
---
src/main/webapp/static/js/basArm/basArm.js | 18 +++++---
src/main/java/com/zy/asrs/entity/BasArm.java | 26 +++++++++++++
src/main/java/basArm.sql | 12 +++---
src/main/resources/mapper/BasArmMapper.xml | 1
src/main/webapp/views/basArm/basArm.html | 38 ++++++++++++------
src/main/java/com/zy/asrs/controller/BasArmController.java | 1
6 files changed, 70 insertions(+), 26 deletions(-)
diff --git a/src/main/java/basArm.sql b/src/main/java/basArm.sql
index f9501e5..a85cc8a 100644
--- a/src/main/java/basArm.sql
+++ b/src/main/java/basArm.sql
@@ -9,10 +9,10 @@
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArm#btn-export', '瀵煎嚭', '', '3', '4', '1');
-- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm/basArm.html', N'basArm绠＄悊', null, '2', null, '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm/basArm.html', N'鏈烘鑷傞厤缃�', '40541', '2', '5', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-export', N'瀵煎嚭', '', '3', '4', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#view', N'鏌ヨ', '90596', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-add', N'鏂板', '90596', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-edit', N'缂栬緫', '90596', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-delete', N'鍒犻櫎', '90596', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-export', N'瀵煎嚭', '90596', '3', '4', '1');
diff --git a/src/main/java/com/zy/asrs/controller/BasArmController.java b/src/main/java/com/zy/asrs/controller/BasArmController.java
index 1714902..de9bc78 100644
--- a/src/main/java/com/zy/asrs/controller/BasArmController.java
+++ b/src/main/java/com/zy/asrs/controller/BasArmController.java
@@ -43,6 +43,7 @@
convert(param, wrapper);
allLike(BasArm.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ wrapper.orderBy("arm_no",true);
return R.ok(basArmService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/entity/BasArm.java b/src/main/java/com/zy/asrs/entity/BasArm.java
index 762cc57..b42e18f 100644
--- a/src/main/java/com/zy/asrs/entity/BasArm.java
+++ b/src/main/java/com/zy/asrs/entity/BasArm.java
@@ -62,6 +62,10 @@
@TableField("sta_no_sou")
private Integer staNoSou;
+ @ApiModelProperty(value= "杈撻�丳LCId")
+ @TableField("devp_id")
+ private Integer devpId;
+
public BasArm() {}
public BasArm(Integer armNo,Integer staNo,Integer sortingLine,Integer status) {
@@ -79,4 +83,26 @@
// );
+ public String getStatus$() {
+ switch (status){
+ case 1:
+ return "姝ｅ父";
+ case 2:
+ return "鍏抽棴";
+ default:
+ return "寮傚父";
+ }
+ }
+
+ public String getDevpId$() {
+ if (devpId == null){return "鏈煡";}
+ switch (devpId) {
+ case 1:
+ return "1妤�";
+ case 2:
+ return "2妤�";
+ default:
+ return "鏈煡";
+ }
+ }
}
diff --git a/src/main/resources/mapper/BasArmMapper.xml b/src/main/resources/mapper/BasArmMapper.xml
index 5e0a2eb..06ee5c0 100644
--- a/src/main/resources/mapper/BasArmMapper.xml
+++ b/src/main/resources/mapper/BasArmMapper.xml
@@ -11,6 +11,7 @@
<result column="status" property="status" />
<result column="sta_no_sou" property="staNoSou" />
<result column="sorting_line_sou" property="sortingLineSou" />
+ <result column="devp_id" property="devpId" />
</resultMap>
diff --git a/src/main/webapp/static/js/basArm/basArm.js b/src/main/webapp/static/js/basArm/basArm.js
index 43065e2..a7cc2be 100644
--- a/src/main/webapp/static/js/basArm/basArm.js
+++ b/src/main/webapp/static/js/basArm/basArm.js
@@ -15,18 +15,22 @@
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/basArm/list/auth',
page: true,
- limit: 15,
+ limit: 24,
limits: [15, 30, 50, 100, 200, 500],
toolbar: '#toolbar',
cellMinWidth: 50,
height: 'full-120',
cols: [[
- {type: 'checkbox'}
- ,{field: 'id', align: 'center',title: 'ID'}
- ,{field: 'armNo', align: 'center',title: '鏈烘鑷傜紪鍙�'}
- ,{field: 'staNo', align: 'center',title: '鐮佸灈浣�'}
- ,{field: 'sortingLine', align: 'center',title: '鎷嗗灈浣�'}
- ,{field: 'status', align: 'center',title: ''}
+ // {type: 'checkbox'}
+ // ,
+ {field: 'id', align: 'center',title: 'ID',hide: true}
+ ,{field: 'armNo', align: 'center',title: '鏈烘鑷傜紪鍙�',hide: false}
+ ,{field: 'staNo', align: 'center',title: '鐮佸灈浣嶄唬鍙�',hide: false}
+ ,{field: 'sortingLine', align: 'center',title: '鎷嗗灈浣嶄唬鍙�',hide: false}
+ ,{field: 'staNoSou', align: 'center',title: '鐮佸灈浣�',hide: false}
+ ,{field: 'sortingLineSou', align: 'center',title: '鎷嗗灈浣�',hide: false}
+ ,{field: 'devpId$', align: 'center',title: '妤煎眰',hide: false}
+ ,{field: 'status$', align: 'center',title: '鐘舵��',hide: false}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
diff --git a/src/main/webapp/views/basArm/basArm.html b/src/main/webapp/views/basArm/basArm.html
index 476bc16..ff05923 100644
--- a/src/main/webapp/views/basArm/basArm.html
+++ b/src/main/webapp/views/basArm/basArm.html
@@ -17,11 +17,11 @@
<div class="layui-card-body">
<div class="layui-form toolbar" id="search-box">
<div class="layui-form-item">
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
<input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
@@ -79,23 +79,35 @@
</div>
</div>
<div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鐮佸灈浣嶄唬鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="staNo" placeholder="璇疯緭鍏ョ爜鍨涗綅浠ｅ彿" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鎷嗗灈浣嶄唬鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="sortingLine" placeholder="璇疯緭鍏ユ媶鍨涗綅浠ｅ彿" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
<label class="layui-form-label layui-form-required">鐮佸灈浣�: </label>
<div class="layui-input-block">
- <input class="layui-input" name="staNo" placeholder="璇疯緭鍏ョ爜鍨涗綅" lay-vertype="tips" lay-verify="required">
+ <input class="layui-input" name="staNoSou" placeholder="璇疯緭鍏ョ爜鍨涗綅" lay-vertype="tips" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">鎷嗗灈浣�: </label>
<div class="layui-input-block">
- <input class="layui-input" name="sortingLine" placeholder="璇疯緭鍏ユ媶鍨涗綅" lay-vertype="tips" lay-verify="required">
+ <input class="layui-input" name="sortingLineSou" placeholder="璇疯緭鍏ユ媶鍨涗綅" lay-vertype="tips" lay-verify="required">
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="status" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="status" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">-->
+<!-- </div>-->
+<!-- </div>-->
</div>
</div>
--
Gitblit v1.9.1