From 6ffa94266837026a280a024c82047d2d867126a5 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 10 九月 2024 19:44:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj.user | 5 ++---
WebTM/views/模治具管理/上模单/Sc_MouldUpperBillEdit_PDA.html | 13 +++++++++----
WebTM/views/Baseset/基础资料/Gy_StockPlaceListNew.html | 2 ++
WebTM/layuiadmin/Scripts/webConfig.js | 4 ++--
4 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index e39639b..65037ad 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -16,9 +16,8 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
- <StartPageUrl>
- </StartPageUrl>
- <StartAction>CurrentPage</StartAction>
+ <StartPageUrl>views/user/login.html</StartPageUrl>
+ <StartAction>SpecificPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 5cb44fa..1483d8e 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/API/"; //鏉滆春鏈湴閰嶇疆*/
- var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
/* var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlaceListNew.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlaceListNew.html"
index 55a6a80..2d704bd 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlaceListNew.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlaceListNew.html"
@@ -86,6 +86,8 @@
, { field: 'HItemID', width: 150, title: '浠撲綅ID', hide: true }
, { field: 'HNumber', width: 150, title: '浠撲綅浠ｇ爜' }
, { field: 'HName', width: 150, title: '浠撲綅鍚嶇О', sort: true }
+ , { field: 'HWhNumber', width: 150, title: '浠撳簱浠ｇ爜' }
+ , { field: 'HWhName', width: 150, title: '浠撳簱鍚嶇О', sort: true }
]]
, page: true
, limits: [50, 500, 5000, 50000],
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html"
index 3d615c2..db4a0a3 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html"
@@ -527,12 +527,20 @@
$.ajax({
url: GetWEBURL() + "/Sc_MouldUpperBill/txtHBarCode_KeyDown",
type: "GET",
- data: { "HBarCode": HBarCode, "UserID": sessionStorage["Czybm"], "HBillType": "Sc_MouldUpperBill" },
+ data: { "HBarCode": HBarCode, "HSourceID": $("#HSourceID").val(), "UserID": sessionStorage["Czybm"], "HBillType": "Sc_MouldUpperBill" },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
+ layer.close(index);
+ $("#HBarCode").val("");
+
var num = data["Num"];
+
+ if ($("#HSourceID").val() == "0" && num != 1) {
+ layer.msg("璇峰厛閫夋嫨鐢熶骇璧勬簮!");
+ return false;
+ }
switch (num) {
case 1:
@@ -569,9 +577,6 @@
break;
default:
}
-
- $("#HBarCode").val("");
- layer.close(index);
}
else {
$("#HBarCode").val("");
--
Gitblit v1.9.1