From d16d3b70e94f798d7e5abd145f8566d81d0c66c9 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期二, 14 六月 2022 18:07:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index 8ca68d0..c983d44 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -15,13 +15,16 @@
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.entity.MatCodePrint;
import com.zy.asrs.service.MatCodeService;
+import com.zy.asrs.utils.VersionUtils;
import com.zy.common.CodeRes;
+import com.zy.common.config.AdminInterceptor;
import com.zy.common.utils.BarcodeUtils;
import com.zy.common.utils.QrCode;
import com.zy.common.utils.excel.matcode.MatCodeExcel;
import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
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;
@@ -37,6 +40,22 @@
@Autowired
private MatCodeService matCodeService;
+
+ @RequestMapping(value = "/matCode/auto/id/auth")
+ @ManagerAuth
+ public R autoId() {
+ String matnr = "";
+ do {
+ matnr = getNewMatnr();
+ } while (matCodeService.selectById(matnr) != null);
+ return R.ok().add(matnr);
+ }
+
+ private String getNewMatnr(){
+ StringBuilder sb = new StringBuilder("MAT");
+ sb.append(new Date().getTime());
+ return sb.toString();
+ }
@RequestMapping(value = "/matCode/{id}/auth")
@ManagerAuth
@@ -120,18 +139,14 @@
// 瀵煎嚭
@RequestMapping(value = "/matCode/export/auth")
- @ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐗╂枡缂栫爜鏁版嵁瀵煎嚭")
+ @ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鍟嗗搧缂栧彿鏁版嵁瀵煎嚭")
public void export(@RequestParam(required = false) String fileName,
@RequestParam(required = false) Integer rowCount,
HttpServletResponse response) throws Exception {
List<MatCode> list = matCodeService.selectList(new EntityWrapper<>());
List<MatCodeExcel> excels = new ArrayList<>();
for (MatCode matCode : list) {
- MatCodeExcel excel = new MatCodeExcel();
- excel.setMatNo(matCode.getMatNo());
- excel.setBarcode(matCode.getBarcode());
- excel.setMatName(matCode.getMatName());
- excel.setStr1(matCode.getStr1());
+ MatCodeExcel excel = VersionUtils.getExcel(matCode);
excels.add(excel);
if (rowCount != null && excels.size() >= rowCount){
break;
@@ -139,7 +154,7 @@
}
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
- fileName = URLEncoder.encode(Cools.isEmpty(fileName)?"鐗╂枡缂栫爜":fileName, "UTF-8");
+ fileName = URLEncoder.encode(Cools.isEmpty(fileName)?"鍟嗗搧缂栧彿":fileName, "UTF-8");
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
EasyExcel.write(response.getOutputStream(), MatCodeExcel.class)
.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
@@ -149,7 +164,8 @@
// 瀵煎叆
@RequestMapping(value = "/matCode/import/auth")
- @ManagerAuth(memo = "鐗╂枡缂栫爜鏁版嵁瀵煎叆")
+ @ManagerAuth(memo = "鍟嗗搧缂栧彿鏁版嵁瀵煎叆")
+ @Transactional
public R matCodeImport(MultipartFile file) throws IOException, InterruptedException {
MatCodeExcelListener listener = new MatCodeExcelListener(getUserId());
EasyExcel.read(file.getInputStream(), MatCodeExcel.class, listener).sheet().doRead();
@@ -158,7 +174,7 @@
// 鎵撳嵃
@RequestMapping(value = "/matCode/print/auth")
- @ManagerAuth(memo = "鐗╂枡缂栫爜鎵撳嵃")
+ @ManagerAuth(memo = "鍟嗗搧缂栧彿鎵撳嵃")
public R matCodePrint(@RequestParam(value = "param[]") String[] param) {
if(Cools.isEmpty(param)) {
return R.parse(CodeRes.EMPTY);
@@ -179,10 +195,11 @@
}
@RequestMapping(value = "/macCode/code/auth")
-// @ManagerAuth(memo = "鐗╂枡缂栫爜鏉″舰鐮佽幏鍙�(type:1(鏉″舰鐮�);2(浜岀淮鐮�)")
+// @ManagerAuth(memo = "鍟嗗搧缂栧彿鏉″舰鐮佽幏鍙�(type:1(鏉″舰鐮�);2(浜岀淮鐮�)")
public R matCodeBarcode(@RequestParam(defaultValue = "1") Integer type
, @RequestParam String param
, HttpServletResponse response) throws Exception {
+ AdminInterceptor.cors(response);
if (Cools.isEmpty(param)){
return R.parse(BaseRes.EMPTY);
}
--
Gitblit v1.9.1