From cc3185eaf94050d299cbd9d0c105eb3d1229996a Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期四, 24 十月 2024 16:10:04 +0800
Subject: [PATCH] 修復
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 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 dfc2f9d..3b12b4c 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
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.wms.entity.WrkMast;
import com.zy.asrs.common.wms.service.WrkMastService;
@@ -36,22 +37,43 @@
@RequestParam(required = false) String condition,
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<WrkMast> wrapper = new LambdaQueryWrapper<>();
+ excludeTrash(param);
+ QueryWrapper<WrkMast> wrapper = new QueryWrapper<>();
+ wrapper.eq("host_id",getHostId());
+ wrapper.orderByDesc("io_pri");
+ convert(param, wrapper);
+
if (!Cools.isEmpty(condition)) {
- wrapper.like(WrkMast::getWrkNo, 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("barcode",condition)
+ .or().like("source_loc_no", condition);
+ });
}
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(WrkMast::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(WrkMast::getAppeTime, DateUtils.convert(range[1]));
- }
+
return R.ok(wrkMastService.page(new Page<>(curr, limit), wrapper));
}
-
+ private <T> void convert(Map<String, Object> map, QueryWrapper<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 {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
@RequestMapping(value = "/wrkMast/add/auth")
@ManagerAuth
public R add(WrkMast wrkMast) {
+ wrkMast.setHostId(getHostId());
wrkMastService.save(wrkMast);
return R.ok();
}
@@ -79,6 +101,7 @@
@ManagerAuth
public R query(String condition) {
LambdaQueryWrapper<WrkMast> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(WrkMast::getHostId, getHostId());
wrapper.like(WrkMast::getWrkNo, condition);
Page<WrkMast> page = wrkMastService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
@@ -96,6 +119,7 @@
public R getDataKV(@RequestParam(required = false) String condition) {
List<KeyValueVo> vos = new ArrayList<>();
LambdaQueryWrapper<WrkMast> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(WrkMast::getHostId, getHostId());
if (!Cools.isEmpty(condition)) {
wrapper.like(WrkMast::getWrkNo, condition);
}
--
Gitblit v1.9.1