From 870eb7cb47e510594d5d0937f14e5a3f7739cd77 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 14 五月 2024 19:28:51 +0800
Subject: [PATCH] # 库位状态
---
src/main/java/com/zy/asrs/controller/BasLocStsController.java | 2 +-
src/main/webapp/views/agvLocMast/locMast.html | 2 +-
src/main/java/com/zy/common/CodeBuilder.java | 6 +++---
src/main/webapp/views/agvLocMast/locMast_detail.html | 12 ++++++++++++
4 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasLocStsController.java b/src/main/java/com/zy/asrs/controller/BasLocStsController.java
index 400f2e7..89ea6e5 100644
--- a/src/main/java/com/zy/asrs/controller/BasLocStsController.java
+++ b/src/main/java/com/zy/asrs/controller/BasLocStsController.java
@@ -37,8 +37,8 @@
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
- excludeTrash(param);
EntityWrapper<BasLocSts> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(basLocStsService.selectPage(new Page<>(curr, limit), wrapper));
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index af032e0..4c4a96a 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -17,10 +17,10 @@
// generator.table="sys_host";
// sqlserver
generator.sqlOsType = SqlOsType.SQL_SERVER;
- generator.url="127.0.0.1:1433;databasename=xzjlasrs";
+ generator.url="127.0.0.1:1433;databasename=phyzasrs";
generator.username="sa";
- generator.password="sa";
- generator.table="asr_bas_lift_opt";
+ generator.password="sa@123";
+ generator.table="asr_bas_loc_type1";
generator.packagePath="com.zy.asrs";
generator.sql = false;
generator.build();
diff --git a/src/main/webapp/views/agvLocMast/locMast.html b/src/main/webapp/views/agvLocMast/locMast.html
index 432473c..f3f8317 100644
--- a/src/main/webapp/views/agvLocMast/locMast.html
+++ b/src/main/webapp/views/agvLocMast/locMast.html
@@ -46,7 +46,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="floor" placeholder="灞�" autocomplete="off">
+ <input class="layui-input" type="text" name="floor" placeholder="妤煎眰" autocomplete="off">
</div>
</div>
<!-- 寰呮坊鍔� -->
diff --git a/src/main/webapp/views/agvLocMast/locMast_detail.html b/src/main/webapp/views/agvLocMast/locMast_detail.html
index 938b271..7c273a9 100644
--- a/src/main/webapp/views/agvLocMast/locMast_detail.html
+++ b/src/main/webapp/views/agvLocMast/locMast_detail.html
@@ -71,6 +71,18 @@
</div>
</div>
</div>
+ <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="locType1" class="layui-input" type="text" style="display: none">
+ <input id="locType1$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="basLocStsQueryBylocSts" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basLocStsQueryBylocStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
<div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
--
Gitblit v1.9.1