From 68130e50856edb2a19b03c489a9b0ecfd884624a Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期日, 31 七月 2022 17:26:18 +0800
Subject: [PATCH] 瑞琪 工艺路线基础资料 工艺名称 工序流转卡 单据 打印
---
WebTM/App_Data/MssqlReportData.cs | 2
WebTM/views/grf/瑞与祺江苏打印模板.grf | 596 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
WebTM/views/Baseset/基础资料/Gy_RoutingBillList.html | 1
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 5
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/WebTM.csproj | 1
6 files changed, 604 insertions(+), 5 deletions(-)
diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs
index ab9a146..7c22561 100644
--- a/WebTM/App_Data/MssqlReportData.cs
+++ b/WebTM/App_Data/MssqlReportData.cs
@@ -22,7 +22,7 @@
//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;";//涓镐簳
//public const string SqlConnStr = "Data Source=192.168.0.200;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涓镐簳鍦板潃
//public const string SqlConnStr = "Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//闆呯惇璇烘祴璇�
- public const string SqlConnStr = "Data Source=192.168.0.199;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鐟炵惇
+ public const string SqlConnStr = "Data Source=192.168.0.199;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鐟炵惇
//public const string SqlConnStr = "Data Source=183.129.128.86:26589;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鍑礉濂堢壒
//public string sServer;
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 69842b0..82629d9 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -215,6 +215,7 @@
<Content Include="views\grf\鑺卞瀷鏉＄爜.grf" />
<Content Include="views\grf\宸ュ簭娴佽浆.grf" />
<Content Include="views\grf\cabinet-CG.grf" />
+ <Content Include="views\grf\鐟炰笌绁烘睙鑻忔墦鍗版ā鏉�.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 3c29edd..e7c8fe3 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,14 +1,14 @@
锘�
function GetWEBURL() {
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
- var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴
+ //var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
//var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
//var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
+ var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
//var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ缃�
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RoutingBillList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RoutingBillList.html"
index ee43c5f..51bf9cb 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RoutingBillList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RoutingBillList.html"
@@ -83,6 +83,7 @@
{ type: 'radio' }
, { field: 'hmainid', title: '宸ヨ壓璺嚎ID', hide: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+ , { field: '宸ヨ壓鍚嶇О', title: '宸ヨ壓璺嚎鍚嶇О' }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜' }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', sort: true }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
diff --git "a/WebTM/views/grf/\347\221\236\344\270\216\347\245\272\346\261\237\350\213\217\346\211\223\345\215\260\346\250\241\346\235\277.grf" "b/WebTM/views/grf/\347\221\236\344\270\216\347\245\272\346\261\237\350\213\217\346\211\223\345\215\260\346\250\241\346\235\277.grf"
new file mode 100644
index 0000000..6ca3e1b
--- /dev/null
+++ "b/WebTM/views/grf/\347\221\236\344\270\216\347\245\272\346\261\237\350\213\217\346\211\223\345\215\260\346\250\241\346\235\277.grf"
@@ -0,0 +1,596 @@
+锘縊bject Report
+ Version='6.0.0.6'
+ Title='浣犵殑鎶ヨ〃鏍囬'
+ PrintAsDesignPaper=F
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ Height=29.7
+ LeftMargin=0.4
+ TopMargin=0.5
+ RightMargin=0.5
+ BottomMargin=0.5
+ End
+ Object DetailGrid
+ CenterView=T
+ AppendBlankRow=T
+ Object Border
+ Object Pen
+ Width=1.5
+ End
+ End
+ Object Recordset
+ Items Field
+ Item
+ Name='璁″垝寮�宸ユ棩鏈�'
+ Type=DateTime
+ Format='yyyy/MM/dd'
+ End
+ Item
+ Name='璁″垝瀹屽伐鏃ユ湡'
+ Type=DateTime
+ Format='yyyy/MM/dd'
+ End
+ Item
+ Name='鎵瑰彿'
+ End
+ Item
+ Name='浜у搧鍚嶇О'
+ End
+ Item
+ Name='浜у搧浠ｇ爜'
+ End
+ Item
+ Name='妯″叿缂栧彿'
+ End
+ Item
+ Name='PO'
+ End
+ Item
+ Name='娴佹按鍙�'
+ Type=Integer
+ End
+ Item
+ Name='宸ュ簭鍚嶇О'
+ End
+ Item
+ Name='娴佽浆鍗＄紪鍙�'
+ End
+ Item
+ Name='鍠傛枡鎵瑰彿'
+ End
+ Item
+ Name='娴佽浆鍗℃暟閲�'
+ End
+ Item
+ Name='浜у搧瑙勬牸'
+ End
+ Item
+ Name='瀛愪欢鍚嶇О'
+ End
+ Item
+ Name='閿�鍞鍗曞彿'
+ End
+ Item
+ Name='鐢熶骇璁㈠崟鍙�'
+ End
+ Item
+ Name='鍖呰瑕佹眰'
+ End
+ Item
+ Name='鍖呰瑕佹眰缂栫爜'
+ End
+ Item
+ Name='鏃ユ湡'
+ End
+ Item
+ Name='宸ュ簭浠ｇ爜'
+ End
+ Item
+ Name='鍖呰鏍囪瘑缂栫爜'
+ End
+ Item
+ Name='浠诲姟鍗曞彿'
+ End
+ Item
+ Name='鍖呰鏍囪瘑'
+ End
+ Item
+ Name='鍗曟嵁鍙�'
+ End
+ Item
+ Name='瀛愪欢瑙勬牸'
+ End
+ End
+ End
+ Items Column
+ Item
+ Name='宸ュ簭鍙�'
+ Width=1.34938
+ End
+ Item
+ Name='鐗╂枡鍚嶇О'
+ Width=1.53458
+ End
+ Item
+ Name='Column1'
+ Width=3.06917
+ End
+ Item
+ Name='瑙勬牸鍨嬪彿'
+ Width=1.61396
+ End
+ Item
+ Name='鏀舵枡浠撳簱'
+ Width=1.79917
+ End
+ Item
+ Name='鎵瑰彿'
+ Width=1.53458
+ End
+ Item
+ Name='澶囨敞'
+ Width=1.5875
+ End
+ Item
+ Name='Column2'
+ Width=1.61396
+ End
+ Item
+ Name='Column3'
+ Width=1.66688
+ End
+ Item
+ Name='Column4'
+ Width=1.98438
+ End
+ Item
+ Name='Column5'
+ Width=1.69333
+ End
+ End
+ Object ColumnContent
+ Height=1.40229
+ RowsPerPage=16
+ Items ColumnContentCell
+ Item
+ Column='宸ュ簭鍙�'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ DataField='娴佹按鍙�'
+ End
+ Item
+ Column='鐗╂枡鍚嶇О'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox10'
+ Dock=Fill
+ DataField='宸ュ簭浠ｇ爜'
+ End
+ End
+ End
+ Item
+ Column='Column1'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ ShrinkFontToFit=T
+ DataField='宸ュ簭鍚嶇О'
+ End
+ Item
+ Column='瑙勬牸鍨嬪彿'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ End
+ Item
+ Column='鏀舵枡浠撳簱'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ End
+ Item
+ Column='鎵瑰彿'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ End
+ Item
+ Column='澶囨敞'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ End
+ Item
+ Column='Column2'
+ End
+ Item
+ Column='Column3'
+ End
+ Item
+ Column='Column4'
+ End
+ Item
+ Column='Column5'
+ End
+ End
+ End
+ Object ColumnTitle
+ Height=1.00542
+ RepeatStyle=OnPage
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='宸ュ簭鍙�'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭鍙�'
+ End
+ Item
+ GroupTitle=F
+ Column='鐗╂枡鍚嶇О'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭浠ｇ爜'
+ End
+ Item
+ GroupTitle=F
+ Column='Column1'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭'
+ End
+ Item
+ GroupTitle=F
+ Column='瑙勬牸鍨嬪彿'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='鏃ユ湡'
+ End
+ Item
+ GroupTitle=F
+ Column='鏀舵枡浠撳簱'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='鎿嶄綔宸�'
+ End
+ Item
+ GroupTitle=F
+ Column='鎵瑰彿'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='棰嗘枡'
+ End
+ Item
+ GroupTitle=F
+ Column='澶囨敞'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='鍚堟牸'
+ End
+ Item
+ GroupTitle=F
+ Column='Column2'
+ TextAlign=MiddleCenter
+ Text='杩斾慨'
+ End
+ Item
+ GroupTitle=F
+ Column='Column3'
+ TextAlign=MiddleCenter
+ Text='鎶ュ簾'
+ End
+ Item
+ GroupTitle=F
+ Column='Column4'
+ TextAlign=MiddleCenter
+ Text='妫�楠�'
+ End
+ Item
+ GroupTitle=F
+ Column='Column5'
+ TextAlign=MiddleCenter
+ Text='澶囨敞'
+ End
+ End
+ End
+ End
+ Items Parameter
+ Item
+ Name='Parameter1'
+ End
+ Item
+ Name='Parameter2'
+ End
+ End
+ Items ReportHeader
+ Item
+ Name='ReportHeader1'
+ Height=4.39208
+ Items Control
+ Item
+ Type=FreeGrid
+ Name='FreeGrid1'
+ Left=0.185208
+ Top=0.238125
+ Object Border
+ Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
+ End
+ ColumnCount=9
+ Items FreeGridColumn
+ Item[1]
+ Width=2.06375
+ End
+ Item[2]
+ Width=2.01083
+ End
+ Item[3]
+ Width=1.82563
+ End
+ Item[6]
+ Width=1.66688
+ End
+ Item[7]
+ Width=1.24354
+ End
+ Item[8]
+ Width=1.24354
+ End
+ End
+ Items FreeGridRow
+ Item[1]
+ Height=1.69333
+ End
+ End
+ Items FreeGridCell
+ Item[1,1]
+ FreeCell=T
+ Items Control
+ Item
+ Type=Barcode
+ Name='Barcode1'
+ Left=5.21229
+ Width=3.175
+ Height=1.5875
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='[#鍗曟嵁鍙�#]'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox1'
+ Left=13.9965
+ Top=0.211667
+ Width=4.39208
+ Height=1.19063
+ ShrinkFontToFit=T
+ DataField='鍗曟嵁鍙�'
+ End
+ Item
+ Type=StaticBox
+ Name='StaticBox1'
+ Left=0.211667
+ Top=0.211667
+ Width=4.39208
+ Height=1.19063
+ Object Font
+ Name='瀹嬩綋'
+ Size=142500,0
+ Bold=T
+ Charset=134
+ End
+ Text='鐟炰笌绁虹儹浜ゆ崲鍣ㄧ鎶�锛堟睙鑻忥級\r\n宸ヨ壓娴佽浆鍗�'
+ End
+ Item
+ Type=StaticBox
+ Name='StaticBox2'
+ Left=12.991
+ Top=0.211667
+ Width=0.820208
+ Height=1.19063
+ Object Font
+ Name='瀹嬩綋'
+ Size=142500,0
+ Bold=T
+ Charset=134
+ End
+ Text='ID'
+ End
+ End
+ ColSpan=9
+ End
+ Item[2,1]
+ Text='鐗╂枡鍚嶇О锛�'
+ End
+ Item[2,2]
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox2'
+ Dock=Fill
+ DataField='浜у搧鍚嶇О'
+ End
+ End
+ ColSpan=3
+ End
+ Item[2,5]
+ Text='鐗╂枡浠ｇ爜锛�'
+ End
+ Item[2,6]
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox3'
+ Dock=Fill
+ DataField='浜у搧浠ｇ爜'
+ End
+ End
+ ColSpan=4
+ End
+ Item[3,1]
+ Text='瑙勬牸鍨嬪彿锛�'
+ End
+ Item[3,2]
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox4'
+ Dock=Fill
+ DataField='瀛愪欢瑙勬牸'
+ End
+ End
+ ColSpan=4
+ End
+ Item[3,6]
+ Text='涓嬭揪鏃ユ湡'
+ End
+ Item[3,7]
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox9'
+ Dock=Fill
+ DataField='鏃ユ湡'
+ End
+ End
+ ColSpan=3
+ End
+ Item[4,1]
+ Text='閿�鍞鍗曞彿锛�'
+ End
+ Item[4,2]
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox5'
+ Dock=Fill
+ DataField='閿�鍞鍗曞彿'
+ End
+ End
+ ColSpan=3
+ End
+ Item[4,5]
+ Text='鐢熶骇璁㈠崟鍙�'
+ End
+ Item[4,6]
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox6'
+ Dock=Fill
+ DataField='浠诲姟鍗曞彿'
+ End
+ End
+ ColSpan=4
+ End
+ Item[5,1]
+ Text='鍖呰瑕佹眰'
+ End
+ Item[5,2]
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox7'
+ Dock=Fill
+ DataField='鍖呰鏍囪瘑'
+ End
+ End
+ ColSpan=4
+ End
+ Item[5,6]
+ Text='鍖呰瑕佹眰缂栫爜'
+ ColSpan=2
+ End
+ Item[5,8]
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox8'
+ Dock=Fill
+ DataField='鍖呰鏍囪瘑缂栫爜'
+ End
+ End
+ ColSpan=2
+ End
+ End
+ End
+ End
+ RepeatOnPage=T
+ End
+ End
+End
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index dfcafaa..ee153c5 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -1101,7 +1101,8 @@
//鎵撳嵃
form.on('submit(btn_print)', function () {//浜у搧
- var hinterid = $("#HinterID").val();
+ var hinterid = $("#HInterID").val();
+ hinterid = parseInt(hinterid) + 1;
layer.open({
type: 2
, area: ['50%', '50%']
@@ -1805,7 +1806,7 @@
async: true,
data: { "sWhere": "and HMaterID=" + btnHMaterID + " and HOrgID = " + sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
success: function (result) {
- if (result.data != null) {
+ if (result.data.length != 0) {
var hbillno = result.data[0].鍗曟嵁鍙�
getRoutingBill(hbillno);
}
--
Gitblit v1.9.1