#

luxiaotao1123

2020-06-18 563029f1f26ef2ed46d2d3b4207cd1924b1cf63a

 src/main/java/com/zy/asrs/controller/MatCodeController.java

@@ -17,6 +17,7 @@
import com.zy.asrs.service.MatCodeService;
import com.zy.common.CodeRes;
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;
@@ -64,7 +65,7 @@
            } else if (entry.getKey().endsWith("<")) {
                wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
            } else {
                wrapper.eq(entry.getKey(), String.valueOf(entry.getValue()));
                wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
            }
        }
    }
@@ -157,7 +158,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,11 +167,20 @@
        return R.ok().add(res);
    }

    // todo resource
    @RequestMapping(value = "/macCode/barcode/auth")
    @ManagerAuth(memo = "物料编码条形码获取")
    public R matCodeBarcode(@RequestParam String param, HttpServletResponse response) throws IOException {
        BufferedImage img = BarcodeUtils.encode(param);
    @RequestMapping(value = "/macCode/code/auth")
//    @ManagerAuth(memo = "物料编码条形码获取(type:1(条形码);2(二维码)")
    public R matCodeBarcode(@RequestParam(defaultValue = "1") Integer type
                        , @RequestParam String param
                        , HttpServletResponse response) throws Exception {
        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");
        }