From 03d710eba5cb116976e434f03140238be8a18059 Mon Sep 17 00:00:00 2001 From: pjb <pjb123456> Date: 星期一, 30 六月 2025 15:36:38 +0800 Subject: [PATCH] wms功能完善 --- src/main/java/com/zy/asrs/controller/BasCrnErrorController.java | 30 +++++++++++++++++++++++++++--- 1 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java b/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java index f8981e9..ed1dc0e 100644 --- a/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java +++ b/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java @@ -1,21 +1,27 @@ package com.zy.asrs.controller; +import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.plugins.Page; -import com.zy.asrs.entity.BasCrnError; -import com.zy.asrs.service.BasCrnErrorService; -import com.zy.common.web.BaseController; import com.core.annotations.ManagerAuth; import com.core.common.BaseRes; import com.core.common.Cools; import com.core.common.DateUtils; import com.core.common.R; +import com.zy.asrs.entity.BasCrnError; +import com.zy.asrs.importexcle.ImportCrnErrDto; +import com.zy.asrs.importexcle.ImportCrnErrListener; +import com.zy.asrs.service.BasCrnErrorService; +import com.zy.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; import java.util.*; @RestController @@ -30,6 +36,24 @@ return R.ok(basCrnErrorService.selectById(String.valueOf(id))); } + @PostMapping("/importCrnErr") + @ManagerAuth(memo = "瀵煎叆鍫嗗灈鏈哄紓甯歌〃") + public R importCrnErr(@RequestParam("file") MultipartFile multipartFile) { + try { + importCrnErrExec(multipartFile); + } catch (Exception e) { + e.printStackTrace(); + return R.error(e.getMessage()); + } + return R.ok("瀵煎叆鎴愬姛"); + } + + @Transactional(rollbackFor = Exception.class) + public void importCrnErrExec(MultipartFile multipartFile) throws IOException { + EasyExcel.read(multipartFile.getInputStream(), ImportCrnErrDto.class, + new ImportCrnErrListener(basCrnErrorService)).sheet().doReadSync(); + } + @RequestMapping(value = "/basCrnError/list/auth") @ManagerAuth public R list(@RequestParam(defaultValue = "1")Integer curr, -- Gitblit v1.9.1