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/WrkMastLogController.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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 962d6d6..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,29 +37,30 @@
@RequestParam(required = false) String condition,
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<WrkMastLog> wrapper = new LambdaQueryWrapper<>();
+ QueryWrapper<WrkMastLog> wrapper = new QueryWrapper<>();
// wrapper.eq(WrkMastLog::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(WrkMastLog::getWrkNo, condition);
- }
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]));
+ }
+ if (!Cools.isEmpty(param.get("barcode"))) {
+ wrapper.eq("barcode", param.get("barcode"));
}
if (!Cools.isEmpty(param.get("wrkNo"))) {
- wrapper.eq(WrkMastLog::getWrkNo, param.get("wrkNo"));
+ wrapper.eq("wrk_no", param.get("wrkNo"));
}
if (!Cools.isEmpty(param.get("wrkSts"))) {
- wrapper.eq(WrkMastLog::getWrkSts, param.get("wrkSts"));
+ wrapper.eq("wrk_sts", param.get("wrkSts"));
}
if (!Cools.isEmpty(param.get("ioType"))) {
- wrapper.eq(WrkMastLog::getIoType, param.get("ioType"));
+ wrapper.eq("iotype", param.get("ioType"));
}
if (!Cools.isEmpty(param.get("manuType"))) {
- wrapper.like(WrkMastLog::getManuType, param.get("manuType"));
+ wrapper.like("manu_type", param.get("manuType"));
}
- wrapper.orderByDesc(WrkMastLog::getId);
+ allLike(WrkMastLog.class, param.keySet(), wrapper, condition);
+ wrapper.orderByDesc("id");
return R.ok(wrkMastLogService.page(new Page<>(curr, limit), wrapper));
}
--
Gitblit v1.9.1