From 1b804d3e0c990bd45be003170a5e1cd8138b3743 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期六, 23 三月 2024 15:00:52 +0800
Subject: [PATCH] 修改信息

---
 HTML/js/public.js                                  |    3 ++-
 Wms/Wms/appsettings.json                           |    4 ++--
 Pda/View/AsnSetting/lingXiangEnter.html            |    2 +-
 Pda/js/public.js                                   |    1 +
 HTML/views/WareHouseSetting/FlatLibraryLegend.html |   15 +++++++--------
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/HTML/js/public.js b/HTML/js/public.js
index 7e11b1b..18cba69 100644
--- a/HTML/js/public.js
+++ b/HTML/js/public.js
@@ -1,10 +1,11 @@
 //var IP = "http://47.104.149.73:1991";//鎺ュ彛IP
 // var IP = "http://172.16.71.101:8082/";//鎺ュ彛IP
 //var IP = "http://localhost:13243/api";
-var IP = "http://localhost:50515/api";
+// var IP = "http://localhost:50515/api";
 // var IP = "http://localhost:44318/api";
 //var IP = "http://192.168.1.6:8017";
 //var IP = "http://192.168.1.226:8086";  
+var IP = "http://192.168.62.200:8888/api";  
 
 var pageCnt = 15;
 var pageLimits = [10, 15, 20, 30, 50, 70, 100];
diff --git a/HTML/views/WareHouseSetting/FlatLibraryLegend.html b/HTML/views/WareHouseSetting/FlatLibraryLegend.html
index cab5d59..29b8b80 100644
--- a/HTML/views/WareHouseSetting/FlatLibraryLegend.html
+++ b/HTML/views/WareHouseSetting/FlatLibraryLegend.html
@@ -139,7 +139,7 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">鎺�</label>
+                                    <label class="layui-form-label">妤煎眰</label>
                                     <div class="layui-input-inline">
                                         <select name="Row" id="Row" lay-filter="SelectRow">
                                             <option value="1" selected>涓�妤�</option>
@@ -179,12 +179,12 @@
                                 </div>
 
                                 <!-- //瀹氭椂鑷埛鏂板簱浣嶅浘渚� -->
-                                <!-- <div class="layui-inline" style="float: right;">
+                                <div class="layui-inline" style="float: right;">
                                     <label class="layui-form-label" style="margin-top: 10px;">鑷姩鍒锋柊</label>
                                     <div class="layui-input-inline" style="width: auto;">
                                         <input type="checkbox" checked="" id="autoRefresh" lay-skin="switch" lay-filter="switchTest" lay-text="寮�|鍏�">
                                     </div>									
-                                </div> -->
+                                </div>
                                 
                             </div>
                         </div>
@@ -372,11 +372,10 @@
 
 
 			//鑾峰彇鏁版嵁娓叉煋搴撲綅鍥�
-			function GetSlotVm(houseNo, row,depth) {				
+			function GetSlotVm(houseNo, row) {				
 				var param = {
 					WareHouseNo: houseNo,
-					Row: row,
-                    Depth: depth
+					Row: row
 				}
 				sendData(IP + "/Sys/GetFlatLibraryLegend", param, 'get', function (res) {
                     console.log(res)
@@ -1058,9 +1057,9 @@
 			//瀹氭椂鍣�
 			setInterval(function(){
 				if(autoRefresh){
-					GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val());	
+					GetSlotVm($("#WareHouseNo").val(), $("#Row").val());	
 					//var currentDate = new Date();
-					//console.log('鑷姩鍒锋柊浜嗭紝'+currentDate)				
+					// console.log('鑷姩鍒锋柊浜嗭紝'+currentDate)				
 				}
 			},10000)//10绉掕嚜鍔ㄥ埛鏂颁竴娆�
 			// #endregion
diff --git a/Pda/View/AsnSetting/lingXiangEnter.html b/Pda/View/AsnSetting/lingXiangEnter.html
index 5d94e92..3ed8bfc 100644
--- a/Pda/View/AsnSetting/lingXiangEnter.html
+++ b/Pda/View/AsnSetting/lingXiangEnter.html
@@ -51,7 +51,7 @@
 				<table border="" cellspacing="" cellpadding="">
 					<tr>
 						<td class="img-back"><a href="../index.html"><img src="/assets/back.jpg" ></a></td>
-						<td class="title-text" lang>鎷兼墭鍏ュ簱</td>
+						<td class="title-text" lang>闆剁鍏ュ簱</td>
 						<td class="title-menu-icon"><img id="menuImg" src="/assets/menu.jpg" ></td>
 					</tr>
 				</table>
diff --git a/Pda/js/public.js b/Pda/js/public.js
index 5369575..f5ee6a9 100644
--- a/Pda/js/public.js
+++ b/Pda/js/public.js
@@ -5,6 +5,7 @@
  //var IP = "http://192.168.1.2:8017/";
 // var IP = "http://192.168.10.112/WmsService/";
 // var IP = "http://192.168.1.226:8086";
+// var IP = "http://192.168.62.200:8888/api";  
 jQuery.support.cors = true;
 function sendData(url, data, type, callbackFun) {
 	// callbackFun("{}");
diff --git a/Wms/Wms/appsettings.json b/Wms/Wms/appsettings.json
index d3f332c..24e4ff3 100644
--- a/Wms/Wms/appsettings.json
+++ b/Wms/Wms/appsettings.json
@@ -10,8 +10,8 @@
   "AppSettings": {
     //"ConnectionString": "Server=47.95.120.93;Database=WMS_JC09;User ID=sa;password=boxline!@#; Integrated Security=True;",
     //"ConnectionString": "Server=47.95.120.53;Database=WMS_JC09;User ID=sa;Password=boxline!@#;Integrated Security=False;",
-    "ConnectionString": "Server=192.168.62.106;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;",
-    //"ConnectionString": "Server=192.168.62.200;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;"
+    //"ConnectionString": "Server=192.168.62.106;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;",
+    "ConnectionString": "Server=192.168.62.200;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;"
     //"ConnectionString": "Server=.;Database=WMS_JC09;User ID=sa;Password=sql2019;Integrated Security=False;"
     //"ConnectionString": "Data Source=DESKTOP-0EJDG95\\MSSQLSERVER1;Initial Catalog=WMS_V01;Integrated Security=True;"
   },

--
Gitblit v1.8.0