From 4762a3b013f83a7c24fcceedb2a8c09b7fc33dbd Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 21 十月 2024 15:56:53 +0800
Subject: [PATCH] 知道组盘点托盘码
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index ad11d86..8b23556 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -13,16 +13,20 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.entity.Mat;
+import com.zy.asrs.importexcle.LocMat;
+import com.zy.asrs.importexcle.LocMatListener;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
-import com.zy.asrs.service.ManLocDetlService;
+import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.MatService;
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 javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
@@ -38,6 +42,26 @@
private LocDetlMapper locDetlMapper;
@Autowired
private MatService matService;
+
+ @Resource
+ private LocMastService locMastService;
+
+ @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("瀵煎叆鎴愬姛");
+ }
+ @Transactional(rollbackFor = Exception.class)
+ public void importLocData1(MultipartFile multipartFile) throws IOException {
+ EasyExcel.read(multipartFile.getInputStream(), LocMat.class,
+ new LocMatListener(locMastService,locDetlMapper,getUserId())).sheet().doReadSync();
+ }
@RequestMapping(value = "/locDetl/update")
public R update1() {
@@ -83,7 +107,11 @@
param.remove("modi_time");
}
}
- return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
+ Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class));
+ if (stockOut.getRecords().size()==0){
+ stockOut = locDetlService.getStockOut(toPage(1, limit, param, LocDetl.class));
+ }
+ return R.ok(stockOut);
}
@RequestMapping(value = "/locDetl/list/auth")// /locDetl/list/auth 鎺ュ彛闂
--
Gitblit v1.9.1