From a1517b36ef4efc43dabe9cb0e6c659d74eeec8e9 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 17 七月 2020 16:01:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index 5558b3c..e2e4399 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -15,7 +15,9 @@
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;
@@ -41,6 +43,12 @@
@RequestMapping(value = "/matCode/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
+ return R.ok(matCodeService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/matCode/auth")
+ @ManagerAuth
+ public R find(@RequestParam("id") String id) {
return R.ok(matCodeService.selectById(String.valueOf(id)));
}
@@ -121,11 +129,7 @@
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;
@@ -151,7 +155,7 @@
}
// 鎵撳嵃
- @RequestMapping(value = "/macCode/print/auth")
+ @RequestMapping(value = "/matCode/print/auth")
@ManagerAuth(memo = "鐗╂枡缂栫爜鎵撳嵃")
public R matCodePrint(@RequestParam(value = "param[]") String[] param) {
if(Cools.isEmpty(param)) {
@@ -177,6 +181,7 @@
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