#

luxiaotao1123

2020-06-08 377fba33b54de574b044514c772f6268f485e6bf

#

 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;
@@ -166,13 +167,20 @@
        return R.ok().add(res);
    }

    @RequestMapping(value = "/macCode/barcode/auth")
//    @ManagerAuth(memo = "物料编码条形码获取")
    public R matCodeBarcode(@RequestParam String param, HttpServletResponse response) throws IOException {
    @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 = BarcodeUtils.encode(param);
        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");
        }

 src/main/webapp/static/js/matCode/matCode.js

@@ -345,7 +345,7 @@
                if (res.code === 200){
                    layer.closeAll();
                    for (let i=0;i<res.data.length;i++){
                        res.data[i]["barcodeUrl"]=baseUrl+"/macCode/barcode/auth?param="+res.data[i].barcode;
                        res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=1&param="+res.data[i].barcode;
                    }
                    var tpl = $("#templatePreview"+templateNo).html();
                    var template = Handlebars.compile(tpl);

 src/main/webapp/views/matCode/matCode.html

@@ -138,7 +138,7 @@
                        <tr>
                            <td colspan="1" align="center" scope="col">条码</td>
                            <td class="barcode" colspan="3" align="center" scope="col">
                                <img class="template-qrcode" src="" width="80%">
                                <img class="template-code" src="" width="80%">
                                <div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
                                    <span>xxxxxx</span>
                                </div>
@@ -180,7 +180,7 @@
                        </tr>
                        <tr>
                            <td align="center" colspan="6" style="border: none">
                                <img class="template-qrcode" src="" width="80%">
                                <img class="template-code" src="" width="80%">
                                <div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
                                    <span>xxxxxx</span>
                                </div>
@@ -205,7 +205,7 @@

<!-- 初始化打印模板的条形码 -->
<script type="text/javascript">
    $('.template-qrcode').attr("src", baseUrl+"/macCode/barcode/auth?param=123");
    $('.template-code').attr("src", baseUrl+"/macCode/code/auth?type=1&param=123");
</script>

<!-- 模板引擎 -->
@@ -259,7 +259,7 @@
        </tr>
        <tr>
            <td align="center" colspan="6" style="border: none">
                <img class="template-qrcode" src="{{this.barcodeUrl}}" width="80%">
                <img class="template-code" src="{{this.barcodeUrl}}" width="80%">
                <div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
                    <span>{{this.matNo}}</span>
                </div>
@@ -270,6 +270,7 @@
</script>
<!-- 模板3 -->
<script type="text/template" id="templatePreview3">

</script>

</body>