From 52913f44bd1d0823c90c6072279ff4efeea75ad3 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期日, 29 五月 2022 23:28:28 +0800
Subject: [PATCH] 工序流转
---
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList.aspx | 27
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList.aspx.designer.cs | 26
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList.aspx.cs | 17
WebTM/views/grf/工序流转.grf | 680 ++++++++++++++++++++++++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 179 +++---
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 696 +++++++++++++-----------
WebTM/views/PublicPage/EqpInformation.html | 2
WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html | 5
WebTM/Vlog/webapi20220529.txt | 1
WebTM/views/生产管理/生产装箱单/QK_PackingBill.html | 15
WebTM/WebTM.csproj | 9
11 files changed, 1,251 insertions(+), 406 deletions(-)
diff --git a/WebTM/Vlog/webapi20220529.txt b/WebTM/Vlog/webapi20220529.txt
new file mode 100644
index 0000000..38b500e
--- /dev/null
+++ b/WebTM/Vlog/webapi20220529.txt
@@ -0,0 +1 @@
+2022/5/29 23:26:46 鎵撳嵃sql:select distinct b.娴佹按鍙�,a.浠诲姟鍗曞彿,a.娴佽浆鍗℃暟閲�,a.浜у搧浠ｇ爜,a.鐗堟湰,a.鎴愬搧缂栧彿,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,a.鏉愯川,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid=440
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 28cdb6f..2b62edd 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -209,6 +209,7 @@
<Content Include="views\grf\鐗╂枡鍚嶇О鏉＄爜.grf" />
<Content Include="views\grf\鍖呰鏂瑰紡鏉＄爜.grf" />
<Content Include="views\grf\鑺卞瀷鏉＄爜.grf" />
+ <Content Include="views\grf\宸ュ簭娴佽浆.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -649,6 +650,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_PackingBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_SPackingBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOBillList.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ConkReasonEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ConkReasonList.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckEdit.html" />
@@ -1330,6 +1332,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOBillList.aspx.designer.cs">
<DependentUpon>xmlLBM_Sc_ICMOBillList.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList.aspx.cs">
+ <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭姹囨姤鍗昞xmlLBM_ProcessReport.aspx.cs">
<DependentUpon>xmlLBM_ProcessReport.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/WebTM/views/PublicPage/EqpInformation.html b/WebTM/views/PublicPage/EqpInformation.html
index 327f12a..0b7d145 100644
--- a/WebTM/views/PublicPage/EqpInformation.html
+++ b/WebTM/views/PublicPage/EqpInformation.html
@@ -144,7 +144,7 @@
, cellMinWidth: 90
, cols: [[
{ type: 'radio', fixed: 'left' }
- , { field: 'HInterID', title: 'HItemID', sort: true, hide: true }
+ , { field: 'HInterID', title: 'HInterID', sort: true, hide: true }
, { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
, { field: 'HNumber', title: '璁惧浠ｇ爜' }
, { field: 'HName', title: '璁惧' }
diff --git "a/WebTM/views/grf/\345\267\245\345\272\217\346\265\201\350\275\254.grf" "b/WebTM/views/grf/\345\267\245\345\272\217\346\265\201\350\275\254.grf"
new file mode 100644
index 0000000..9a559b2
--- /dev/null
+++ "b/WebTM/views/grf/\345\267\245\345\272\217\346\265\201\350\275\254.grf"
@@ -0,0 +1,680 @@
+锘縊bject Report
+ Version='6.0.0.6'
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ Height=29.7
+ Oriention=Landscape
+ LeftMargin=1.5
+ TopMargin=1.5
+ RightMargin=1.5
+ BottomMargin=1.5
+ End
+ Object DetailGrid
+ Object Recordset
+ Items Field
+ 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='宸ュ簭鍚嶇О'
+ DBFieldName='宸ヨ壓鍚嶇О'
+ 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
+ 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='鏃ユ湡'
+ Type=DateTime
+ Format='yyyy/MM/dd'
+ End
+ Item
+ Name='妯″叿缂栧彿'
+ End
+ Item
+ Name='鐗堟湰'
+ End
+ Item
+ Name='鎬昏鍥惧彿'
+ End
+ End
+ End
+ Items Column
+ Item
+ Name='Column11'
+ Width=0.978958
+ End
+ Item
+ Name='Column1'
+ Width=1.5875
+ End
+ Item
+ Name='Column2'
+ Width=1.79917
+ End
+ Item
+ Name='Column3'
+ Width=1.79917
+ End
+ Item
+ Name='Column4'
+ Width=1.79917
+ End
+ Item
+ Name='Column5'
+ Width=1.79917
+ End
+ Item
+ Name='Column6'
+ Width=1.40229
+ End
+ Item
+ Name='Column7'
+ Width=2.59292
+ End
+ Item
+ Name='Column8'
+ Width=5.02708
+ End
+ Item
+ Name='Column9'
+ Width=6.58813
+ End
+ Item
+ Name='Column10'
+ Width=1.19063
+ End
+ End
+ Object ColumnContent
+ Height=1.79917
+ RowsPerPage=12
+ Items ColumnContentCell
+ Item
+ Column='Column11'
+ DataField='娴佹按鍙�'
+ End
+ Item
+ Column='Column1'
+ DataField='宸ュ簭鍚嶇О'
+ End
+ Item
+ Column='Column2'
+ End
+ Item
+ Column='Column3'
+ End
+ Item
+ Column='Column4'
+ End
+ Item
+ Column='Column5'
+ End
+ Item
+ Column='Column6'
+ End
+ Item
+ Column='Column7'
+ FreeCell=T
+ Items Control
+ Item
+ Type=FreeGrid
+ Name='FreeGrid3'
+ Top=-0.0264583
+ Object Border
+ Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
+ End
+ ColumnCount=2
+ RowCount=1
+ Items FreeGridColumn
+ Item[1]
+ Width=1.29646
+ End
+ Item[2]
+ Width=1.27
+ End
+ End
+ Items FreeGridRow
+ Item[1]
+ Height=1.905
+ End
+ End
+ Items FreeGridCell
+ Item[1,1]
+ BorderCustom=T
+ End
+ End
+ End
+ End
+ End
+ Item
+ Column='Column8'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ DataField='妯″叿缂栧彿'
+ End
+ Item
+ Column='Column9'
+ WordWrap=T
+ ShrinkFontToFit=T
+ DataField='宸ヨ壓鍙傛暟'
+ End
+ Item
+ Column='Column10'
+ TextAlign=MiddleCenter
+ End
+ End
+ End
+ Object ColumnTitle
+ Height=1.5875
+ RepeatStyle=OnPage
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='Column11'
+ TextAlign=MiddleCenter
+ Text='娴佹按\r\n鍙�'
+ End
+ Item
+ GroupTitle=F
+ Column='Column1'
+ 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
+ Item
+ GroupTitle=F
+ Column='Column6'
+ TextAlign=MiddleCenter
+ Text='鑹搧鏁�'
+ End
+ Item
+ GroupTitle=F
+ Column='Column7'
+ FreeCell=T
+ Items Control
+ Item
+ Type=FreeGrid
+ Name='FreeGrid2'
+ Object Border
+ Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
+ ShadowColor=White
+ End
+ ColumnCount=2
+ RowCount=2
+ Items FreeGridColumn
+ Item[1]
+ Width=1.27
+ End
+ Item[2]
+ Width=1.32292
+ End
+ End
+ Items FreeGridRow
+ Item[1]
+ Height=0.687917
+ End
+ Item[2]
+ Height=0.926042
+ End
+ End
+ Items FreeGridCell
+ Item[1,1]
+ TextAlign=MiddleCenter
+ Text='涓嶈壇鍝佹暟'
+ ColSpan=2
+ End
+ Item[2,1]
+ TextAlign=MiddleCenter
+ Text='鏉ユ枡\r\n涓嶈壇'
+ End
+ Item[2,2]
+ TextAlign=MiddleCenter
+ Text='宸ュ簭\r\n涓嶈壇'
+ End
+ End
+ End
+ End
+ End
+ Item
+ GroupTitle=F
+ Column='Column8'
+ TextAlign=MiddleCenter
+ Text='妯℃鍏风紪鍙�'
+ End
+ Item
+ GroupTitle=F
+ Column='Column9'
+ TextAlign=MiddleCenter
+ Text='鍔犲伐鍐呭瑕佹眰'
+ End
+ Item
+ GroupTitle=F
+ Column='Column10'
+ TextAlign=MiddleCenter
+ Text='澶囨敞'
+ End
+ End
+ End
+ End
+ Items ReportHeader
+ Item
+ Name='ReportHeader1'
+ Height=3.99521
+ Items Control
+ Item
+ Type=MemoBox
+ Name='MemoBox1'
+ Left=7.80521
+ Top=0.211667
+ Width=8.99583
+ Height=0.79375
+ Object Font
+ Name='瀹嬩綋'
+ Size=217500,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='鐢熶骇宸ュ崟'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox2'
+ Left=0.079375
+ Top=1.40229
+ Width=1.40229
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='宸ュ崟鍙�:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox3'
+ Left=0.079375
+ Top=2.2225
+ Width=1.79917
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鎴愬搧缂栧彿:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox4'
+ Left=18.5208
+ Top=2.14313
+ Width=1.79917
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鏉愯川鏂欏帤:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox5'
+ Left=9.71021
+ Top=1.40229
+ Width=2.01083
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='浜у搧缂栫爜:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox6'
+ Left=18.5208
+ Top=1.34938
+ Width=1.79917
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='灏忕増鏈�:'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox4'
+ Left=11.721
+ Top=1.40229
+ Width=6.77333
+ Height=0.608542
+ DataField='浜у搧浠ｇ爜'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox7'
+ Left=9.68375
+ Top=2.11667
+ Width=2.11667
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='浜у搧鍚嶇О:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox8'
+ Left=5.87375
+ Top=1.42875
+ Width=1.79917
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='宸ュ崟鏁伴噺:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox9'
+ Left=5.87375
+ Top=2.11667
+ Width=2.01083
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='璁㈠崟鏁伴噺:'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox6'
+ Left=11.8004
+ Top=2.11667
+ Width=6.69396
+ Height=0.608542
+ DataField='浜у搧鍚嶇О'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox8'
+ Left=7.67292
+ Top=1.42875
+ Width=1.79917
+ Height=0.608542
+ DataField='娴佽浆鍗℃暟閲�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox10'
+ Left=0.132292
+ Top=3.20146
+ Width=1.79917
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='涓嬪崟鏃ユ湡:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox11'
+ Left=5.79438
+ Top=3.04271
+ Width=2.59292
+ Height=0.79375
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='璁″垝瀹屽伐鏃ユ湡:'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox9'
+ Left=1.93146
+ Top=3.20146
+ Width=2.32833
+ Height=0.608542
+ DataField='鏃ユ湡'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox10'
+ Left=8.38729
+ Top=3.04271
+ Width=2.38125
+ Height=0.79375
+ DataField='璁″垝瀹屽伐鏃ユ湡'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox11'
+ Left=1.48167
+ Top=1.40229
+ Width=2.80458
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鐢熶骇璁㈠崟鍙�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox12'
+ Left=1.48167
+ Top=1.40229
+ Width=2.59292
+ Height=0.608542
+ DataField='浠诲姟鍗曞彿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox13'
+ Left=20.32
+ Top=1.34938
+ Width=3.20146
+ Height=0.582083
+ DataField='鐗堟湰'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox15'
+ Left=18.6002
+ Top=2.98979
+ Width=5.21229
+ Height=0.820208
+ WordWrap=T
+ TextAlign=MiddleCenter
+ DataField='鏉愯川'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode1'
+ Left=23.8125
+ Top=1.00542
+ Width=2.59292
+ Height=2.80458
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='[#鍗曟嵁鍙�#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox13'
+ Left=7.88458
+ Top=2.11667
+ Width=1.5875
+ Height=0.608542
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox16'
+ Left=1.87854
+ Top=2.2225
+ Width=3.91583
+ Height=0.582083
+ DataField='鎴愬搧缂栧彿'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox14'
+ Left=10.8744
+ Top=3.20146
+ Width=2.61938
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='宸ュ簭娴佽浆鍗″彿:'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox17'
+ Left=13.679
+ Top=3.20146
+ Width=2.98979
+ Height=0.608542
+ DataField='鍗曟嵁鍙�'
+ End
+ End
+ RepeatOnPage=T
+ 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/HBarPlanPrint.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/HBarPlanPrint.html"
index b1ecffd..6de6730 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/HBarPlanPrint.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/HBarPlanPrint.html"
@@ -174,7 +174,10 @@
break;
case "HQKPackBill"://澧欏挃瑁呯鎵撳嵃
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_QK_PackingBillList.aspx?typename='" + OpenTmp + "'&linterid=" + value, true, "");
- break;
+ break;
+ case "HProcessExchange"://宸ュ簭娴佽浆鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_ProcessExchangeBillList.aspx?linterid=" + value, true, "");
+ break;
}
</script>
</body>
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/xmlLBM_Sc_ProcessExchangeBillList.aspx" "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/xmlLBM_Sc_ProcessExchangeBillList.aspx"
new file mode 100644
index 0000000..87ed785
--- /dev/null
+++ "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/xmlLBM_Sc_ProcessExchangeBillList.aspx"
@@ -0,0 +1,27 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_Sc_ProcessExchangeBillList.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_Sc_ProcessExchangeBillList" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title></title>
+ <script runat="server">
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ SqlXMLReportData.GenOneRecordset(this, "select distinct b.娴佹按鍙�,a.浠诲姟鍗曞彿,a.娴佽浆鍗℃暟閲�,a.浜у搧浠ｇ爜,a.鐗堟湰,a.鎴愬搧缂栧彿,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,a.鏉愯川,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid="+Request.Params["linterid"]);
+ }
+ </script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div>
+ </div>
+ </form>
+</body>
+</html>
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/xmlLBM_Sc_ProcessExchangeBillList.aspx.cs" "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/xmlLBM_Sc_ProcessExchangeBillList.aspx.cs"
new file mode 100644
index 0000000..01fd614
--- /dev/null
+++ "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/xmlLBM_Sc_ProcessExchangeBillList.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+ public partial class xmlLBM_Sc_ProcessExchangeBillList : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
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/xmlLBM_Sc_ProcessExchangeBillList.aspx.designer.cs" "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/xmlLBM_Sc_ProcessExchangeBillList.aspx.designer.cs"
new file mode 100644
index 0000000..2f4694a
--- /dev/null
+++ "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/xmlLBM_Sc_ProcessExchangeBillList.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_Sc_ProcessExchangeBillList
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html"
index 1252363..0714f30 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html"
@@ -38,7 +38,7 @@
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnPack" id="btnPack" style="padding: 0 30px; margin-left: 150px">鏉＄爜鐢熸垚</button>
- <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnAssembly" id="btnAssembly" style="padding:0 30px">鎷艰鐢熸垚</button>-->
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnAssembly" id="btnAssembly" style="padding:0 30px">鎷艰鐢熸垚</button>
</div>
</div>
</form>
@@ -109,9 +109,10 @@
});
//鏁寸鐢熸垚
form.on('submit(btnPack)', function (data) {
+ var flag = "ZZ";
var sSubStr = table.checkStatus('mainTable');
if (sSubStr.data.length > 0) {
- SavePack(sSubStr);
+ SavePack(flag,sSubStr);
}
else {
layer.msg('璇锋渶灏戦�夋嫨1琛屾暟鎹紒');
@@ -121,10 +122,8 @@
//鎷肩鐢熸垚
form.on('submit(btnAssembly)', function (data) {
var flag = "PZ";
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length > 1) {
- var sSubStr = JSON.stringify(table.checkStatus('mainTable').data);
+ var sSubStr = table.checkStatus('mainTable');
+ if (sSubStr.data.length > 1) {
SavePack(flag,sSubStr);
}
else {
@@ -212,7 +211,7 @@
table.render(option);
}
//鐢熸垚
- function SavePack(sSubStr) {
+ function SavePack(flag,sSubStr) {
if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
{
return false;
@@ -222,7 +221,7 @@
type: "POST",
url: GetWEBURL() + "/Sc_ICMOBill/QK_PackingBillSavePack", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
- data: { "msg": JSON.stringify(sSubStr.data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"]},
+ data: { "msg": JSON.stringify(sSubStr.data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + flag + ";" + $('#HBillNo').val()},
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
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 57a41a2..25de2c4 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"
@@ -317,7 +317,7 @@
<input type="text" class="layui-input" name="HICMOEntryID" id="HICMOEntryID" value="0" style="background-color:#efefef4d;" readonly>
</div>
</div>
- <div class="layui-col-xs3 layui-inline">
+ <!--<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">娴佽浆鍗＄被鍨�</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HWorkTypeName" id="HWorkTypeName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
@@ -326,7 +326,7 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
- </div>
+ </div>-->
</div>
</div>
</div>
@@ -344,6 +344,8 @@
<label class="layui-form-label" style="width: 85px;">閿�鍞鍗曞彿</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HSeOrderBillNo" id="HSeOrderBillNo">
+ <input type="hidden" class="layui-input" name="HSeOrderEntryID" id="HSeOrderEntryID">
+ <input type="hidden" class="layui-input" name="HSeOrderInterID" id="HSeOrderInterID">
</div>
</div>
<div class="layui-inline">
@@ -577,7 +579,7 @@
, form = layui.form
, laydate = layui.laydate
, element = layui.element;
-
+ var option;
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
// layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
@@ -595,6 +597,12 @@
var HEntryID=params[params[2]];//婧愬崟瀛恑d
var HSouceBillType = params[params[3]];//婧愬崟绫诲瀷
}
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
$.ajax({
@@ -610,6 +618,16 @@
$("#HMaker").val(sessionStorage["HUserName"]);
}
});
+ option.data = [{
+ "HProcNo": "", "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
+ "HCenterID": 0, "HCenterNumber": "", "HCenterName": "",
+ "HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
+ "HSupID": 0, "HSupNumber": "", "HSupName": "", "isEntrust": "false",
+ "HQty": 0, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
+ "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
+ "HPassRate": "", "HSumPassRate": "", "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
+ }];
+ table.render(option);
}
else if (OperationType == 2) {//鏈夋簮鍗曟柊澧�
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
@@ -627,42 +645,33 @@
$("#HMaker").val(sessionStorage["HUserName"]);
}
});
- GetICMOBillValue(linterid, HEntryID)
+ GetICMOBillValue(linterid, HEntryID);
+ option.data = [{
+ "HProcNo": "", "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
+ "HCenterID": 0, "HCenterNumber": "", "HCenterName": "",
+ "HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
+ "HSupID": 0,"HSupNumber": "", "HSupName": "", "isEntrust": "false",
+ "HQty": 0, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
+ "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
+ "HPassRate": "", "HSumPassRate": "", "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
+ }];
+ table.render(option);
}
else if (OperationType == 3) {//缂栬緫
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
- $("#HEntryID").val(HEntryID);//淇敼鏃朵富琛↖D
- //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
- layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
- }
- else if (OperationType == 4) {//娴忚
- $("#HItemID").val(linterid);//
- $("#HEntryID").val(HEntryID);//
- //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
- RoadBillMain(linterid);
- $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+ set_EditFromGrid();
+
}
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
+ //#endregion
+
- //鍒濆琛ㄦ牸鏁版嵁
- var rowdata = [{
- "HProcNo": "", "HProcID": "", "HProcNumber": "", "HProcName": "", "鍔犲伐璇存槑": "",
- "HCenterID": "", "宸ヤ綔涓績浠ｇ爜": "", "宸ヤ綔涓績": "", "HSupID": "",
- "渚涘簲鍟�": "", "渚涘簲鍟嗕唬鐮�": "", "isEntrust": "false",
- "HQty": "", "鍔犲伐鍗曚綅": "", "HRemark": "", "琛屽彿": "", "杩涚珯鏁伴噺": "", "鍑虹珯鏁伴噺": "",
- "濮斿宸ュ崟鏁伴噺": "", "涓嶅悎鏍兼暟閲�": "", "瓒呴姣斾緥": "", "鏈�楂樹笂闄�": "", "isEdit": "鍚�", "isEditValue": "false",
- "鑹巼": "", "绱鑹巼": "", "宸ヨ壓鍙傛暟": "", "鍥剧焊缂栧彿": "", "鏈伐搴忕‘璁よ褰�": ""
- }];
-
- var option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
- , height: 'full-50'
- , cellMinWidth: 110
- , cols: [[ //琛ㄥご
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ //琛ㄥご
+ columns = [ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', totalRow: true }
, { field: 'HProcNo', title: '娴佹按鍙�', edit: 'text' }
@@ -671,75 +680,75 @@
, { field: 'HProcName', title: '宸ュ簭鍚嶇О' }
, { field: 'HWorkRemark', title: '鍔犲伐璇存槑', edit: 'text' }
, { field: 'HCenterID', title: '宸ヤ綔涓績ID', hide: true }
- , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', edit: 'text', event: "HWorkCenterCheck" }
- , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績鍚嶇О' }
+ , { field: 'HCenterNumber', title: '宸ヤ綔涓績浠ｇ爜', edit: 'text', event: "HWorkCenterCheck" }
+ , { field: 'HCenterName', title: '宸ヤ綔涓績鍚嶇О' }
+ , { field: 'HDeptID', title: '閮ㄩ棬ID', hide: true }
+ , { field: 'HDeptNumber', title: '閮ㄩ棬浠ｇ爜', edit: 'text', event: "HDeptCheck" }
+ , { field: 'HDeptName', title: '閮ㄩ棬' }
, { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
- , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', event: "HSupCheck" }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
+ , { field: 'HSupNumber', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', event: "HSupCheck" }
+ , { field: 'HSupName', title: '渚涘簲鍟�' }
, { field: 'isEntrust', title: '鏄惁濮斿', templet: '#isEntrust' }
- , { field: 'HQty', title: '娴佽浆鍗℃暟閲�', edit: 'text' }
- , { field: '鍔犲伐鍗曚綅', title: '鍔犲伐鍗曚綅', edit: 'text' }
+ , { field: 'HQty', title: '娴佹按鍗℃暟閲�', edit: 'text' }
+ , { field: 'HOutPrice', title: '鍔犲伐鍗曚环', edit: 'text' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
- , { field: '琛屽彿', title: '琛屽彿', edit: 'text' }
- , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', edit: 'text' }
- , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺', edit: 'text' }
- , { field: '濮斿宸ュ崟鏁伴噺', title: '濮斿宸ュ崟鏁伴噺', edit: 'text' }
- , { field: '涓嶅悎鏍兼暟閲�', title: '涓嶅悎鏍兼暟閲�', edit: 'text' }
- , { field: '瓒呴姣斾緥', title: '瓒呴姣斾緥', edit: 'text' }
- , { field: '鏈�楂樹笂闄�', title: '鏈�楂樹笂闄�', edit: 'text' }
- , { field: 'isEdit', title: '涓嶅彲缂栬緫', event: "isEditCheck" }
- , { field: 'isEditValue', title: '涓嶅彲缂栬緫鍊�', hide: true }
- , { field: '鑹巼', title: '鑹巼', edit: 'text' }
- , { field: '绱鑹巼', title: '绱鑹巼', edit: 'text' }
+ , { field: 'HRelationQty_In', title: '杩涚珯鏁伴噺', edit: 'text' }
+ , { field: 'HRelationQty_Out', title: '鍑虹珯鏁伴噺', edit: 'text' }
+ , { field: 'HRelationQty_WWOrder', title: '濮斿宸ュ崟鏁伴噺', edit: 'text' }
+ , { field: 'HRelationQty_Bad', title: '涓嶅悎鏍兼暟閲�', edit: 'text' }
+ , { field: 'HOverRate', title: '瓒呴姣斾緥', edit: 'text', event: "HOverRate" }
+ , { field: 'HMaxQty', title: '鏈�楂樹笂闄�', edit: 'text', edit: 'false', }
+ , { field: 'HPassRate', title: '鑹巼', edit: 'text' }
+ , { field: 'HSumPassRate', title: '绱鑹巼', edit: 'text' }
, { field: 'HPicNum', title: '鍥剧焊缂栧彿', edit: 'text' }
, { field: 'HProcCheckNote', title: '鏈伐搴忕‘璁よ褰�', edit: 'text', width: 500 }
- , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', edit: 'text', width:1200 }
+ , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', edit: 'text', width: 1200 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
- ]]
- , done: function (res, curr, count) {
- option.data = res.data;
- //鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
- $('.layui-form-select').find('input').unbind("blur");
- //琛ㄦ牸閲嶈浇鍥炴樉涓嬫媺妗嗛噷鐨勬暟鎹�
- $('tr').each(function (e) {
- var $cr = $(this);
- var dataIndex = $cr.attr("data-index");
- $.each(option.data, function (index, value) {
- if (value.LAY_TNDEX == dataIndex) {
- $cr.find('input').val(value.isEntrust);
- }
+ ];
+ option = {
+ id: 'mainTable'
+ , elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , page: false
+ , cellMinWidth: 120
+ , height: 500
+ , cols: [columns]
+ , done: function (res, curr, count) {
+ option.data = res.data;
+ //鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
+ $('.layui-form-select').find('input').unbind("blur");
+ //琛ㄦ牸閲嶈浇鍥炴樉涓嬫媺妗嗛噷鐨勬暟鎹�
+ $('tr').each(function (e) {
+ var $cr = $(this);
+ var dataIndex = $cr.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TNDEX == dataIndex) {
+ $cr.find('input').val(value.isEntrust);
+ }
+ });
});
- });
- }
- , text: {
- none: '鏃犳暟鎹紒'
- }
- };
- //鍒濆鍔犺浇琛ㄦ牸
- option.data = rowdata;
- table.render(option);
+ }
+ , done: function (res, curr, count) {
- //鏄惁榛樿宸ヨ壓
- //form.on('checkbox(HBLFlag)', function (data) {
- // $("#HBLFlag").val(data.elem.checked);
- //});
- //鏄惁鍚敤
- form.on('checkbox(checkboxHUseFlag)', function (data) {
- $("#HUseFlag").val(data.elem.checked);
- });
+ }
+ };
+ }
+
+
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
- var NewRow = {
- "HProcNo": "", "HProcID": "", "HProcNumber": "", "HProcName": "", "鍔犲伐璇存槑": "",
- "HCenterID": "", "宸ヤ綔涓績浠ｇ爜": "", "宸ヤ綔涓績": "", "HSupID": "",
- "渚涘簲鍟�": "", "渚涘簲鍟嗕唬鐮�": "", "isEntrust": "false",
- "HQty": "", "鍔犲伐鍗曚綅": "", "HRemark": "", "琛屽彿": "", "杩涚珯鏁伴噺": "", "鍑虹珯鏁伴噺": "",
- "濮斿宸ュ崟鏁伴噺": "", "涓嶅悎鏍兼暟閲�": "", "瓒呴姣斾緥": "", "鏈�楂樹笂闄�": "", "isEdit": "鍚�", "isEditValue": "false",
- "鑹巼": "", "绱鑹巼": "", "宸ヨ壓鍙傛暟": "", "鍥剧焊缂栧彿": "", "鏈伐搴忕‘璁よ褰�": ""
+ var NewRow ={
+ "HProcNo": "", "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
+ "HCenterID": 0, "HCenterNumber": "", "HCenterName": "",
+ "HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
+ "HSupID": 0, "HSupNumber": "", "HSupName": "", "isEntrust": "false",
+ "HQty": 0, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
+ "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
+ "HPassRate": "", "HSumPassRate": "", "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
};
switch (obj.event) {
case 'btn-AddLine':
@@ -791,6 +800,7 @@
}
});
}
+
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
if (obj.event == 'HProcCheck') {
@@ -816,6 +826,7 @@
, HProcID: checkStatus.data[0].HItemID
, HProcNumber: checkStatus.data[0].宸ュ簭浠ｇ爜
});
+
layer.close(layer.index);
}
, btn2: function (index, layero) {
@@ -844,9 +855,9 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
obj.update({
- 宸ヤ綔涓績: checkStatus.data[0].宸ヤ綔涓績
+ HCenterName: checkStatus.data[0].宸ヤ綔涓績
, HCenterID: checkStatus.data[0].HItemID
- , 宸ヤ綔涓績浠ｇ爜: checkStatus.data[0].宸ヤ綔涓績浠ｇ爜
+ , HCenterNumber: checkStatus.data[0].宸ヤ綔涓績浠ｇ爜
});
layer.close(layer.index);
}
@@ -876,9 +887,41 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
obj.update({
- 渚涘簲鍟�: checkStatus.data[0].HName
+ HSupName: checkStatus.data[0].HName
, HSupID: checkStatus.data[0].HItemID
- , 渚涘簲鍟嗕唬鐮�: checkStatus.data[0].HNumber
+ , HSupNumber: checkStatus.data[0].HNumber
+ });
+ layer.close(layer.index);
+ }
+ , btn2: function (index, layero) {
+ },
+ end: function () {
+
+ }
+ });
+ }
+ if (obj.event === 'HDeptCheck') {//閮ㄩ棬
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '渚涘簲鍟嗗垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HDeptName: checkStatus.data[0].HName
+ , HDeptID: checkStatus.data[0].HItemID
+ , HDeptNumber: checkStatus.data[0].HNumber
});
layer.close(layer.index);
}
@@ -916,98 +959,29 @@
}
});
- $('#HName').on('keydown', function (event) {//宸ヨ壓璺嚎鍚嶇О
- if (event.keyCode == 118) {
- layer.msg("宸ヨ壓璺嚎鍚嶇ОF7鎸夐挳")
- }
- });
+ //鐩戝惉鍗曞厓鏍肩紪杈� 鍗曞厓鏍肩紪杈戝悗 鍙樻洿
+ table.on('edit(mainTable)', function (obj) {
+ // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+ //绗竴琛岃鍒掓暟閲�=娴佽浆鍗℃暟閲忥紱涔嬪悗鐨勮鍒掓暟閲�=涓婁竴琛屾暟閲�*鑹巼/ 100
+ //鏈�楂樹笂闄�=娴佽浆鍗℃暟閲�*(100+瓒呴姣斾緥)/100
+
+ var oldText = $(this).prev().text();
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
- //淇濆瓨鎻愪氦
- form.on('submit(btnSave)', function (data) {//鎻愪氦
- if ($("#HICMOInterID").val() == 0) {
- layer.msg("璇烽�夋嫨浠诲姟鍗曪紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
+ switch (field) {
+ case "HOverRate":
+ var HQty = parseInt(isNaN(data.HQty) ? 0 : data.HQty);
+ var HOverRate = parseFloat(isNaN(data.HOverRate) ? 0 : data.HOverRate);
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMaxQty: HQty * (100 + HOverRate)/100 //鏈�灏忓寘瑁呮暟
+ });
+ break;
+ default:
}
- if ($("#HQty").val() == "" || $("#HQty").val() <= 0) {
- layer.msg("鍩烘湰淇℃伅涓祦杞崱鏁伴噺涓嶈兘涓虹┖涓斾笉鑳藉皬浜庣瓑浜�0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if (!$("#HPlanBeginDate").val()) {
- layer.msg("璇烽�夋嫨璁″垝寮�宸ユ棩鏈燂紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if (!$("#HPlanEndDate").val()) {
- layer.msg("璇烽�夋嫨璁″垝瀹屽伐鏃ユ湡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- var sSubTable = table.cache['mainTable'];
- for (var i = 0; i < sSubTable.length; i++) {
- if (!sSubTable[i].HProcNo) {
- var indexRow = i + 1;
- layer.msg("绗�" + indexRow + "琛岋紝娴佹按鍙蜂笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if (sSubTable[i].HProcNo == 0) {
- var indexRow = i + 1;
- layer.msg("绗�" + indexRow + "琛岋紝娴佹按鍙蜂笉鑳戒负0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if (!sSubTable[i].HProcID) {
- var indexRow = i + 1;
- layer.msg("绗�" + indexRow + "琛岋紝宸ュ簭涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if (!sSubTable[i].HCenterID) {
- var indexRow = i + 1;
- layer.msg("绗�" + indexRow + "琛岋紝宸ヤ綔涓績涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if (sSubTable[i].isEntrust == "true") {
- if (!sSubTable[i].HSupID) {
- var indexRow = i + 1;
- layer.msg("绗�" + indexRow + "琛岋紝渚涘簲鍟嗕笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- }
- }
- data.field.HPRDORGID = sessionStorage["OrganizationID"];//缁勭粐
- var HBLFlag = document.getElementById("HBLFlag").checked;
- HBLFlag == "on" ? data.field.HBLFlag = 'true' : data.field.HBLFlag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
- var sMainStr = JSON.stringify(data.field);
- var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
- var index = layer.load();
- $.ajax({
- type: "POST",
- url: GetWEBURL() + "/Sc_ProcessExchangeBill/AddBill",
- async: true,
- data: { "sMainSub": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) {
- //layer.confirm(data.Message, {
- // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- // btn2: function () {
- // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- // parent.location.href = "../../../views/index.html"
- // }//鍏抽棴
- //}, function () { window.location.reload(); });//鏂板
- layer.close(index);
- layer.msg("鎻愪氦鎴愬姛");
- $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳绂佺敤
- }
- else {
- layer.close(index);
- layer.msg(data.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: "娓╅Θ鎻愮ず" });
- }
- });
});
@@ -1089,7 +1063,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HEquipMentName").val(checkStatus.data[0].HName);
- $("#HEquipMentID").val(checkStatus.data[0].HItemID);
+ $("#HEquipMentID").val(checkStatus.data[0].HInterID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -1181,23 +1155,6 @@
});
});
- //閫夋嫨涓嶈壇鍘熷洜
- form.on('submit(HBadReasonID-BT)', function () {//閫夋嫨浠撳簱
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '涓嶈壇鍘熷洜鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
-
//閫夋嫨鐢熶骇浠诲姟鍗�
form.on('submit(btnSearchICMOBill)', function () {
layer.open({
@@ -1214,90 +1171,255 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- GetICMOBillValue(checkStatus.data[0].hmainid)
+ GetICMOBillValue(checkStatus.data[0].hmainid, checkStatus.data[0].HEntryID)
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
})
});
- //閫夋嫨璐ｄ换浜�
- form.on('submit(HEmployeeID-BT)', function () {//閫夋嫨璐ｄ换浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
- //閫夋嫨鐢宠宸ュ簭
- form.on('submit(HSQProcID-BT)', function () {//閫夋嫨鐢宠宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐢宠宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
- //閫夋嫨璐ｄ换宸ュ簭
- form.on('submit(HZRProcID-BT)', function () {//閫夋嫨璐ｄ换宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '璐ｄ换宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
+ //淇濆瓨鎻愪氦
+ form.on('submit(btnSave)', function (data) {//鎻愪氦
+ if ($("#HICMOInterID").val() == 0) {
+ layer.msg("璇烽�夋嫨浠诲姟鍗曪紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HQty").val() == "" || $("#HQty").val() <= 0) {
+ layer.msg("鍩烘湰淇℃伅涓祦杞崱鏁伴噺涓嶈兘涓虹┖涓斾笉鑳藉皬浜庣瓑浜�0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HPlanBeginDate").val()) {
+ layer.msg("璇烽�夋嫨璁″垝寮�宸ユ棩鏈燂紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HPlanEndDate").val()) {
+ layer.msg("璇烽�夋嫨璁″垝瀹屽伐鏃ユ湡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ var sSubTable = table.cache['mainTable'];
+ for (var i = 0; i < sSubTable.length; i++) {
+ if (!sSubTable[i].HProcNo) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝娴佹按鍙蜂笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
}
- })
- });
-
- //缂栬緫
- form.on('submit(cmdModify)', function () {//缂栬緫
- var sSubStr = table.cache['wl-table'];
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏄庣粏鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
+ if (sSubTable[i].HProcNo == 0) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝娴佹按鍙蜂笉鑳戒负0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
}
- })
- // }
+ if (!sSubTable[i].HProcID) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝宸ュ簭涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!sSubTable[i].HCenterID) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝宸ヤ綔涓績涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (sSubTable[i].isEntrust == "true") {
+ if (!sSubTable[i].HSupID) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝渚涘簲鍟嗕笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ }
+ }
+ data.field.HPRDORGID = sessionStorage["OrganizationID"];//缁勭粐
+ var HBLFlag = document.getElementById("HBLFlag").checked;
+ HBLFlag == "on" ? data.field.HBLFlag = 'true' : data.field.HBLFlag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Sc_ProcessExchangeBill/AddBill",
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳绂佺敤
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.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: "娓╅Θ鎻愮ず" });
+ }
+ });
});
-
+ //閫�鍑�
form.on('submit(Cancel)', function () {
- if (OperationType == 1) {
+ if (linterid == undefined) {
+ //鍏抽棴椤电
Pub_Close(2);
- } else if (OperationType == 2) {
+ }
+ else {
+ //鍏抽棴椤电
Pub_Close(1);
}
})
+
+ //缂栬緫鏂规硶
+ function set_EditFromGrid() {
+ set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
+ set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
+ option.data = [{
+ "HProcNo": "", "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
+ "HCenterID": 0, "HCenterNumber": "", "HCenterName": "",
+ "HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
+ "HSupID": 0, "HSupNumber": "", "HSupName": "", "isEntrust": "false",
+ "HQty": 0, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
+ "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
+ "HPassRate": "", "HSumPassRate": "", "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
+ }];
+ table.render(option);
+ }
+ //缂栬緫鑾峰彇琛ㄥご
+ function set_EditForm(linterid) {
+ //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+ $.ajax({
+ url: GetWEBURL() + "Sc_ProcessExchangeBill/GetProcessExchangeBillMain",
+ type: "GET",
+ data: {
+ "HInterID": linterid
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.h_v_Sc_ProcessExchangeBillQuery[0];
+ form.val("component-form-group", {
+ "HBillNo": data.鍗曟嵁鍙�
+ , "HInterID": data.hmainid
+ , "HPRDORGID": data.HPRDORGID
+ , "HDate": formatDate(data.鏃ユ湡)
+ , "HOrderProcNO": data.璁㈠崟璺熻釜鍙�
+ , "HPicNumVer": data.鍥惧彿鐗堟湰
+ , "HMaterName2": data.浜у搧鍚嶇О
+ , "HMaterID2": data.HMaterID2
+ , "HMaterNumber2": data.浜у搧浠ｇ爜
+ , "HMaterModel2": data.浜у搧瑙勬牸
+ , "HPicNumAssemble": data.鎬昏鍥惧彿
+ , "HICMOBillNo": data.浠诲姟鍗曞彿
+ , "HICMOInterID": data.hicmointerid
+ , "HQty": data.娴佽浆鍗℃暟閲�
+ , "HUnitName": data.鍗曚綅
+ , "HUnitID": data.HUnitID
+ , "HMaterTexture": data.鏉愯川
+ , "HPlanBeginDate": formatDate(data.璁″垝寮�宸ユ棩鏈�)
+ , "HPlanEndDate": formatDate(data.璁″垝瀹屽伐鏃ユ湡)
+ , "HEquipMentName": data.璁惧鍚嶇О
+ , "HEquipMentID": data.HEquipMentID
+ , "HProductNum": data.鎴愬搧缂栧彿
+ , "HExplanation": data.琛ユ枡鍘熷洜
+ , "HBLFlag": data.琛ユ枡鏍囪
+ , "HProjectNum": data.椤圭洰缂栧彿
+ , "HVerNum": data.鐗堟湰
+ , "HRemark": data.琛ㄥご澶囨敞
+ , "HMateOutBatchNo": data.鍘熸枡鎵规
+
+
+ , "HWorkShopName": data.鐢熶骇杞﹂棿
+ , "HWorkShopID": data.HWorkShopID
+ , "textBox2": data.浠诲姟鍗曞彿
+ , "HSupName": data.濮斿鍔犲伐鍗曚綅
+ , "HSupID": data.HSupID
+ , "HMaterName": data.瀛愪欢鍚嶇О
+ , "HMaterID": data.HMaterID
+ , "HMaterNumber": data.瀛愪欢浠ｇ爜
+ , "HMaterModel": data.瀛愪欢瑙勬牸
+ , "HUnitNumber": data.鍗曚綅浠ｇ爜
+ , "HMainMaterID": data.涓昏鏉愭枡
+ , "HPlanQty": data.鐢熶骇鏁伴噺
+ , "HprocExQty": data.鐢熶骇鏁伴噺
+ , "HKeyMaterID": data.鍏抽敭鏉愭枡
+ , "HICMOEntryID": data.HICMOEntryID
+ , "HProdMaterCode": data.浜у搧CODE
+ , "HSeOrderBillNo": data.閿�鍞鍗曞彿
+ , "HSeOrderEntryID": data.HSeOrderEntryID
+ , "HSeOrderInterID": data.HSeOrderInterID
+ , "HCusShortName": data.瀹㈡埛绠�绉�
+ , "HCusNeedMaterial": data.瀹㈡埛瑕佹眰鏉愭枡鎴愬垎
+ , "HPlanSendGoodsDate": data.棰勮鍑鸿揣鏃ユ湡
+ , "HProdMaterName": data.浜у搧鍚嶇О2
+ , "HCusName": data.瀹㈡埛鍚嶇О
+ , "HWorkRemark": data.鐢熶骇澶囨敞
+ , "HImportNote": data.閲嶈鎻愮ず
+ , "HMaterNumber_A": data.鍘熸潗鏂欑紪鍙稟
+ , "HMaterNumber_B": data.鍘熸潗鏂欑紪鍙稡
+ , "HMaterNumber_C": data.鍘熸潗鏂欑紪鍙稢
+ , "HMaterNumber_D":data.鍘熸潗鏂欑紪鍙稤
+ , "HProdType": data.鐢熶骇绫诲瀷
+ , "HMaterShortName": data.鍘熸潗鏂欑畝绉�
+ , "HMaterIDA": data.鍘熸潗鏂欏唴鐮丄
+ , "HMaterIDB": data.鍘熸潗鏂欏唴鐮丅
+ , "HMaterIDC": data.鍘熸潗鏂欏唴鐮丆
+ , "HMaterIDD": data.鍘熸潗鏂欏唴鐮丏
+
+ , "HMaker": data.鍒跺崟浜�
+ , "HChecker": data.瀹℃牳浜�
+ , "HCloseMan": data.鍏抽棴浜�
+ , "HMakeDate": formatDate(data.鍒跺崟鏃ユ湡)
+ , "HCheckDate": formatDate(data.瀹℃牳鏃ユ湡)
+ , "HCloseDate": formatDate(data.鍏抽棴鏃ユ湡)
+ , "HUpDater": data.淇敼浜�
+ , "HDeleteMan": data.浣滃簾浜�
+ , "HUpDateDate": formatDate(data.淇敼鏃ユ湡)
+ , "HDeleteDate": formatDate(data.浣滃簾鏃ユ湡)
+
+ });
+
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ // 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝ｆ柟寮�
+ function formatDate(date) {
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return [year, month, day].join('-');
+ }
+ // 缂栬緫鑾峰彇琛ㄤ綋
+ function set_EditGrid(linterid) {
+ $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+ //缂栬緫鍔犺浇鏁版嵁
+ $.ajax({
+ url: GetWEBURL() + 'Sc_ProcessExchangeBill/GetProcessExchangeBillSub',
+ type: "GET",
+ data: { "HInterID": linterid },
+ success: function (result) {
+ if (result.count == 1) {
+ option.data = result.data;
+ table.render(option);
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index0);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//杩斿洖鐢熶骇浠诲姟鍗�
@@ -1401,50 +1523,6 @@
ZRProcName, QRName;
- function GetHReasonValue(obj) //杩斿洖涓嶈壇鍘熷洜
- {
- HReasonName = obj[0].HName;
- ReasonID = obj[0].HItemID;
- }
-
- //杩斿洖浜у搧
- function GetHMaterNameValue(obj) {
- $("#HMaterName2").val(obj[0].HName);
- $("#HMaterID2").val(obj[0].HItemID);
- $("#HMaterNumber2").val(obj[0].HNumber);
- $("#HMaterHModel2").val(obj[0].HModel);
- }
- function GetHKeeperValue(obj) { //杩斿洖璐ｄ换浜�
- EmpName = obj[0].HName;
- // $("#HEmpName").val(obj[0].HName);
- //$("#HItemID").val(obj[0].HItemID);
- }
- function GetHProcValue(obj) {
- subProcName = obj[0].宸ュ簭;
- subProcID = obj[0].HItemID;
- subProcNumber = obj[0].HProcNumber;
- }
- function GetHSupValue(obj) {
- subSupName = obj[0].HName;
- subSupID = obj[0].HItemID;
- subSupNumber = obj[0].HNumber;
- }
- function GetWorkCenterValue(obj) {
- subWorkCenterName = obj[0].宸ヤ綔涓績;
- subWorkCenterID = obj[0].HItemID;
- subWorkCenterNumber = obj[0].宸ヤ綔涓績浠ｇ爜;
- }
- function GetHZRValue(obj) { //杩斿洖璐ｄ换宸ュ簭
- ZRProcName = obj[0].宸ュ簭;
- //$("#HZRProcName").val(obj[0].宸ュ簭);
- //$("#HItemID").val(obj[0].HItemID);
- }
- //HWorker
- function GetHWorkerValue(obj) { //杩斿洖涓嶈壇纭浜�
- QRName = obj[0].HName;
- //$("#HQRName").val(obj[0].HName);
- //$("#HItemID").val(obj[0].HItemID);
- }
</script>
</body>
</html>
\ No newline at end of file
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_ProcessExchangeBillList.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_ProcessExchangeBillList.html"
index 7793685..6bff845 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_ProcessExchangeBillList.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_ProcessExchangeBillList.html"
@@ -83,6 +83,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
@@ -146,6 +148,12 @@
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
break;
+ //棰勮
+ case 'btn_view': get_view();
+ break;
+ //鎵撳嵃
+ case 'btn_print': get_print();
+ break;
};
});
@@ -163,6 +171,7 @@
});
//#endregion
+
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
function set_ClearBill() {
//鍒濆鍖栦富琛ㄥ垪琛�
@@ -177,13 +186,15 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
$("#SHPrintQty").val("");//鎵撳嵃鐘舵��
- wybj = false;//濮斿鏍囪
+ $("input[type='checkbox'][name='wybj']").prop('checked', false);
+ form.render("checkbox");//濮斿鏍囪
$("#HDate").val("");//寮�濮嬫棩鏈�
$("#HDate1").val("");//缁撴潫鏃ユ湡
$("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
$("#SHname").val("");//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
//$("#btnSearch").click();
sWhere = "";
+ get_Display(sWhere);
}
//#endregion
@@ -226,69 +237,6 @@
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
- ////鏌ヨ鎸夐挳
- //form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
- // var SHPrintQty = $("#SHPrintQty").val();//鎵撳嵃鐘舵��
- // var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
- // var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
- // var HOrderProcNO = $("#HOrderProcNO").val();//璁㈠崟璺熻釜鍙�
- // var SHname = $("#SHname").val();//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
- // if (SHPrintQty) {//鍒ゆ柇鎵撳嵃鐘舵��
- // if (SHPrintQty == "鍏ㄩ儴") {
- // sWhere = " and 鎵撳嵃娆℃暟 >= 0 ";
- // }
- // if (SHPrintQty == "宸叉墦鍗�") {
- // sWhere = " and 鎵撳嵃娆℃暟 > 0 ";
- // }
- // if (SHPrintQty == "鏈墦鍗�") {
- // sWhere = " and 鎵撳嵃娆℃暟 = 0 ";
- // }
- // }
- // if (wybj) {
- // sWhere += " and 濮斿鏍囪 = 'Y'";
- // }
- // if (HDate) {
- // sWhere += " and 鏃ユ湡 >= '" + HDate + "'";
- // }
- // if (HDate1) {
- // sWhere += " and 鏃ユ湡 <= '" + HDate1 + "'";
- // }
- // if (HOrderProcNO) {
- // sWhere += " and 璁㈠崟璺熻釜鍙� like '%" + HOrderProcNO + "%'";
- // }
- // if (SHname) {
- // sWhere += " and 瀛愪欢鍚嶇О like '%" + SHname + "%' or 瀛愪欢瑙勬牸 like '%" + SHname + "%'"
- // }
- // $.ajax({
- // //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- // url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuery_Json',
- // type: "GET",
- // data: { "sWhere": sWhere },
- // success: function (data1) {
- // if (data1.count == 1) {
- // option.data = data1.data;
- // table.render(option);
- // layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
- // } else {
- // layer.alert(data1.code + data1.Message, { icon: 5 });
- // }
- // }, error: function () {
- // layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
- // }
- // });
- // sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
- //});
-
- ////閲嶇疆鎸夐挳
- //form.on('submit(btnReSearch)', function (data) {
- // $("#SHPrintQty").val("");//鎵撳嵃鐘舵��
- // wybj = false;//濮斿鏍囪
- // $("#HDate").val("");//寮�濮嬫棩鏈�
- // $("#HDate1").val("");//缁撴潫鏃ユ湡
- // $("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
- // $("#SHname").val("");//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
- // $("#btnSearch").click();
- //});
//閫変腑鍒ゆ柇
form.on('checkbox(wybj)', function (data) {
@@ -510,42 +458,99 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var linterid = data[0];
+ var linterid = data[0].hmainid;
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({
type: 2
, area: ['100%', '100%']
, title: '宸ュ簭鍒楄〃-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=3&linterid=' + linterid + '&HEntryID=' + hsubid+'&HSouceBillType='
+ , content: '../宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=3&linterid=' + linterid + '&HEntryID=&HSouceBillType='
})
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
}
//#endregion
- ////鏌ヨ
- //function get_Display(sWhere)
- //{
- // //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- // $.ajax({
- // url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuery_Json',
- // type: "GET",
- // data: { "sWhere": sWhere },
- // success: function (data1) {
- // if (data1.count == 1) {
- // option.data = data1.data;
- // table.render(option);
- // } else {
- // layer.alert(data1.code + data1.Message, { icon: 5 });
- // }
- // }, error: function () {
- // layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
- // }
- // });
- //}
- //#endregion
+ //鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].hmainid.toString();
+
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_ProcessExchangeBill/DeltetProcessExchangeBillByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ }
+
+ //棰勮
+ function get_view() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HProcessExchange', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+ //鎵撳嵃
+ function get_print() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HProcessExchange', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
//#region 鍒锋柊
function get_Refresh() {
--
Gitblit v1.9.1