From 8976457876d817ae1e00b721fce595a376d34435 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 07 四月 2021 08:14:59 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/wms-cloud
---
src/main/java/zy/cloud/wms/manager/controller/MatController.java | 65 ++++++++++++++++++++++++++++++--
1 files changed, 61 insertions(+), 4 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/MatController.java b/src/main/java/zy/cloud/wms/manager/controller/MatController.java
index c6f0655..365eee8 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/MatController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/MatController.java
@@ -12,14 +12,20 @@
import com.core.common.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import zy.cloud.wms.common.CodeRes;
+import zy.cloud.wms.common.config.AdminInterceptor;
+import zy.cloud.wms.common.utils.BarcodeUtils;
+import zy.cloud.wms.common.utils.QrCode;
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.Mat;
+import zy.cloud.wms.manager.entity.MatPrint;
import zy.cloud.wms.manager.service.MatService;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.*;
@RestController
public class MatController extends BaseController {
@@ -74,6 +80,10 @@
@RequestMapping(value = "/mat/add/auth")
@ManagerAuth
public R add(Mat mat) {
+ mat.setCreateBy(getUserId());
+ mat.setCreateTime(new Date());
+ mat.setUpdateBy(getUserId());
+ mat.setUpdateTime(new Date());
matService.insert(mat);
return R.ok();
}
@@ -84,6 +94,8 @@
if (Cools.isEmpty(mat) || null==mat.getId()){
return R.error();
}
+ mat.setUpdateBy(getUserId());
+ mat.setUpdateTime(new Date());
matService.updateById(mat);
return R.ok();
}
@@ -138,4 +150,49 @@
return R.ok();
}
+ @RequestMapping(value = "/mac/code/auth")
+// @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);
+ }
+ BufferedImage img;
+ if (type == 1) {
+ img = BarcodeUtils.encode(param);
+ } else {
+ img = QrCode.createImg(param);
+ }
+ if (!ImageIO.write(img, "jpg", response.getOutputStream())) {
+ throw new IOException("Could not write an image of format jpg");
+ }
+ response.getOutputStream().flush();
+ response.getOutputStream().close();
+ return R.ok();
+ }
+
+ // 鎵撳嵃
+ @RequestMapping(value = "/mat/print/auth")
+ @ManagerAuth(memo = "鐗╂枡缂栫爜鎵撳嵃")
+ public R matCodePrint(@RequestParam(value = "param[]") String[] param) {
+ if(Cools.isEmpty(param)) {
+ return R.parse(CodeRes.EMPTY);
+ }
+ List<MatPrint> res = new ArrayList<>();
+ for (String matnr : param){
+ Mat mat = matService.selectByMatnr(matnr);
+ // 鎵撳嵃鏁版嵁娉ㄥ叆
+ MatPrint print = new MatPrint();
+ print.setMatnr(mat.getMatnr());
+ print.setBarcode(mat.getBarcode());
+ print.setMaktx(mat.getMaktx());
+ print.setSpecs(mat.getSpecs());
+ print.setUnit(mat.getUnit());
+ res.add(print);
+ }
+ return R.ok().add(res);
+ }
+
}
--
Gitblit v1.9.1