From ac4341ea6b66ae02427d39d35f41d42d78b2eb2e Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 14 二月 2025 10:08:32 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderLogController.java | 69 ++++++++++++++++++++++++++++++----
1 files changed, 60 insertions(+), 9 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderLogController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderLogController.java
index 4688f14..029052a 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderLogController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderLogController.java
@@ -1,11 +1,14 @@
package com.zy.asrs.wms.asrs.controller;
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.framework.common.Cools;
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.asrs.entity.Order;
import com.zy.asrs.wms.asrs.entity.OrderType;
import com.zy.asrs.wms.asrs.service.OrderTypeService;
+import com.zy.asrs.wms.common.annotation.CacheData;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
import com.zy.asrs.wms.common.domain.KeyValVo;
@@ -14,6 +17,7 @@
import com.zy.asrs.wms.asrs.service.OrderLogService;
import com.zy.asrs.wms.system.controller.BaseController;
import com.zy.asrs.wms.utils.ExcelUtil;
+import com.zy.asrs.wms.utils.Utils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -35,6 +39,7 @@
@PreAuthorize("hasAuthority('asrs:orderLog:list')")
@PostMapping("/orderLog/page")
+ @CacheData(tableName = {"man_order_log"})
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<OrderLog, BaseParam> pageParam = new PageParam<>(baseParam, OrderLog.class);
@@ -43,62 +48,92 @@
@PreAuthorize("hasAuthority('asrs:orderLog:list')")
@PostMapping("/orderLog/in/page")
+ @CacheData(tableName = {"man_order_log", "man_order_type"})
public R pageIn(@RequestBody Map<String, Object> map) {
String condition = map.getOrDefault("condition", "").toString();
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<OrderLog, BaseParam> pageParam = new PageParam<>(baseParam, OrderLog.class);
// QueryWrapper<OrderLog> wrapper = pageParam.buildWrapper(true);
- LambdaQueryWrapper<OrderLog> wrapper = new LambdaQueryWrapper<>();
+ QueryWrapper<OrderLog> wrapper = new QueryWrapper<>();
ArrayList<Long> types = new ArrayList<>();
for (OrderType orderType : orderTypeService.list(new LambdaQueryWrapper<OrderType>().eq(OrderType::getType, 1))) {
types.add(orderType.getId());
}
- wrapper.in(OrderLog::getOrderType, types);
+ wrapper.in("order_type", types);
if (!Cools.isEmpty(condition)) {
wrapper.and(wrapper1 -> {
- wrapper1.or().like(OrderLog::getOrderNo, condition);
- wrapper1.or().like(OrderLog::getMemo, condition);
+ wrapper1.or().like("order_no", condition);
+ wrapper1.or().like("memo", condition);
});
}
+
+ Object paramObj = map.get("_param");
+ if (paramObj != null) {
+ Map param = (Map) paramObj;
+ for (Object value : param.entrySet()) {
+ Map.Entry entry = (Map.Entry) value;
+ String paramKey = Utils.toSymbolCase(entry.getKey().toString(), '_');
+ if (entry.getValue() != null) {
+ wrapper.like(paramKey, entry.getValue());
+ }
+ }
+ }
+
return R.ok().add(orderLogService.page(pageParam, wrapper));
}
@PreAuthorize("hasAuthority('asrs:orderLog:list')")
@PostMapping("/orderLog/out/page")
+ @CacheData(tableName = {"man_order_log", "man_order_type"})
public R pageOut(@RequestBody Map<String, Object> map) {
String condition = map.getOrDefault("condition", "").toString();
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<OrderLog, BaseParam> pageParam = new PageParam<>(baseParam, OrderLog.class);
// QueryWrapper<OrderLog> wrapper = pageParam.buildWrapper(true);
- LambdaQueryWrapper<OrderLog> wrapper = new LambdaQueryWrapper<>();
+ QueryWrapper<OrderLog> wrapper = new QueryWrapper<>();
ArrayList<Long> types = new ArrayList<>();
for (OrderType orderType : orderTypeService.list(new LambdaQueryWrapper<OrderType>().eq(OrderType::getType, 2))) {
types.add(orderType.getId());
}
- wrapper.in(OrderLog::getOrderType, types);
+ wrapper.in("order_type", types);
if (!Cools.isEmpty(condition)) {
wrapper.and(wrapper1 -> {
- wrapper1.or().like(OrderLog::getOrderNo, condition);
- wrapper1.or().like(OrderLog::getMemo, condition);
+ wrapper1.or().like("order_no", condition);
+ wrapper1.or().like("memo", condition);
});
}
+
+ Object paramObj = map.get("_param");
+ if(paramObj != null) {
+ Map param = (Map) paramObj;
+ for (Object value : param.entrySet()) {
+ Map.Entry entry = (Map.Entry) value;
+ String paramKey = Utils.toSymbolCase(entry.getKey().toString(), '_');
+ if (entry.getValue() != null) {
+ wrapper.like(paramKey, entry.getValue());
+ }
+ }
+ }
+
return R.ok().add(orderLogService.page(pageParam, wrapper));
}
@PreAuthorize("hasAuthority('asrs:orderLog:list')")
@PostMapping("/orderLog/list")
+ @CacheData(tableName = {"man_order_log"})
public R list(@RequestBody Map<String, Object> map) {
return R.ok().add(orderLogService.list());
}
@PreAuthorize("hasAuthority('asrs:orderLog:list')")
@GetMapping("/orderLog/{id}")
+ @CacheData(tableName = {"man_order_log"})
public R get(@PathVariable("id") Long id) {
return R.ok().add(orderLogService.getById(id));
}
@@ -150,7 +185,23 @@
@PreAuthorize("hasAuthority('asrs:orderLog:list')")
@PostMapping("/orderLog/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(orderLogService.list(), OrderLog.class), response);
+ String ioModel = map.getOrDefault("ioModel", "").toString();
+ map.remove("ioModel");
+
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<OrderLog, BaseParam> pageParam = new PageParam<>(baseParam, OrderLog.class);
+ QueryWrapper<OrderLog> queryWrapper = pageParam.buildWrapper(true);
+
+ List<OrderLog> list = orderLogService.list(queryWrapper);
+ if (!Cools.isEmpty(ioModel)) {
+ ArrayList<Long> types = new ArrayList<>();
+ for (OrderType orderType : orderTypeService.list(new LambdaQueryWrapper<OrderType>().eq(OrderType::getType, ioModel.equals("in") ? 1 : 2))) {
+ types.add(orderType.getId());
+ }
+ queryWrapper.in("order_type", types);
+ list = orderLogService.list(queryWrapper);
+ }
+ ExcelUtil.build(ExcelUtil.create(list, OrderLog.class), response);
}
}
--
Gitblit v1.9.1