From 941bf6ff9bb24315dce4b9e39fb370b9fa766842 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 18 二月 2025 12:35:35 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/asrs/controller/OrderLogController.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderLogController.java b/src/main/java/com/zy/asrs/controller/OrderLogController.java
index b8e70ca..237e355 100644
--- a/src/main/java/com/zy/asrs/controller/OrderLogController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderLogController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.alibaba.excel.EasyExcel;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -8,13 +9,17 @@
import com.core.common.*;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.result.WrkTraceVo;
+import com.zy.asrs.excel.CloseOrderReadListener;
+import com.zy.asrs.excel.ExcelOrder;
import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
import java.util.*;
@Slf4j
@@ -39,6 +44,9 @@
private LocDetlService locDetlService;
@Autowired
private MatService matService;
+
+ @Autowired
+ private OrderService orderService;
@RequestMapping(value = "/orderLog/nav/list/auth")
@ManagerAuth
@@ -237,4 +245,15 @@
return R.ok();
}
+ /**
+ * 鏂囦欢涓婁紶,鍏抽棴鍗曟嵁
+ */
+ @PostMapping("/order/close")
+ @ResponseBody
+ @ManagerAuth
+ public R upload(MultipartFile file) throws IOException {
+ EasyExcel.read(file.getInputStream(), ExcelOrder.class, new CloseOrderReadListener(orderService)).sheet().doRead();
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1