From 66883126faa033315062d802c21067554df0a489 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期三, 09 十月 2024 09:40:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/nbncasrs' into nbncasrs
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java | 12 ++++++++++++
zy-asrs-wms/src/main/webapp/views/wrkMast/wrkMast.html | 2 +-
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
index 66ac248..f8a9f3a 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
@@ -42,6 +42,18 @@
wrapper.eq("host_id",getHostId());
wrapper.orderByDesc("io_pri");
convert(param, wrapper);
+
+ if (!Cools.isEmpty(condition)) {
+ wrapper.and(item -> {
+ item.like("wrk_no", condition)
+ .or().like("wrk_sts", condition)
+ .or().like("sta_no", condition)
+ .or().like("source_sta_no", condition)
+ .or().like("loc_no", condition)
+ .or().like("source_loc_no", condition);
+ });
+ }
+
return R.ok(wrkMastService.page(new Page<>(curr, limit), wrapper));
}
private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
diff --git a/zy-asrs-wms/src/main/webapp/views/wrkMast/wrkMast.html b/zy-asrs-wms/src/main/webapp/views/wrkMast/wrkMast.html
index 0afb61e..981aa50 100644
--- a/zy-asrs-wms/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/zy-asrs-wms/src/main/webapp/views/wrkMast/wrkMast.html
@@ -71,7 +71,7 @@
<!-- 鏃ユ湡鑼冨洿 -->
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
- <input class="layui-input layui-laydate-range" name="timeRange" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ <input class="layui-input layui-laydate-range" name="io_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
</div>
</div>
<div class="layui-inline">
--
Gitblit v1.9.1