From 25e2f9601aed6d23923f3200ef248036b7787e7c Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 29 四月 2025 10:51:31 +0800
Subject: [PATCH] 产品合格校验手动excel导入
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index d478272..9639102 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -14,13 +14,16 @@
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.param.ProductCalibrationExcelParam;
import com.zy.asrs.importexcle.LocMat;
import com.zy.asrs.importexcle.LocMatListener;
+import com.zy.asrs.importexcle.ProductCalibrationImportListener;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.MatService;
import com.zy.common.web.BaseController;
+import org.apache.ibatis.session.SqlSessionFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -46,11 +49,26 @@
@Resource
private LocMastService locMastService;
+ @Resource
+ private SqlSessionFactory sqlSessionFactory;
+
@PostMapping("/importLocData")
@ManagerAuth(memo = "瀵煎叆绔嬪簱宸叉湁搴撳瓨")
public R importLocData(@RequestParam("file") MultipartFile multipartFile) {
try {
importLocData1(multipartFile);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return R.error(e.getMessage());
+ }
+ return R.ok("瀵煎叆鎴愬姛");
+ }
+
+ @PostMapping("/productCalibration")
+ @ManagerAuth(memo = "浜у搧鏍￠獙瀵煎叆excel鏂瑰紡")
+ public R productCalibration(@RequestParam("file") MultipartFile multipartFile) {
+ try {
+ productCalibrationExcel(multipartFile);
} catch (Exception e) {
e.printStackTrace();
return R.error(e.getMessage());
@@ -73,6 +91,12 @@
new LocMatListener(locMastService,locDetlMapper,getUserId())).sheet().doReadSync();
}
+ @Transactional(rollbackFor = Exception.class)
+ public void productCalibrationExcel(MultipartFile multipartFile) throws IOException {
+ EasyExcel.read(multipartFile.getInputStream(), ProductCalibrationExcelParam.class,
+ new ProductCalibrationImportListener(sqlSessionFactory)).sheet().doReadSync();
+ }
+
@RequestMapping(value = "/locDetl/update")
public R update1() {
if (!locDetlService.updateLocNo("0402805", "0402804")) {
--
Gitblit v1.9.1