From cfc4421af2ba05a786300e70e21c779ddbd39836 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 24 三月 2025 08:37:34 +0800
Subject: [PATCH] 工作档查询条件
---
src/main/java/com/zy/asrs/controller/AgvWrkMastLogController.java | 91 ++++++++++++++--------
src/main/webapp/views/agvWrkMastLog/wrkMastLog.html | 39 ++++++---
src/main/java/com/zy/asrs/controller/AgvWrkMastController.java | 89 ++++++++++++++--------
src/main/webapp/views/agvWrkMast/wrkMast.html | 17 ++++
src/main/webapp/static/js/agvWrkMast/wrkMast.js | 4
5 files changed, 158 insertions(+), 82 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java b/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
index 72ccede..35269f4 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.enums.SqlLike;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
@@ -36,22 +37,22 @@
@RequestMapping(value = "/wrkMast/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<AgvWrkMast> wrapper = new EntityWrapper<>();
- convert(param, wrapper);
+ convert2(param, wrapper);
allLike(AgvWrkMast.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){
- if (orderByField.endsWith("$")){
- orderByField = orderByField.substring(0, orderByField.length()-1);
+ if (!Cools.isEmpty(orderByField)) {
+ if (orderByField.endsWith("$")) {
+ orderByField = orderByField.substring(0, orderByField.length() - 1);
}
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
- }else {
+ } else {
wrapper.orderBy("io_time", false);
}
Page<AgvWrkMast> agvWrkMastPage = agvWrkMastService.selectPage(new Page<>(curr, limit), wrapper);
@@ -60,37 +61,59 @@
@RequestMapping(value = "/wrkMast/list/auth/dbList")
@ManagerAuth
- public R dbList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R dbList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<AgvWrkMast> wrapper = new EntityWrapper<>();
convert(param, wrapper);
allLike(AgvWrkMast.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){
- if (orderByField.endsWith("$")){
- orderByField = orderByField.substring(0, orderByField.length()-1);
+ if (!Cools.isEmpty(orderByField)) {
+ if (orderByField.endsWith("$")) {
+ orderByField = orderByField.substring(0, orderByField.length() - 1);
}
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
- }else {
+ } else {
wrapper.orderBy("io_time", false);
}
- wrapper.in("io_type",108,111,112);
+ wrapper.in("io_type", 108, 111, 112);
return R.ok(agvWrkMastService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
wrapper.eq(entry.getKey(), val);
+ }
+ }
+ }
+
+ private <T> void convert2(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)) {
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ String key = entry.getKey();
+ if (key.startsWith("%") && key.endsWith("%")) {
+ wrapper.like(entry.getKey().replaceAll("%", ""), val);
+ } else if (key.startsWith("%")) {
+ wrapper.like(entry.getKey().replace("%", ""), val, SqlLike.LEFT);
+ } else if (key.endsWith("%")) {
+ wrapper.like(entry.getKey().replace("%", ""), val, SqlLike.RIGHT);
+ } else {
+ wrapper.eq(entry.getKey(), val);
+ }
}
}
}
@@ -108,12 +131,12 @@
@RequestMapping(value = "/wrkMast/delete/auth")
@ManagerAuth(memo = "宸ヤ綔妗ｅ垹闄�")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<AgvWrkMast> list = JSONArray.parseArray(param, AgvWrkMast.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error("宸ヤ綔妗ｅ弬鏁扮己澶�");
}
- for (AgvWrkMast entity : list){
+ for (AgvWrkMast entity : list) {
agvWrkMastService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -121,7 +144,7 @@
@RequestMapping(value = "/wrkMast/export/auth")
@ManagerAuth(memo = "宸ヤ綔妗ｅ鍑�")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<AgvWrkMast> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMast"));
@@ -137,7 +160,7 @@
wrapper.like("wrk_no", condition);
Page<AgvWrkMast> page = agvWrkMastService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (AgvWrkMast wrkMast : page.getRecords()){
+ for (AgvWrkMast wrkMast : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", wrkMast.getWrkNo());
map.put("value", wrkMast.getWrkNo());
@@ -150,7 +173,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<AgvWrkMast> wrapper = new EntityWrapper<AgvWrkMast>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != agvWrkMastService.selectOne(wrapper)){
+ if (null != agvWrkMastService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(AgvWrkMast.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -162,7 +185,7 @@
if (list.isEmpty()) {
return R.error("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�");
}
- for (AgvWrkMast entity : list){
+ for (AgvWrkMast entity : list) {
entity.setIoPri(entity.getIoPri() + 1);
}
agvWrkMastService.updateBatchById(list);
@@ -175,7 +198,7 @@
if (list.isEmpty()) {
return R.error("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�");
}
- for (AgvWrkMast entity : list){
+ for (AgvWrkMast entity : list) {
entity.setIoPri(entity.getIoPri() - 1);
}
agvWrkMastService.updateBatchById(list);
diff --git a/src/main/java/com/zy/asrs/controller/AgvWrkMastLogController.java b/src/main/java/com/zy/asrs/controller/AgvWrkMastLogController.java
index f9b185b..f69b4c1 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWrkMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWrkMastLogController.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.enums.SqlLike;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
@@ -37,22 +38,22 @@
@RequestMapping(value = "/wrkMastLog/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<AgvWrkMastLog> wrapper = new EntityWrapper<>();
- convert(param, wrapper);
+ convert2(param, wrapper);
allLike(AgvWrkMastLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){
- if (orderByField.endsWith("$")){
- orderByField = orderByField.substring(0, orderByField.length()-1);
+ if (!Cools.isEmpty(orderByField)) {
+ if (orderByField.endsWith("$")) {
+ orderByField = orderByField.substring(0, orderByField.length() - 1);
}
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
- }else {
+ } else {
wrapper.orderBy("modi_time", false);
}
return R.ok(wrkMastLogService.selectPage(new Page<>(curr, limit), wrapper));
@@ -60,38 +61,60 @@
@RequestMapping(value = "/wrkMastLogWithWrktype/list/auth")
@ManagerAuth
- public R wrkMastLogWithWrktypeList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R wrkMastLogWithWrktypeList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<AgvWrkMastLog> wrapper = new EntityWrapper<>();
convert(param, wrapper);
allLike(AgvWrkMastLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){
- if (orderByField.endsWith("$")){
- orderByField = orderByField.substring(0, orderByField.length()-1);
+ if (!Cools.isEmpty(orderByField)) {
+ if (orderByField.endsWith("$")) {
+ orderByField = orderByField.substring(0, orderByField.length() - 1);
}
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
- }else {
+ } else {
wrapper.orderBy("modi_time", false);
}
return R.ok(wrkMastLogService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
if (entry.getKey().equals("manu_type")) {
wrapper.like(entry.getKey(), val);
+ } else {
+ wrapper.eq(entry.getKey(), val);
+ }
+ }
+ }
+ }
+
+ private <T> void convert2(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)) {
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ String key = entry.getKey();
+ if (key.startsWith("%") && key.endsWith("%")) {
+ wrapper.like(entry.getKey().replaceAll("%", ""), val);
+ } else if (key.startsWith("%")) {
+ wrapper.like(entry.getKey().replace("%", ""), val, SqlLike.LEFT);
+ } else if (key.endsWith("%")) {
+ wrapper.like(entry.getKey().replace("%", ""), val, SqlLike.RIGHT);
} else {
wrapper.eq(entry.getKey(), val);
}
@@ -106,10 +129,10 @@
return R.ok();
}
- @RequestMapping(value = "/wrkMastLog/update/auth")
- @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｄ慨鏀�")
- public R update(AgvWrkMastLog wrkMastLog){
- if (Cools.isEmpty(wrkMastLog) || null==wrkMastLog.getId()){
+ @RequestMapping(value = "/wrkMastLog/update/auth")
+ @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｄ慨鏀�")
+ public R update(AgvWrkMastLog wrkMastLog) {
+ if (Cools.isEmpty(wrkMastLog) || null == wrkMastLog.getId()) {
return R.error("鍙傛暟缂哄け");
}
wrkMastLogService.updateById(wrkMastLog);
@@ -118,12 +141,12 @@
@RequestMapping(value = "/wrkMastLog/delete/auth")
@ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｅ垹闄�")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<AgvWrkMastLog> list = JSONArray.parseArray(param, AgvWrkMastLog.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error("鍙傛暟缂哄け");
}
- for (AgvWrkMastLog entity : list){
+ for (AgvWrkMastLog entity : list) {
wrkMastLogService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -131,7 +154,7 @@
@RequestMapping(value = "/wrkMastLog/export/auth")
@ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｅ鍑�")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<AgvWrkMastLog> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastLog"));
@@ -147,7 +170,7 @@
wrapper.like("id", condition);
Page<AgvWrkMastLog> page = wrkMastLogService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (AgvWrkMastLog wrkMastLog : page.getRecords()){
+ for (AgvWrkMastLog wrkMastLog : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", wrkMastLog.getId());
map.put("value", wrkMastLog.getId());
@@ -160,7 +183,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<AgvWrkMastLog> wrapper = new EntityWrapper<AgvWrkMastLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkMastLogService.selectOne(wrapper)){
+ if (null != wrkMastLogService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(WrkMastLog.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/webapp/static/js/agvWrkMast/wrkMast.js b/src/main/webapp/static/js/agvWrkMast/wrkMast.js
index 07cee3e..ea832f8 100644
--- a/src/main/webapp/static/js/agvWrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/agvWrkMast/wrkMast.js
@@ -21,7 +21,7 @@
cols: [[
{type: 'checkbox'}
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',sort: true, width: 85}
- ,{field: 'modiTime$', align: 'center',title: '宸ヤ綔鏃堕棿',sort: true, width: 160}
+ ,{field: 'modiTime$', align: 'center',title: '鏈�鏂版洿鏂版椂闂�',sort: true, width: 160}
,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
,{field: 'ioPri', align: 'center',title: '浼樺厛绾�',width: 80}
@@ -58,7 +58,7 @@
// ,{field: 'crnEndTime$', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
// ,{field: 'refIotime$', align: 'center',title: '鎷ｆ枡鏃堕棿'}
,{field: 'appeUser$', align: 'center',title: '鐢ㄦ埛'}
- ,{field: 'appeTime$', align: 'center',title: '寮�濮嬫椂闂�', hide:false, width: 160}
+ ,{field: 'appeTime$', align: 'center',title: '鍒涘缓鏃堕棿', hide:false, width: 160}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true, width: 160}
// ,{field: 'memo', align: 'center',title: '澶囨敞'}
diff --git a/src/main/webapp/views/agvWrkMast/wrkMast.html b/src/main/webapp/views/agvWrkMast/wrkMast.html
index 2a342be..1f51987 100644
--- a/src/main/webapp/views/agvWrkMast/wrkMast.html
+++ b/src/main/webapp/views/agvWrkMast/wrkMast.html
@@ -97,6 +97,21 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
+ <input class="layui-input" type="text" name="%source_loc_no%" placeholder="婧愬簱浣�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="%loc_no%" 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="condition" placeholder="璇疯緭鍏�" autocomplete="off">
</div>
</div>
@@ -144,7 +159,7 @@
<script type="text/javascript" src="../../static/layui/layui.js?v=100" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js?v=100" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js?v=100" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/agvWrkMast/wrkMast.js?v=3" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/agvWrkMast/wrkMast.js?v=4" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
diff --git a/src/main/webapp/views/agvWrkMastLog/wrkMastLog.html b/src/main/webapp/views/agvWrkMastLog/wrkMastLog.html
index 20f2b8d..264b700 100644
--- a/src/main/webapp/views/agvWrkMastLog/wrkMastLog.html
+++ b/src/main/webapp/views/agvWrkMastLog/wrkMastLog.html
@@ -40,21 +40,36 @@
</div>
</div>
</div>
- <div class="layui-inline">
- <div class="layui-input-inline cool-auto-complete">
- <input id="crnNo" class="layui-input" name="crn_no" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
- <input id="crnNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鍫嗗灈鏈哄彿" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="basCrnpQueryBycrnNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basCrnpQueryBycrnNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline cool-auto-complete">-->
+<!-- <input id="crnNo" class="layui-input" name="crn_no" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">-->
+<!-- <input id="crnNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鍫嗗灈鏈哄彿" onfocus=this.blur()>-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="basCrnpQueryBycrnNo" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="basCrnpQueryBycrnNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
<!-- 鏃ユ湡鑼冨洿 -->
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
<input class="layui-input layui-laydate-range" name="io_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="%source_loc_no%" placeholder="婧愬簱浣�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="%loc_no%" 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">
@@ -89,7 +104,7 @@
<script type="text/javascript" src="../../static/layui/layui.js?v=100" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js?v=100" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js?v=100" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/agvWrkMastLog/wrkMastLog.js?v=2" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/agvWrkMastLog/wrkMastLog.js?v=5" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
--
Gitblit v1.9.1