From b30e2878e41607fb7fb8168e3b5b61948d7c359a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 四月 2025 16:25:12 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
index b6458c5..84681bd 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
@@ -1,5 +1,7 @@
package com.vincent.rsf.server.manager.controller;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
@@ -124,9 +126,14 @@
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
List<AsnOrder> orders = new ArrayList<>();
if (!Objects.isNull(map.get("ids"))) {
- orders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, map.get("ids")).eq(AsnOrder::getStatus, 1));
+ List<Long> ids = JSONArray.parseArray(JSONObject.toJSONString(map.get("ids")), Long.class);
+ if (!ids.isEmpty()) {
+ orders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, ids));
+ } else {
+ orders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>());
+ }
} else {
- orders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().last("limit 1"));
+ orders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>());
}
ExcelUtil.build(ExcelUtil.create(orders, AsnOrder.class), response);
}
--
Gitblit v1.9.1