Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms

zc

2025-09-04 fae739affd1b7aa0efb6f582c4e09e7030784857

 src/main/webapp/static/js/mat/mat.js

@@ -333,7 +333,8 @@
                    for (let i=0;i<res.data.length;i++){
                        var templateDom = $("#templatePreview"+templateNo);
                        var className = templateDom.attr("class");
                        var param = "编码:"+res.data[i].matnr+";名称:"+res.data[i].maktx+";规格:"+res.data[i].specs;
                        var param = res.data[i].matnr;
                        //var param = "编码:"+res.data[i].matnr+";名称:"+res.data[i].maktx+";规格:"+res.data[i].specs;
                        var encodeUrl = encodeURIComponent(param);
                        if (className === 'template-barcode') {
                            res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=1&param="+encodeUrl;