#

zjj

2023-09-22 84334c663dba00af90b4a3ffe86a4d321f8d5deb

#

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

@@ -426,9 +426,8 @@
        locCheckEntityWrapper.eq("order_no",orderNo);
        List<OrderDetl> list = orderDetlService.selectList(locCheckEntityWrapper);
        List<OrderDetlVo> orderDetlVos=new ArrayList<>();
        OrderDetlVo orderDetlVo=new OrderDetlVo();
        for (OrderDetl o:
             list) {
        for (OrderDetl o:list) {
            OrderDetlVo orderDetlVo=new OrderDetlVo();
            orderDetlVo.setOrderNo(o.getOrderNo());
            orderDetlVo.setMatnr(o.getMatnr());
            orderDetlVo.setMaktx(o.getMaktx());

 src/main/webapp/static/js/order/order.js

@@ -633,14 +633,15 @@
                    var barcodeUrl = baseUrl + "/order/code/auth?type=1&param=" + res.data[0].docNum;
                    console.log("barcodeUrl:"+barcodeUrl);
                    json.barcodeUrl = barcodeUrl;
                    console.log(json.data);
                    for (let i = 0; i < json.data.length; i++) {
                        var templateDom = $("#templatePreview" + templateNo);
                        var className = templateDom.attr("class");

                        if (className === 'template-barcode') {
                            json.data[i]["barcodeUrl"] = baseUrl + "/order/code/auth?type=2&param=" + (json.data[i].docNum+";"+json.data[i].matnr+";"+json.data[i].maktx+";"+json.data[i].anfme+";"+json.data[i].locNo+";");
                            json.data[i]["barcodeUrl"] = baseUrl + "/order/code/auth?type=2&param=" + (json.data[i].orderNo+";"+json.data[i].matnr+";"+json.data[i].maktx+";"+json.data[i].anfme+";"+json.data[i].locNo+";");
                        } else {
                            json.data[i]["barcodeUrl"] = baseUrl + "/order/code/auth?type=2&param=" + (json.data[i].docNum+";"+json.data[i].matnr+";"+json.data[i].maktx+";"+json.data[i].anfme+";"+json.data[i].locNo+";");
                            json.data[i]["barcodeUrl"] = baseUrl + "/order/code/auth?type=2&param=" + (json.data[i].orderNo+";"+json.data[i].matnr+";"+json.data[i].maktx+";"+json.data[i].anfme+";"+json.data[i].locNo+";");
                        }
                    }
                    var tpl = templateDom.html();