From 40caddc08252ad3276832a14a69cfaf9f71b08c8 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期二, 05 十一月 2024 08:53:41 +0800
Subject: [PATCH] 完善
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 48 insertions(+), 12 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
index e85fac5..32772ee 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
@@ -299,20 +299,56 @@
@RequestMapping(value = "/stock/out/list/auth")
@ManagerAuth
- public R stockOutList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- if (!Cools.isEmpty(param.get("modi_time"))){
- String val = String.valueOf(param.get("modi_time"));
- if (val.contains(RANGE_TIME_LINK)) {
- String[] dates = val.split(RANGE_TIME_LINK);
- param.put("startTime", DateUtils.convert(dates[0]));
- param.put("endTime", DateUtils.convert(dates[1]));
- param.remove("modi_time");
+ public R stockOutList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam(required = false) String timeRange,
+ @RequestParam Map<String, Object> param) {
+ QueryWrapper<LocDetl> wrapper = new QueryWrapper<>();
+
+ if (!Cools.isEmpty(param.get("decrees"))) {
+ ArrayList<String> mats = new ArrayList<>();
+ List<Mat> decrees = matService.list(new LambdaQueryWrapper<Mat>().like(Mat::getDecrees, param.get("decrees")));
+ if (decrees.isEmpty()) {
+ mats.add("-1");
+ }else {
+ for (Mat mat : decrees) {
+ mats.add(mat.getMatnr());
+ }
}
+ wrapper.in("matnr", mats);
+ param.remove("decrees");
}
- param.put("hostId", getHostId());
- return R.ok(locDetlService.getStockOut(curr, limit, param));
+
+ convert(param,wrapper);
+ wrapper.eq("host_id", getHostId());
+// if (!Cools.isEmpty(condition)) {
+// wrapper.like(LocDetl::getLocNo, condition);
+// }
+ if (!Cools.isEmpty(timeRange)) {
+ String[] range = timeRange.split(RANGE_TIME_LINK);
+ wrapper.ge("appe_time", DateUtils.convert(range[0]));
+ wrapper.le("appe_time", DateUtils.convert(range[1]));
+ }
+ if (!Cools.isEmpty(param.get("locNo"))) {
+ wrapper.like("loc_no", param.get("locNo"));
+ }
+
+ if (!Cools.isEmpty(param.get("zpallet"))) {
+ wrapper.like("zpallet", param.get("zpallet"));
+ }
+
+ if (!Cools.isEmpty(orderByField)){
+ wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));
+ }
+
+ param.remove("locNo");
+ param.remove("owner");
+ param.remove("matnr");
+ allLike(LocDetl.class, param.keySet(), wrapper, condition);
+ return R.ok(locDetlService.page(new Page<>(curr, limit), wrapper));
}
@RequestMapping(value = "/locDetl/statis/export")
--
Gitblit v1.9.1