From 84334c663dba00af90b4a3ffe86a4d321f8d5deb Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 22 九月 2023 16:23:54 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/OrderController.java |    5 ++---
 src/main/webapp/static/js/order/order.js                  |    5 +++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 650e9bf..d11c842 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/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());
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 2531cd2..a88f164 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/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();

--
Gitblit v1.9.1