From 8bec6dd2d43529e1c065a7bfaf6eaaac38220c7f Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 02 一月 2024 10:21:55 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/AdjDetlController.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/AdjDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/AdjDetlController.java
index 82aa100..8831ced 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/AdjDetlController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/AdjDetlController.java
@@ -2,7 +2,10 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.AbstractWrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.wms.entity.AdjDetl;
import com.zy.asrs.common.wms.service.AdjDetlService;
@@ -44,6 +47,12 @@
String[] range = timeRange.split(RANGE_TIME_LINK);
wrapper.ge(AdjDetl::getAppeTime, DateUtils.convert(range[0]));
wrapper.le(AdjDetl::getAppeTime, DateUtils.convert(range[1]));
+ }
+ if (!Cools.isEmpty(param.get("loc_no"))) {
+ wrapper.like(AdjDetl::getLocNo, param.get("loc_no"));
+ }
+ if (!Cools.isEmpty(param.get("matnr"))) {
+ wrapper.like(AdjDetl::getMatnr, param.get("matnr"));
}
return R.ok(adjDetlService.page(new Page<>(curr, limit), wrapper));
}
@@ -103,4 +112,25 @@
return R.ok().add(vos);
}
+ @RequestMapping(value = "/adjDetl/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ LambdaQueryWrapper<AdjDetl> wrapper = new LambdaQueryWrapper<>();
+ Map<String, Object> map = excludeTrash(param.getJSONObject("adjDetl"));
+ if (!Cools.isEmpty(map.get("loc_no"))) {
+ wrapper.like(AdjDetl::getLocNo, map.get("loc_no"));
+ }
+ if (!Cools.isEmpty(map.get("matnr"))) {
+ wrapper.like(AdjDetl::getMatnr, map.get("matnr"));
+ }
+ if (!Cools.isEmpty(map.get("modi_time"))) {
+ String[] range = map.get("modi_time").toString().split(RANGE_TIME_LINK);
+ wrapper.ge(AdjDetl::getAppeTime, DateUtils.convert(range[0]));
+ wrapper.le(AdjDetl::getAppeTime, DateUtils.convert(range[1]));
+ }
+ List<AdjDetl> list = adjDetlService.list(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
}
--
Gitblit v1.9.1