From ade4bc8f860e3d905370db56f81723910e7f19e8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 六月 2020 14:33:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index eea80d8..59b91c1 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -157,7 +157,7 @@
// 鎵撳嵃鏁版嵁娉ㄥ叆
MatCodePrint print = new MatCodePrint();
print.setMatNo(matCode.getMatNo());
- print.setBarcodeUrl(matCode.getBarcode());
+ print.setBarcode(matCode.getBarcode());
print.setMatName(matCode.getMatName());
print.setStr1(matCode.getStr1());
print.setStr2(matCode.getStr2());
@@ -166,10 +166,12 @@
return R.ok().add(res);
}
- // todo resource
@RequestMapping(value = "/macCode/barcode/auth")
- @ManagerAuth(memo = "鐗╂枡缂栫爜鏉″舰鐮佽幏鍙�")
+// @ManagerAuth(memo = "鐗╂枡缂栫爜鏉″舰鐮佽幏鍙�")
public R matCodeBarcode(@RequestParam String param, HttpServletResponse response) throws IOException {
+ if (Cools.isEmpty(param)){
+ return R.parse(BaseRes.EMPTY);
+ }
BufferedImage img = BarcodeUtils.encode(param);
if (!ImageIO.write(img, "jpg", response.getOutputStream())) {
throw new IOException("Could not write an image of format jpg");
--
Gitblit v1.9.1