From d9300c28c05b62da5f52fede40e639e3faad8f53 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 10 三月 2026 11:29:16 +0800
Subject: [PATCH] 防错调整
---
WebTM/App_Data/MssqlReportData.cs | 6
WebTM/views/grf/工位标签.grf | 2
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/grf/物料条码_药水.grf | 318 +++++++++++++++++++++++++++++++++++++++++++++
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_WorkStationList.html | 4
WebTM/Vlog/webapi20260309.txt | 71 ++++++++++
6 files changed, 399 insertions(+), 6 deletions(-)
diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs
index 31f6582..f74c04a 100644
--- a/WebTM/App_Data/MssqlReportData.cs
+++ b/WebTM/App_Data/MssqlReportData.cs
@@ -20,7 +20,7 @@
//public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ch娴嬭瘯
//public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL娴嬭瘯
// public const string SqlConnStr = "Data Source=ECS-B45B;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=hx_user;Password=lc@841022;";//鍏磋揪娴嬭瘯
- //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YSJ娴嬭瘯
+ public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YSJ娴嬭瘯
//public const string SqlConnStr = "Data Source=10.11.18.195;Initial Catalog=HX_LMESsys_test;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;"; //鏂帿灏�
//public const string SqlConnStr = "Data Source=30.10.7.6;Initial Catalog=HX_LMESsys_test;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;"; //鏂帿灏�
//public const string SqlConnStr = "Data Source=30.10.7.5;Initial Catalog=HX_LMESsys_test;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;"; //鏂帿灏旀柊鏁版嵁搴撳湴鍧�
@@ -38,7 +38,9 @@
//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 const string SqlConnStr = "Data Source=172.16.1.30;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//娴疯瘹
//public const string SqlConnStr = "Data Source=172.16.20.60; Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//灏忓崼
- public const string SqlConnStr = "Data Source=192.168.110.222; Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鍗庤垷
+ //public const string SqlConnStr = "Data Source=192.168.110.222; Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鍗庤垷
+ //public const string SqlConnStr = "Data Source=192.168.3.247,8005; 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/Vlog/webapi20260309.txt b/WebTM/Vlog/webapi20260309.txt
new file mode 100644
index 0000000..72c51b2
--- /dev/null
+++ b/WebTM/Vlog/webapi20260309.txt
@@ -0,0 +1,71 @@
+2026/3/9 9:43:49 鎵撳嵃sql:select * from h_v_Gy_WorkStationList where HItemID in(17)
+
+2026/3/9 9:43:51 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2026/3/9 9:43:51 ReportDataSet:1
+
+2026/3/9 9:46:24 鎵撳嵃sql:select * from h_v_Gy_WorkStationList where HItemID in(17)
+
+2026/3/9 9:46:24 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2026/3/9 9:46:24 ReportDataSet:1
+
+2026/3/9 13:50:53 鎵撳嵃sql:select * from h_v_Gy_WorkStationList where HItemID in(17)
+
+2026/3/9 13:50:54 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2026/3/9 13:50:54 ReportDataSet:1
+
+2026/3/9 13:51:18 鎵撳嵃sql:select * from h_v_Gy_WorkStationList where HItemID in(12)
+
+2026/3/9 13:51:18 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2026/3/9 13:51:18 ReportDataSet:1
+
+2026/3/9 13:53:26 鎵撳嵃sql:select * from h_v_Gy_WorkStationList where HItemID in(12)
+
+2026/3/9 13:53:26 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2026/3/9 13:53:26 ReportDataSet:1
+
+2026/3/9 14:24:49 鎵撳嵃sql:select * from h_v_Gy_WorkStationList where HItemID in(12)
+
+2026/3/9 14:24:49 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2026/3/9 14:24:49 ReportDataSet:1
+
+2026/3/9 14:28:01 鎵撳嵃sql:select * from h_v_Gy_WorkStationList where HItemID in(12)
+
+2026/3/9 14:28:01 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2026/3/9 14:28:01 ReportDataSet:1
+
+2026/3/9 14:29:39 鎵撳嵃sql:select * from h_v_IF_BarCodeBillList where hmainid in(127519) order by hmainid desc
+
+2026/3/9 14:29:39 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2026/3/9 14:29:39 ReportDataSet:1
+
+2026/3/9 14:42:55 鎵撳嵃sql:select * from h_v_Gy_WorkStationList where HItemID in(12)
+
+2026/3/9 14:42:55 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2026/3/9 14:42:55 ReportDataSet:1
+
+2026/3/9 14:43:07 鎵撳嵃sql:select * from h_v_IF_BarCodeBillList where hmainid in(127519) order by hmainid desc
+
+2026/3/9 14:43:08 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2026/3/9 14:43:08 ReportDataSet:1
+
+2026/3/9 14:43:30 鎵撳嵃sql:select * from h_v_IF_BarCodeBillList where hmainid in(127565) order by hmainid desc
+
+2026/3/9 14:43:30 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2026/3/9 14:43:30 ReportDataSet:1
+
+2026/3/9 14:52:49 鎵撳嵃sql:select * from h_v_Gy_WorkStationList where HItemID in(12)
+
+2026/3/9 14:52:49 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2026/3/9 14:52:49 ReportDataSet:1
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 68b0a06..60109e7 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,8 +3,8 @@
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//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:8082/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/"; //鏉庢灄淇婃湰鍦伴厤缃�
diff --git "a/WebTM/views/grf/\345\267\245\344\275\215\346\240\207\347\255\276.grf" "b/WebTM/views/grf/\345\267\245\344\275\215\346\240\207\347\255\276.grf"
index 3566cfd..1d2fb2d 100644
--- "a/WebTM/views/grf/\345\267\245\344\275\215\346\240\207\347\255\276.grf"
+++ "b/WebTM/views/grf/\345\267\245\344\275\215\346\240\207\347\255\276.grf"
@@ -99,7 +99,7 @@
Height=4.78896
BarcodeType=QRCode
CaptionPosition=None
- Text='[#鏉＄爜缂栧彿#]'
+ Text='[#宸ヤ綅浠ｇ爜#]'
End
End
RowSpan=2
diff --git "a/WebTM/views/grf/\347\211\251\346\226\231\346\235\241\347\240\201_\350\215\257\346\260\264.grf" "b/WebTM/views/grf/\347\211\251\346\226\231\346\235\241\347\240\201_\350\215\257\346\260\264.grf"
new file mode 100644
index 0000000..a72b912
--- /dev/null
+++ "b/WebTM/views/grf/\347\211\251\346\226\231\346\235\241\347\240\201_\350\215\257\346\260\264.grf"
@@ -0,0 +1,318 @@
+锘縊bject Report
+ Version='6.8.9.5'
+ Title='鐢熶骇浠诲姟鍗�'
+ PrintAsDesignPaper=F
+ Object Font
+ Name='瀹嬩綋'
+ Size=135000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ Size=256
+ Width=9.75
+ Height=6
+ LeftMargin=0
+ TopMargin=0
+ RightMargin=0
+ BottomMargin=0
+ End
+ Object DetailGrid
+ CenterView=T
+ ShowColLine=F
+ ShowRowLine=F
+ Object Border
+ Styles=[]
+ End
+ Object Recordset
+ Items Field
+ Item
+ Name='鐢熶骇宸ュ崟鍙�'
+ DBFieldName='婧愬崟鍗曞彿'
+ End
+ Item
+ Name='鐗╂枡浠ｇ爜'
+ End
+ Item
+ Name='鐗╂枡鍚嶇О'
+ End
+ Item
+ Name='瑙勬牸鍨嬪彿'
+ End
+ Item
+ Name='鏁伴噺'
+ End
+ Item
+ Name='鏉＄爜缂栧彿'
+ End
+ Item
+ Name='閿�鍞鍗曞彿'
+ End
+ Item
+ Name='鎵瑰彿'
+ End
+ Item
+ Name='鏃ユ湡'
+ Type=DateTime
+ Format='yyyy/MM/dd'
+ End
+ Item
+ Name='鍒朵綔浜�'
+ End
+ Item
+ Name='瀹㈡埛鍨嬪彿'
+ End
+ Item
+ Name='璁￠噺鍗曚綅'
+ End
+ Item
+ Name='婧愬崟鍗曞彿'
+ End
+ Item
+ Name='渚涘簲鍟�'
+ End
+ End
+ End
+ Items Column
+ Item
+ Name='Column3'
+ Width=9.60438
+ End
+ End
+Object ColumnContent
+ Height=6.00604
+ RowsPerPage=1
+ Items ColumnContentCell
+ Item
+ Column='Column3'
+ FreeCell=T
+ CanGrow=T
+ Items Control
+ Item
+ Type=MemoBox
+ Name='鍑礉濂堢壒'
+ Left=0.79375
+ Top=0.211667
+ Width=5.3975
+ Height=1.37583
+ Object Font
+ Name='瀹嬩綋'
+ Size=142500,0
+ Weight=400
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ TextAlign=MiddleCenter
+ CharSpacing=4
+ Text='鏉＄爜淇℃伅'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode1'
+ Left=6.79979
+ Top=0.211667
+ Width=1.79917
+ Height=1.37583
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='[#鏉＄爜缂栧彿#]'
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ End
+ Item
+ Type=FreeGrid
+ Name='FreeGrid1'
+ Left=0.132292
+ Top=1.69333
+ Object Border
+ Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
+ End
+ ColumnCount=6
+ RowCount=4
+ Items FreeGridColumn
+ Item[1]
+ Width=1.56104
+ End
+ Item[2]
+ Width=1.85208
+ End
+ Item[3]
+ Width=0.767292
+ End
+ Item[4]
+ Width=1.905
+ End
+ Item[5]
+ Width=1.48167
+ End
+ Item[6]
+ Width=1.45521
+ End
+ End
+ Items FreeGridRow
+ Item[1]
+ Height=0.79375
+ End
+ Item[2]
+ Height=0.79375
+ End
+ Item[3]
+ Height=0.820208
+ End
+ Item[4]
+ Height=0.740833
+ End
+ End
+ Items FreeGridCell
+ Item[1,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Text='鐗╂枡缂栫爜'
+ End
+ Item[1,2]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Text='[#鐗╂枡浠ｇ爜#]'
+ ColSpan=5
+ End
+ Item[2,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Text='鐗╂枡鍚嶇О'
+ End
+ Item[2,2]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Text='[#鐗╂枡鍚嶇О#]'
+ ColSpan=5
+ End
+ Item[3,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Text='璁￠噺鍗曚綅'
+ DataName='鏁伴噺'
+ End
+ Item[3,2]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Text='[#璁￠噺鍗曚綅#]'
+ ColSpan=2
+ End
+ Item[3,4]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Text='鎵瑰彿'
+ End
+ Item[3,5]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Text='[#鎵瑰彿#]'
+ ColSpan=2
+ End
+ Item[4,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Text='鎵撳嵃浜哄憳'
+ DataName='鎵撳嵃浜哄憳'
+ End
+ Item[4,2]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Text='[#鍒朵綔浜�#]'
+ ColSpan=2
+ End
+ Item[4,4]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Text='鎵撳嵃鏃ユ湡'
+ DataName='鎵撳嵃鏃ユ湡'
+ End
+ Item[4,5]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Text='[#鏃ユ湡#]'
+ ColSpan=2
+ End
+ End
+ End
+End
+End
+End
+End
+Object ColumnTitle
+ Height=0
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='Column3'
+ Text='Column1'
+ End
+ End
+End
+End
+Items ReportHeader
+ Item
+ Name='ReportHeader1'
+ Height=0
+ RepeatOnPage=T
+ End
+End
+Items ReportFooter
+ Item
+ Name='ReportFooter1'
+ Height=0
+ End
+End
+End
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkStationList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkStationList.html"
index 925b298..77d6f6c 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkStationList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkStationList.html"
@@ -419,7 +419,9 @@
, totalRow: true
, cellMinWidth: 120
, height: 400
- , limit: 100
+ , page: true
+ , limits: [50, 500, 2000]
+ , limit: 50
, cols: [[
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', field: '搴忓彿', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
--
Gitblit v1.9.1