From 669fe984048785873c20fbd0ce8abb3cd52c1fce Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 29 四月 2025 15:22:24 +0800
Subject: [PATCH] 新增出库单优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
index e8b7059..014c228 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
@@ -1,6 +1,8 @@
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;
@@ -133,14 +135,18 @@
@PostMapping("/asnOrderItem/export")
@ApiOperation("瀵煎嚭鏀惰揣閫氱煡鍗曟槑缁�")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
-// AsnOrderTemplate template = ExcelUtil.mockData(AsnOrderTemplate.class);
-// List<AsnOrderTemplate> list = new ArrayList<>();
-// list.add(template);
List<AsnOrderItem> orderItems = new ArrayList<>();
if (!Objects.isNull(map.get("ids"))) {
- orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getId, map.get("ids")).eq(AsnOrderItem::getStatus, 1));
+ List<Long> ids = JSONArray.parseArray(JSONObject.toJSONString(map.get("ids")), Long.class);
+ if (!ids.isEmpty()) {
+ orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
+ .in(AsnOrderItem::getId, ids)
+ .eq(AsnOrderItem::getStatus, 1));
+ } else {
+ orderItems = asnOrderItemService.list(new LambdaQueryWrapper<>());
+ }
} else {
- orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>());
+ orderItems = asnOrderItemService.list(new LambdaQueryWrapper<>());
}
ExcelUtil.build(ExcelUtil.create(orderItems, AsnOrderItem.class, true), response);
@@ -170,12 +176,23 @@
R.error("鏂囦欢涓嶈兘涓虹┖锛侊紒");
}
HashMap<String, Object> hashMap = new HashMap<>();
- if (!Objects.isNull(asnId)) {
- hashMap.put("asnId", asnId);
- }
-
- return asnOrderItemService.excelImport(file, hashMap);
+ return asnOrderItemService.excelImport(file, hashMap, getLoginUserId());
}
+ /**
+ * @author Ryan
+ * @description 涓嬭浇妯℃澘
+ * @param
+ * @return
+ * @time 2025/4/18 08:17
+ */
+ @PostMapping("/asnOrderItem/template/download")
+ @ApiOperation("涓嬭浇鏀惰揣鍗曟ā鏉�")
+ @PreAuthorize("hasAuthority('manager:asnOrderItem:update')")
+ public void downloadTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ AsnOrderTemplate template = ExcelUtil.mockData(AsnOrderTemplate.class);
+ List<AsnOrderTemplate> list = Arrays.asList(template);
+ ExcelUtil.build(ExcelUtil.create(list, AsnOrderTemplate.class, true), response);
+ }
}
--
Gitblit v1.9.1