From 8bfe3cdd48ca3f47d054deb5aebc48154ffb4c88 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期六, 04 一月 2025 09:26:13 +0800
Subject: [PATCH] 完善
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastLogController.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastLogController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastLogController.java
index 314286d..ca3d690 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastLogController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastLogController.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.WrkMastLog;
import com.zy.asrs.common.wms.service.WrkMastLogService;
@@ -36,17 +37,30 @@
@RequestParam(required = false) String condition,
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<WrkMastLog> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(WrkMastLog::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(WrkMastLog::getWrkNo, condition);
- }
+ QueryWrapper<WrkMastLog> wrapper = new QueryWrapper<>();
+// wrapper.eq(WrkMastLog::getHostId, getHostId());
if (!Cools.isEmpty(timeRange)) {
String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(WrkMastLog::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(WrkMastLog::getAppeTime, DateUtils.convert(range[1]));
+ wrapper.ge("appe_time", DateUtils.convert(range[0]));
+ wrapper.le("appe_time", DateUtils.convert(range[1]));
}
- wrapper.orderByDesc(WrkMastLog::getId);
+ if (!Cools.isEmpty(param.get("barcode"))) {
+ wrapper.eq("barcode", param.get("barcode"));
+ }
+ if (!Cools.isEmpty(param.get("wrkNo"))) {
+ wrapper.eq("wrk_no", param.get("wrkNo"));
+ }
+ if (!Cools.isEmpty(param.get("wrkSts"))) {
+ wrapper.eq("wrk_sts", param.get("wrkSts"));
+ }
+ if (!Cools.isEmpty(param.get("ioType"))) {
+ wrapper.eq("iotype", param.get("ioType"));
+ }
+ if (!Cools.isEmpty(param.get("manuType"))) {
+ wrapper.like("manu_type", param.get("manuType"));
+ }
+ allLike(WrkMastLog.class, param.keySet(), wrapper, condition);
+ wrapper.orderByDesc("id");
return R.ok(wrkMastLogService.page(new Page<>(curr, limit), wrapper));
}
--
Gitblit v1.9.1