From 2ed130171719a0848e8356d28055eb1bdf649d01 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 24 十二月 2025 13:51:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/Baseset/基础资料/saomazutuo_xiaowei.html | 4 +++-
WebTM/layuiadmin/Scripts/webConfig.js | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 91527bb..d45150a 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -13,7 +13,7 @@
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/*var WEBURL = "http://localhost:8082/LuBaoAPI/";*/ //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:81/API/"; // 闄堥晲鍝叉湰鍦伴厤缃�*/
- // var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�
+ var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html"
index eb3a918..cc9acdf 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html"
@@ -476,6 +476,7 @@
return;
}
hform.HMaterID = materialInfo.HMaterID;
+ hform.HMaterNumber = materialInfo.HMaterNumber;
hform.HMaterName = materialInfo.HMaterName;
hform.HMaterModel = materialInfo.HMaterModel;
$.ajax({
@@ -498,7 +499,7 @@
listData.push({
鏉＄爜缂栧彿: sBarCode,
鏁伴噺: 1,
- 鐗╂枡浠ｇ爜: hform.HMaterID,
+ 鐗╂枡浠ｇ爜: hform.HMaterNumber,
鐗╂枡鍚嶇О: hform.HMaterName,
鏉＄爜涓暟: 1,
HInterID: hform.HInterID
@@ -537,6 +538,7 @@
if (res.count == 1) {
resolve({
HMaterID: data[0].HMaterID,
+ HMaterNumber: data[0].HMaterNumber,
HMaterName: data[0].HMaterName,
HMaterModel: data[0].HMaterModel
});
--
Gitblit v1.9.1