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 | 9 +++------
1 files changed, 3 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 2b48214..e2e4399 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -15,6 +15,7 @@
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;
@@ -46,7 +47,7 @@
}
@RequestMapping(value = "/matCode/auth")
-// @ManagerAuth
+ @ManagerAuth
public R find(@RequestParam("id") String id) {
return R.ok(matCodeService.selectById(String.valueOf(id)));
}
@@ -128,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;
--
Gitblit v1.9.1