#

luxiaotao1123

2020-06-08 49696adc5a352be53bf5d5bbf1fafa23968b5e7c

#

 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());

 src/main/java/com/zy/asrs/entity/MatCodePrint.java

@@ -13,7 +13,7 @@
    /**
     * 条码地址
     */
    private String barcodeUrl;
    private String barcode;

    /**
     * 物料名称
@@ -38,12 +38,12 @@
        this.matNo = matNo;
    }

    public String getBarcodeUrl() {
        return barcodeUrl;
    public String getBarcode() {
        return barcode;
    }

    public void setBarcodeUrl(String barcodeUrl) {
        this.barcodeUrl = barcodeUrl;
    public void setBarcode(String barcode) {
        this.barcode = barcode;
    }

    public String getMatName() {

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

@@ -339,7 +339,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].barcodeUrl;
                        res.data[i]["barcodeUrl"]=baseUrl+"/macCode/barcode/auth?param="+res.data[i].barcode;
                    }
                    var tpl = $("#templatePreview"+templateNo).html();
                    var template = Handlebars.compile(tpl);

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

@@ -177,19 +177,20 @@
                            <td colspan="1" align="right" scope="col">条码</td>
                            <td class="barcode"colspan="3" align="left" scope="col">
                                <img class="template-qrcode" src="" width="80%">
                                <div style="letter-spacing: 2px;margin-top: 3px">xxxxxx</div>
                            </td>
                        </tr>
                        <tr>
                            <td align="right" width="25%">物料编码</td>
                            <td align="right" width="25%">1902980-11/12</td>
                            <td align="right" width="25%">xxxxxx-xx/xx</td>
                            <td align="right" width="25%">物料名称</td>
                            <td align="right" width="25%">铝带|1100-O|0.33*475|</td>
                            <td align="right" width="25%">xxxxxxx</td>
                        </tr>
                        <tr>
                            <td align="right" width="25%">物料单位</td>
                            <td align="right" width="25%">701010015907</td>
                            <td align="right" width="25%">xxxxxxxx</td>
                            <td align="right" width="25%">物料规格</td>
                            <td align="right" width="25%">鼎胜铝业香港_马来西亚UPT</td>
                            <td align="right" width="25%">xxxxxxx</td>
                        </tr>
                    </table>
                </div>
@@ -220,6 +221,7 @@
            <td colspan="1" align="right" scope="col">条码</td>
            <td class="barcode"colspan="3" align="left" scope="col">
                <img class="qrcode" src="/macCode/barcode/auth?param={{this.barcodeUrl}}" width="80%">
                <div style="letter-spacing: 2px;margin-top: 3px">{{this.barcode}}</div>
            </td>
        </tr>
        <tr>