From a4efd2dc97982fe6fd37f0c13671a3210ef3b95b Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期二, 08 七月 2025 15:56:16 +0800
Subject: [PATCH] 增加迦南发布网址，夏宝到货确认扫码模块恢复被屏蔽的扫描物料条码代码
---
WebTM/App_Data/MssqlReportData.cs | 1
WebTM/views/领料发货/收料入库/Kf_ReciveBill_Fast_XiaBao.html | 77 ++++++++++++++++++--------------------
WebTM/layuiadmin/Scripts/webConfig.js | 5 +-
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill_JiaNan.html | 2
4 files changed, 42 insertions(+), 43 deletions(-)
diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs
index da60c88..f6b2020 100644
--- a/WebTM/App_Data/MssqlReportData.cs
+++ b/WebTM/App_Data/MssqlReportData.cs
@@ -33,6 +33,7 @@
//public const string SqlConnStr = "Data Source=192.168.2.10;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涔濊彵鐢垫満
//public const string SqlConnStr = "Data Source=192.168.1.8;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//娣诲悍绉戞妧
//public const string SqlConnStr = "Data Source=192.168.6.5;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鑸滄垚
+ //public const string SqlConnStr = "Data Source=172.16.1.89;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//杩﹀崡
//public string sServer;
//public string sDataBase;
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 7d1cee5..db54300 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,9 +3,9 @@
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- //var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
- var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
+ //var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
//var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
@@ -33,6 +33,7 @@
/*var WEBURL = "http://121.36.199.126:8181/API/"; //涓夊崌*/
//var WEBURL = "http://36.134.2.30:200/WEBS-API/"; //閲戝竻
//var WEBURL = "http://localhost:81/API";
+ //var WEBURL = "http://172.16.1.85/API/"; //杩﹀崡
return WEBURL
}
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_JiaNan.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_JiaNan.html"
index 5087a99..2d1cad9 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_JiaNan.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_JiaNan.html"
@@ -567,7 +567,7 @@
var HEndQty_Sure = $("#HEndQty_Sure").val();
if (HEndQty != HEndQty_Sure) {
- layer.msg("灏惧寘鏁伴噺涓庡熬宸寸‘璁や笉涓�鑷达紒锛�", { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 2000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
+ layer.msg("灏惧寘鏁伴噺涓庡熬鍖呯‘璁や笉涓�鑷达紒锛�", { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 2000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
return Result = false;
}
}
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_XiaBao.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_XiaBao.html"
index a1c4f2a..da35b5e 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_XiaBao.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_XiaBao.html"
@@ -192,46 +192,43 @@
});
//鎵弿鏉″舰鐮佹柟娉�
function GetMeesageByBarCode() {
-
- layer.msg("鏃犻渶鎵弿鐗╂枡鏉＄爜锛�")
-
- //var HBarCode = $('#HBarCode').val();
- //if (!HBarCode) {
- // layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
- // return;
- //}
- //var HInterID = $('#HInterID').val();
- //if (!HInterID) {
- // layer.msg("璇峰厛杈撳叆鏀舵枡閫氱煡鍗曞崟鎹彿锛�")
- // return;
- //}
- //var index = layer.load();
- //$.ajax({
- // url: GetWEBURL() + "/POStockInBillList/Get_ReciveBillByBarcode",
- // type: "GET",
- // data: { "HBarCode": HBarCode, "HInterID": HInterID },
- // success: function (result) {
- // if (result.code == "1") {
- // var sSubStr = table.cache['mainTable'];
- // for (var i = 0; i < sSubStr.length; i++) {
- // if (sSubStr[i].HMaterID == HBarCode.split("#")[0]) {
- // sSubStr[i].HSQty += parseInt(HBarCode.split("#")[1]);
- // table.render(option);
- // break;
- // }
- // }
- // layer.close(index);
- // }
- // else {
- // layer.close(index);
- // layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // }
- // },
- // error: function (err) {
- // layer.close(index);
- // layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // }
- //});
+ var HBarCode = $('#HBarCode').val();
+ if (!HBarCode) {
+ layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+ return;
+ }
+ var HInterID = $('#HInterID').val();
+ if (!HInterID) {
+ layer.msg("璇峰厛杈撳叆鏀舵枡閫氱煡鍗曞崟鎹彿锛�")
+ return;
+ }
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/POStockInBillList/Get_ReciveBillByBarcode",
+ type: "GET",
+ data: { "HBarCode": HBarCode, "HInterID": HInterID },
+ success: function (result) {
+ if (result.code == "1") {
+ var sSubStr = table.cache['mainTable'];
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i].HMaterID == HBarCode.split("#")[0]) {
+ sSubStr[i].HSQty += parseInt(HBarCode.split("#")[1]);
+ table.render(option);
+ break;
+ }
+ }
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
$('#HBarCode').val("");
$("#HBarCode").focus();
}
--
Gitblit v1.9.1