From 1d71e8d6e37f7e992c9db9a77b9be86cb240afa1 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期五, 18 四月 2025 11:00:28 +0800 Subject: [PATCH] #修改 1. 收货通知单导入报错问题修复 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 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 2e9e296..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; @@ -13,6 +15,7 @@ import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams; import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam; import com.vincent.rsf.server.manager.entity.AsnOrder; +import com.vincent.rsf.server.manager.entity.Matnr; import com.vincent.rsf.server.manager.service.AsnOrderService; import com.vincent.rsf.server.system.constant.SerialRuleCode; import com.vincent.rsf.server.system.controller.BaseController; @@ -121,7 +124,18 @@ @PostMapping("/asnOrder/export") @ApiOperation("瀵煎嚭") public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception { - ExcelUtil.build(ExcelUtil.create(asnOrderService.list(), AsnOrder.class), response); + List<AsnOrder> orders = new ArrayList<>(); + if (!Objects.isNull(map.get("ids"))) { + 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>()); + } + ExcelUtil.build(ExcelUtil.create(orders, AsnOrder.class), response); } /** -- Gitblit v1.9.1