From 3fec626efcf83c2d3eb8d7242f7694a9c132c7b4 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期四, 15 一月 2026 14:09:49 +0800
Subject: [PATCH] 小卫组托前端更新
---
WebTM/views/Baseset/基础资料/saomazutuo_xiaowei.html | 23 ++++++++++++++++++++++-
WebTM/layuiadmin/Scripts/webConfig.js | 4 ++--
2 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 60109e7..729c3fb 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -4,7 +4,7 @@
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
//var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
- var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ /*var WEBURL = "http://localhost:81/API/" */ //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
//var WEBURL = "http://localhost:81/API/"; //闄堥晲鍝叉湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�
@@ -14,7 +14,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 8057db3..0583d36 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"
@@ -271,6 +271,7 @@
// 琛ㄥ崟鎻愪氦鍊�
var hform = {
+ HBarCode_middle:[],
HDate: getCurrentDate(),
HMaker: sessionStorage["Czybm"],
HInterID: '',
@@ -471,6 +472,25 @@
layer.msg('鏉＄爜涓嶈兘涓虹┖锛岃鎵弿鏉＄爜锛�', { icon: 2 });
return;
}
+ hform.HBarCode_middle.push(sBarCode);
+ console.log(hform.HBarCode_middle)
+ // 濡傛灉宸叉湁鏉＄爜鏁版嵁锛堜笉鏄涓�鏉★級
+ if (listData.length > 0) {
+ // 鑾峰彇褰撳墠鏉＄爜鐨勫悗9-10浣嶏紙浠庡悗寰�鍓嶆暟绗�9鍜岀8浣嶏級
+ if (sBarCode.length >= 10) {
+ var currentLast9to10 = sBarCode.substr(-10, 2); // 鑾峰彇鍊掓暟绗�9浣嶅紑濮嬬殑2浣嶅瓧绗�
+ // 鑾峰彇涓婁竴鏉℃潯鐮佺殑瀵瑰簲浣嶇疆
+ var lastBarCode = listData[listData.length - 1]['鏉＄爜缂栧彿'];
+ if (lastBarCode.length >= 10) {
+ var lastLast9to10 = lastBarCode.substr(-10, 2);
+ if (currentLast9to10 !== lastLast9to10) {
+ layer.msg(`褰撳墠鏉＄爜鍊掓暟10-11浣�(${currentLast9to10})涓庝笂涓�鏉℃潯鐮�(${lastLast9to10})涓嶅悓锛岃妫�鏌ワ紒`, { icon: 5 });
+ $('#HBarCode').val('');
+ return;
+ }
+ }
+ }
+ }
FindMaterial(sBarCode).then(function (materialInfo) {
if (!materialInfo) {
layer.msg('鏈壘鍒扮墿鏂欎俊鎭�', { icon: 2 });
@@ -648,8 +668,9 @@
// 鐢熸垚鏉＄爜
function getBarCode_pack() {
return new Promise(function (resolve, reject) {
+ var sBarCode = hform.HBarCode_middle[0];
var sMainStr = JSON.stringify(hform);
- var omain = sMainStr + ';' + hform.HStockOrgName + ';' + hform.HEmpName;
+ var omain = sMainStr + ';' + hform.HStockOrgName + ';' + hform.HEmpName + ';' + sBarCode;
$.ajax({
url: GetWEBURL() + '/Sc_BarCode/Sub_SaveBill_xiaowei',
--
Gitblit v1.9.1