From 7b6329313ca3a5e6ff96246eeaf96f839df7760b Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 22 十月 2025 11:51:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

---
 src/main/webapp/static/js/mat/mat.js |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js
index 667fe68..15913b1 100644
--- a/src/main/webapp/static/js/mat/mat.js
+++ b/src/main/webapp/static/js/mat/mat.js
@@ -334,9 +334,19 @@
                         var templateDom = $("#templatePreview"+templateNo);
                         var className = templateDom.attr("class");
                         if (className === 'template-barcode') {
-                            res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=1&param="+res.data[i].matnr;
+                            res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=1&param="
+                                +"orderNo;cs2025092313;"
+                                +"sku;" +res.data[i].matnr+";"
+                                +"po;" +res.data[i].supp+";"
+                                +"upc;" +res.data[i].sku+";"
+                                +"supplier;" +res.data[i].supplier;
                         } else {
-                            res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2&param="+res.data[i].matnr;
+                            res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2&param="
+                                +"orderNo;cs2025092313;"
+                                +"sku;" +res.data[i].matnr+";"
+                                +"po;" +res.data[i].supp+";"
+                                +"upc;" +res.data[i].sku+";"
+                                +"supplier;" +res.data[i].supplier;
                         }
                     }
                     var tpl = templateDom.html();

--
Gitblit v1.9.1