From a4a87f8371296173a899d07129f01ae42debe65a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 30 十一月 2024 08:21:14 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/OrderDetlMapper.xml | 3 ++-
src/main/webapp/static/js/order/order.js | 2 +-
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index ee4cbae..7f780de 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -167,7 +167,7 @@
if (Cools.isEmpty(id)) {
return R.parse("id涓虹┖");
}
- return R.ok(orderDetlMapper.selectPrintData(id));
+ return R.ok(orderDetlService.selectById(id));
}
}
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index 8c1dc4c..9415795 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -132,7 +132,8 @@
md.specs ,
md.unit ,
md.anfme ,
- mo.cstmr_name as cstmrName
+ md.supp_code as suppCode,
+ md.sku
from
man_order_detl md
inner join man_order mo on
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 83bb5a2..1f7db00 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -181,7 +181,7 @@
var templateDom = $("#templatePreview1");
var className = templateDom.attr("class");
var param = "缂栫爜:"+data.matnr+";鍚嶇О:"+data.maktx+";鎵规:"+data.batch+";瑙勬牸:"+data.specs
- +";鍗曚綅:"+data.unit+";鏁伴噺:"+data.anfme+";閿�鍞崟鍙�:"+data.suppCode+";瀹㈡埛鍚嶇О:"+data.supp;
+ +";鍗曚綅:"+data.unit+";鏁伴噺:"+data.anfme+";閿�鍞崟鍙�:"+data.suppCode+";瀹㈡埛鍚嶇О:"+data.sku;
var encodeUrl = encodeURIComponent(param);
data["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2¶m="+encodeUrl;
console.log(data["barcodeUrl"]);
--
Gitblit v1.9.1