From 82e3d32282cd6bc07e36564306fe5c35fdfb89da Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期一, 23 九月 2024 17:16:32 +0800
Subject: [PATCH] bug修改，初步完成
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlLogController.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlLogController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlLogController.java
index 67a1221..b11a982 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlLogController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlLogController.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.WrkDetl;
import com.zy.asrs.common.wms.entity.WrkDetlLog;
@@ -37,20 +38,33 @@
@RequestParam(required = false) String condition,
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<WrkDetlLog> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(WrkDetlLog::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(WrkDetlLog::getId, condition);
- }
+ QueryWrapper<WrkDetlLog> wrapper = new QueryWrapper<>();
+ wrapper.eq("host_id", getHostId());
+// if (!Cools.isEmpty(condition)) {
+// wrapper.like(WrkDetl::getId, condition);
+// }
if (!Cools.isEmpty(timeRange)) {
String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(WrkDetlLog::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(WrkDetlLog::getAppeTime, DateUtils.convert(range[1]));
+ wrapper.ge("io_time", DateUtils.convert(range[0]));
+ wrapper.le("io_time", DateUtils.convert(range[1]));
}
if (!Cools.isEmpty(param.get("wrk_mast_id"))) {
- wrapper.eq(WrkDetlLog::getWrkMastId, param.get("wrk_mast_id"));
+ wrapper.eq("wrk_mast_id", param.get("wrk_mast_id"));
}
- wrapper.orderByDesc(WrkDetlLog::getId);
+ if (!Cools.isEmpty(param.get("matnr"))) {
+ wrapper.like("matnr", param.get("matnr"));
+ }
+ if (!Cools.isEmpty(param.get("maktx"))) {
+ wrapper.like("maktx", param.get("maktx"));
+ }
+ if (!Cools.isEmpty(param.get("zpallet"))) {
+ wrapper.like("zpallet", param.get("zpallet"));
+ }
+ if (!Cools.isEmpty(param.get("orderNo"))) {
+ wrapper.like("order_no", param.get("orderNo"));
+ }
+ allLike(WrkDetlLog.class, param.keySet(), wrapper, condition);
+ wrapper.orderByDesc("io_time");
return R.ok(wrkDetlLogService.page(new Page<>(curr, limit), wrapper));
}
--
Gitblit v1.9.1