From 93c387d8d0a14be06a134c77cc2e48d5d32c95bf Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 01 七月 2024 16:26:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/App_Data/MssqlReportData.cs                               |    3 
 WebTM/views/grf/送货单(A4纸).grf                                    |  447 ++++
 WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html |    3 
 WebTM/views/生产管理/异常反馈单/Sc_MESExecptFeedBackBillType.html        |   23 
 WebTM/views/质量管理/质量报表/QC_InspectionFormReport.html              |  364 +-
 WebTM/views/grf/白标打印.grf                                        |  670 ++++++
 WebTM/views/模治具管理/上模单/Sc_MouldUpperBillEdit_PDA.html            |    2 
 WebTM/views/grf/物料条码(七行纸大)_五云.grf                               |  243 ++
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html          |   55 
 WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html    |   15 
 WebTM/views/质量管理/工序检验单/QC_ProcessCheckBillList2.html            |    2 
 WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainBillList.html       |  120 +
 WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackSignBillMain.html           |    2 
 WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackHandleBillMain.html         |    2 
 WebTM/views/质量管理/安灯逐级呼叫规则/OA_AndengFlowRuleBillMain.html        |    4 
 WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList2.html         |    2 
 WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html                 |    2 
 WebTM/views/grf/送货单.grf                                         |  712 +++++++
 WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html     |    2 
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_CF.html           |   11 
 WebTM/views/车间管理/产线/MES_ProductionLinePackaging.html            |   14 
 WebTM/views/grf/包装单物料标识卡(网页版).grf                               |  366 +++
 WebTM/WebTM.csproj.user                                         |    2 
 WebTM/views/grf/包装单物料标识卡(网页版)1.grf                              |  471 ++++
 WebTM/views/grf/aaa.grf                                         |  335 +++
 WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackReceiveBillMain.html        |    2 
 WebTM/views/系统管理/用户管理/Xt_UserGroupListEdit.html                 |    7 
 WebTM/views/模治具管理/上模单/Sc_MouldLowerBillEdit_PDA.html            |    2 
 WebTM/views/生产管理/生产报表/Sc_QualityReportBillMonth.html            |   23 
 WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html                       |   24 
 WebTM/views/生产管理/质量汇报单/Sc_QualityReportBill.html                |   54 
 WebTM/views/生产管理/质量汇报单/Sc_QualityReportBillSumSave.html         |  830 ++++++++
 WebTM/views/质量管理/异常反馈/OA_ErrMsgBackSelfQuery.html               |  446 ++++
 WebTM/views/grf/组托单物料标识卡(网页版).grf                               |  457 ++++
 WebTM/views/设备管理/Sb_EquipMaintainBill_PDA.html                  |    7 
 WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBill_New.html   |  106 +
 WebTM/views/车间管理/产线/MES_ProductionLinePackagingList.html        |    2 
 WebTM/views/grf/送货单(标签纸).grf                                    |  195 +
 WebTM/WebTM.csproj                                              |   11 
 39 files changed, 5,760 insertions(+), 278 deletions(-)

diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs
index 7f9b0c5..3393272 100644
--- a/WebTM/App_Data/MssqlReportData.cs
+++ b/WebTM/App_Data/MssqlReportData.cs
@@ -21,6 +21,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;";//YL娴嬭瘯
     //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=192.168.0.245;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//甯呭▉
     //public const string SqlConnStr = "Data Source=192.168.1.250;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涔斾竴
     //public const string SqlConnStr = "Data Source=192.168.1.251;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涔斾竴娴嬭瘯
@@ -29,7 +30,7 @@
     //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=.;Initial Catalog=HX_LMESsys;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=192.168.2.10;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涔濊彵鐢垫満
+    //public const string SqlConnStr = "Data Source=192.168.2.10;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/WebTM.csproj b/WebTM/WebTM.csproj
index 3e8ea56..ce1f843 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -384,6 +384,7 @@
     <Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_QualityReportBillMonth.html" />
     <Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_QualityReportBillDay.html" />
     <Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatForm_BCP.html" />
+    <Content Include="views\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillSumSave.html" />
     <Content Include="views\绯荤粺绠＄悊\浼氳鏈熼棿\Xt_AccountPeriodAdd.html" />
     <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserRightQuery.html" />
     <Content Include="views\璁惧绠＄悊\璁惧鍋滄満鍗昞Sb_EquipStopBillList_PDA.html" />
@@ -401,6 +402,7 @@
     <Content Include="views\璐ㄩ噺绠＄悊\宸℃璁板綍鍗昞QC_PatrolProcCheckOtherBillList.html" />
     <Content Include="views\璐ㄩ噺绠＄悊\搴撳瓨妫�楠屽崟\QC_Add_Edit_StockCheckBill.html" />
     <Content Include="views\璐ㄩ噺绠＄悊\搴撳瓨妫�楠屽崟\QC_StockCheckBillList.html" />
+    <Content Include="views\璐ㄩ噺绠＄悊\寮傚父鍙嶉\OA_ErrMsgBackSelfQuery.html" />
     <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_InspectionFormReport.html" />
     <Content Include="views\璐ㄩ噺绠＄悊\杞﹂棿鑷鍗昞QC_Add_Edit_WorkSelfCheckBill.html" />
     <Content Include="views\璐ㄩ噺绠＄悊\杞﹂棿鑷鍗昞QC_WorkSelfCheckBillList.html" />
@@ -960,6 +962,15 @@
     <Content Include="views\grf\閿�鍞皟浠峰崟涓嶅惈绋�.grf" />
     <Content Include="views\grf\閿�鍞皟浠峰崟鍚◣锛堜粎闄愬惈绋庢墦鍗帮級.grf" />
     <Content Include="views\grf\閿�鍞��璐у崟娴嬭瘯1.grf" />
+    <Content Include="views\grf\aaa.grf" />
+    <Content Include="views\grf\鍖呰鍗曠墿鏂欐爣璇嗗崱%28缃戦〉鐗�%29.grf" />
+    <Content Include="views\grf\鍖呰鍗曠墿鏂欐爣璇嗗崱%28缃戦〉鐗�%291.grf" />
+    <Content Include="views\grf\鐗╂枡鏉＄爜%28涓冭绾稿ぇ%29_浜斾簯.grf" />
+    <Content Include="views\grf\鐧芥爣鎵撳嵃.grf" />
+    <Content Include="views\grf\缁勬墭鍗曠墿鏂欐爣璇嗗崱%28缃戦〉鐗�%29.grf" />
+    <Content Include="views\grf\閫佽揣鍗�%28A4绾�%29.grf" />
+    <Content Include="views\grf\閫佽揣鍗�%28鏍囩绾�%29.grf" />
+    <Content Include="views\grf\閫佽揣鍗�.grf" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 98df84b..2f0924a 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
     <ProjectView>ProjectFiles</ProjectView>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
diff --git a/WebTM/views/grf/aaa.grf b/WebTM/views/grf/aaa.grf
new file mode 100644
index 0000000..f46b672
--- /dev/null
+++ b/WebTM/views/grf/aaa.grf
@@ -0,0 +1,335 @@
+锘縊bject Report
+	Version='6.0.0.6'
+	Title='浣犵殑鎶ヨ〃鏍囬'
+	PrintAsDesignPaper=F
+	Object Font
+		Name='瀹嬩綋'
+		Size=105000,0
+		Weight=400
+		Charset=134
+	End
+	Object Printer
+		Size=256
+		Width=7
+		Height=5
+		LeftMargin=0
+		TopMargin=0
+		RightMargin=0
+		BottomMargin=0
+	End
+	Object DetailGrid
+		CenterView=T
+		ShowColLine=F
+		ShowRowLine=F
+		Object Border
+			Object Pen
+				Width=1.5
+			End
+		End
+		Object Recordset
+			Items Field
+				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='鏁伴噺'
+					Type=Currency
+				End
+				Item
+					Name='渚涘簲鍟嗕唬鐮�'
+				End
+				Item
+					Name='渚涘簲鍟�'
+				End
+				Item
+					Name='杞﹂棿'
+				End
+			End
+		End
+		Items Column
+			Item
+				Name='Column1'
+				Width=7.01146
+			End
+		End
+		Object ColumnContent
+			Height=4.78896
+			Items ColumnContentCell
+				Item
+					Column='Column1'
+					FreeCell=T
+					Items Control
+						Item
+							Type=FreeGrid
+							Name='FreeGrid1'
+							Left=0.105833
+							Top=0.15875
+							Object Border
+								Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
+							End
+							ColumnCount=4
+							RowCount=6
+							Items FreeGridColumn
+								Item[1]
+									Width=1.27
+								End
+								Item[2]
+									Width=2.11667
+								End
+								Item[3]
+									Width=1.08479
+								End
+								Item[4]
+									Width=2.2225
+								End
+							End
+							Items FreeGridRow
+								Item[1]
+									Height=0.846667
+								End
+								Item[2]
+									Height=0.65
+								End
+								Item[3]
+									Height=0.65
+								End
+								Item[4]
+									Height=0.65
+								End
+								Item[5]
+									Height=0.65
+								End
+								Item[6]
+									Height=0.899583
+								End
+							End
+							Items FreeGridCell
+								Item[1,1]
+									Object Font
+										Name='瀹嬩綋'
+										Size=82500,0
+										Weight=400
+										Charset=134
+									End
+									Text='鐢熶骇鏃ユ湡'
+								End
+								Item[1,2]
+									Object Font
+										Name='瀹嬩綋'
+										Size=82500,0
+										Bold=T
+										Charset=134
+									End
+									WordWrap=T
+									ShrinkFontToFit=T
+									Text='[#鏃ユ湡#]'
+								End
+								Item[1,3]
+									FreeCell=T
+									Items Control
+										Item
+											Type=Barcode
+											Name='Barcode4'
+											Width=3.20146
+											Height=1.40229
+											BarcodeType=QRCode
+											CaptionPosition=None
+											CheckSum=T
+											Text='[#鏉＄爜缂栧彿#]'
+											Object Font
+												Name='榛戜綋'
+												Size=67500,0
+												Weight=400
+												Charset=134
+											End
+										End
+										Item
+											Type=FieldBox
+											Name='FieldBox1'
+											Top=1.40229
+											Width=3.20146
+											Height=0.79375
+											Object Font
+												Name='瀹嬩綋'
+												Size=82500,0
+												Weight=400
+												Charset=134
+											End
+											ShrinkFontToFit=T
+											WordWrap=T
+											DataField='鏉＄爜缂栧彿'
+										End
+									End
+									ColSpan=2
+									RowSpan=3
+								End
+								Item[2,1]
+									Object Font
+										Name='瀹嬩綋'
+										Size=82500,0
+										Weight=400
+										Charset=134
+									End
+									Text='鎵规'
+								End
+								Item[2,2]
+									Object Font
+										Name='瀹嬩綋'
+										Size=82500,0
+										Bold=T
+										Charset=134
+									End
+									WordWrap=T
+									ShrinkFontToFit=T
+									Text='[#鎵规#]'
+								End
+								Item[3,1]
+									Object Font
+										Name='瀹嬩綋'
+										Size=82500,0
+										Weight=400
+										Charset=134
+									End
+									Text='浠ｇ爜'
+								End
+								Item[3,2]
+									Object Font
+										Name='瀹嬩綋'
+										Size=82500,0
+										Bold=T
+										Charset=134
+									End
+									WordWrap=T
+									ShrinkFontToFit=T
+									Text='[#鐗╂枡浠ｇ爜#]'
+								End
+								Item[4,1]
+									Object Font
+										Name='瀹嬩綋'
+										Size=82500,0
+										Weight=400
+										Charset=134
+									End
+									Text='瑙勬牸'
+								End
+								Item[4,2]
+									Object Font
+										Name='瀹嬩綋'
+										Size=82500,0
+										Bold=T
+										Charset=134
+									End
+									WordWrap=T
+									ShrinkFontToFit=T
+									Text='[#瑙勬牸鍨嬪彿#]'
+								End
+								Item[4,3]
+									Object Font
+										Name='瀹嬩綋'
+										Size=82500,0
+										Weight=400
+										Charset=134
+									End
+									Text='鏁伴噺'
+								End
+								Item[4,4]
+									Object Font
+										Name='瀹嬩綋'
+										Size=82500,0
+										Bold=T
+										Charset=134
+									End
+									WordWrap=T
+									Text='[#鏁伴噺#]'
+								End
+								Item[5,1]
+									Object Font
+										Name='瀹嬩綋'
+										Size=82500,0
+										Weight=400
+										Charset=134
+									End
+									Text='鍚嶇О'
+								End
+								Item[5,2]
+									Object Font
+										Name='瀹嬩綋'
+										Size=82500,0
+										Bold=T
+										Charset=134
+									End
+									WordWrap=T
+									ShrinkFontToFit=T
+									Text='[#鐗╂枡鍚嶇О#]'
+									ColSpan=3
+								End
+								Item[6,1]
+									Object Font
+										Name='瀹嬩綋'
+										Size=82500,0
+										Weight=400
+										Charset=134
+									End
+									Text='渚涘簲鍟�'
+								End
+								Item[6,2]
+									Object Font
+										Name='瀹嬩綋'
+										Size=82500,0
+										Bold=T
+										Charset=134
+									End
+									WordWrap=T
+									ShrinkFontToFit=T
+									Text='[#渚涘簲鍟嗕唬鐮�#][#渚涘簲鍟�#]'
+									ColSpan=3
+								End
+							End
+						End
+					End
+				End
+			End
+		End
+		Object ColumnTitle
+			Height=0
+			Items ColumnTitleCell
+				Item
+					GroupTitle=F
+					Column='Column1'
+					TextAlign=MiddleCenter
+					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/grf/\345\214\205\350\243\205\345\215\225\347\211\251\346\226\231\346\240\207\350\257\206\345\215\241\050\347\275\221\351\241\265\347\211\210\051.grf" "b/WebTM/views/grf/\345\214\205\350\243\205\345\215\225\347\211\251\346\226\231\346\240\207\350\257\206\345\215\241\050\347\275\221\351\241\265\347\211\210\051.grf"
new file mode 100644
index 0000000..bb517c3
--- /dev/null
+++ "b/WebTM/views/grf/\345\214\205\350\243\205\345\215\225\347\211\251\346\226\231\346\240\207\350\257\206\345\215\241\050\347\275\221\351\241\265\347\211\210\051.grf"
@@ -0,0 +1,366 @@
+锘縶
+	"Version":"6.5.0.0",
+	"Title":"鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�)",
+	"Font":{
+		"Name":"瀹嬩綋",
+		"Size":52500,
+		"Italic":true,
+		"Weight":400,
+		"Charset":134
+	},
+	"Printer":{
+		"Size":256,
+		"Width":10,
+		"Height":5,
+		"LeftMargin":0,
+		"TopMargin":0,
+		"RightMargin":0,
+		"BottomMargin":0
+	},
+	"DetailGrid":{
+		"CenterView":true,
+		"ShowColLine":false,
+		"ShowRowLine":false,
+		"Border":{
+			"Styles":"[]"
+		},
+		"Recordset":{
+			"Field":[
+				{
+					"Name":"鐗╂枡浠ｇ爜"
+				},
+				{
+					"Name":"浜у搧鍚嶇О"
+				},
+				{
+					"Name":"瑙勬牸鍨嬪彿"
+				},
+				{
+					"Name":"鏁伴噺"
+				},
+				{
+					"Name":"鏉＄爜缂栧彿"
+				},
+				{
+					"Name":"浜у搧鍨嬪彿"
+				},
+				{
+					"Name":"棰滆壊"
+				},
+				{
+					"Name":"鍖呰灏哄"
+				},
+				{
+					"Name":"鍑�閲�",
+					"Type":"Currency",
+					"Format":"0.#########;;#"
+				},
+				{
+					"Name":"姣涢噸",
+					"Type":"Currency",
+					"Format":"0.#########;;#"
+				},
+				{
+					"Name":"閿�鍞鍗曞彿"
+				},
+				{
+					"Name":"鎵瑰彿"
+				},
+				{
+					"Name":"杩涙枡鏃ユ湡",
+					"Type":"DateTime",
+					"Format":"yyyy/MM/dd"
+				},
+				{
+					"Name":"鍝佺墝"
+				},
+				{
+					"Name":"瀹㈡埛鍨嬪彿"
+				},
+				{
+					"Name":"鍘嬫満鍨嬪彿"
+				},
+				{
+					"Name":"鏃ユ湡",
+					"Type":"DateTime",
+					"Format":"yyyy/MM/dd"
+				},
+				{
+					"Name":"鐢熶骇浠诲姟鍗�"
+				},
+				{
+					"Name":"娴佽浆鍗＄紪鍙�"
+				},
+				{
+					"Name":"鑷畾涔夊瓧娈�"
+				},
+				{
+					"Name":"椤圭洰缂栧彿"
+				}
+			]
+		},
+		"Column":[
+			{
+				"Name":"Column3",
+				"Width":10.0013
+			}
+		],
+		"ColumnContent":{
+			"Height":5.00063,
+			"RowsPerPage":1,
+			"ColumnContentCell":[
+				{
+					"Column":"Column3",
+					"FreeCell":true,
+					"Control":[
+						{
+							"Type":"MemoBox",
+							"Name":"MemoBox25",
+							"Left":0.211667,
+							"Top":0.79375,
+							"Width":6.58813,
+							"Height":0.79375,
+							"Font":{
+								"Name":"榛戜綋",
+								"Bold":true,
+								"Charset":134
+							},
+							"ShrinkFontToFit":true,
+							"TextAlign":"MiddleCenter",
+							"CharSpacing":4,
+							"Text":"鏉窞鏂帿灏斿寘瑁呭崟鏍囪瘑鍗�"
+						},
+						{
+							"Type":"MemoBox",
+							"Name":"MemoBox2",
+							"Left":0.211667,
+							"Top":1.56104,
+							"Width":2.19604,
+							"Height":0.846667,
+							"Font":{
+								"Name":"瀹嬩綋",
+								"Bold":true,
+								"Charset":134
+							},
+							"TextAlign":"MiddleCenter",
+							"Text":"浜у搧鍚嶇О锛�"
+						},
+						{
+							"Type":"Barcode",
+							"Name":"Barcode6",
+							"Left":6.79979,
+							"Top":0.211667,
+							"Width":2.98979,
+							"Height":1.5875,
+							"BarcodeType":"QRCode",
+							"CaptionPosition":"None",
+							"Text":"[#鏉＄爜缂栧彿#]",
+							"Font":{
+								"Name":"瀹嬩綋",
+								"Bold":true,
+								"Charset":134
+							}
+						},
+						{
+							"Type":"MemoBox",
+							"Name":"MemoBox29",
+							"Left":2.40771,
+							"Top":1.56104,
+							"Width":4.39208,
+							"Height":0.846667,
+							"Font":{
+								"Name":"榛戜綋",
+								"Bold":true,
+								"Charset":134
+							},
+							"ShrinkFontToFit":true,
+							"TextAlign":"MiddleCenter",
+							"Text":"[#浜у搧鍚嶇О#]"
+						},
+						{
+							"Type":"MemoBox",
+							"Name":"MemoBox31",
+							"Left":0.211667,
+							"Top":2.38125,
+							"Width":1.98438,
+							"Height":0.846667,
+							"Font":{
+								"Name":"瀹嬩綋",
+								"Bold":true,
+								"Charset":134
+							},
+							"TextAlign":"MiddleCenter",
+							"Text":"鏁伴噺锛�"
+						},
+						{
+							"Type":"MemoBox",
+							"Name":"MemoBox35",
+							"Left":2.19604,
+							"Top":2.38125,
+							"Width":2.59292,
+							"Height":0.846667,
+							"Font":{
+								"Name":"榛戜綋",
+								"Bold":true,
+								"Charset":134
+							},
+							"ShrinkFontToFit":true,
+							"TextAlign":"MiddleCenter",
+							"Text":"[#鏁伴噺#]/Pcs"
+						},
+						{
+							"Type":"MemoBox",
+							"Name":"MemoBox41",
+							"Left":6.79979,
+							"Top":1.79917,
+							"Width":2.98979,
+							"Height":0.608542,
+							"Font":{
+								"Name":"榛戜綋",
+								"Bold":true,
+								"Charset":134
+							},
+							"ShrinkFontToFit":true,
+							"WordWrap":true,
+							"TextAlign":"MiddleCenter",
+							"Text":"[#鏉＄爜缂栧彿#]"
+						},
+						{
+							"Type":"PictureBox",
+							"Name":"PictureBox1",
+							"Left":0.211667,
+							"Top":0.211667,
+							"Width":2.77813,
+							"Height":0.582083,
+							"Picture":"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"
+						},
+						{
+							"Type":"FieldBox",
+							"Name":"FieldBox1",
+							"Left":0.211667,
+							"Top":3.22792,
+							"Width":4.57729,
+							"Height":0.661458,
+							"Font":{
+								"Name":"瀹嬩綋",
+								"Bold":true,
+								"Charset":134
+							},
+							"DataField":"鐢熶骇浠诲姟鍗�"
+						},
+						{
+							"Type":"MemoBox",
+							"Name":"MemoBox42",
+							"Left":4.78896,
+							"Top":2.38125,
+							"Width":2.01083,
+							"Height":0.846667,
+							"Font":{
+								"Name":"瀹嬩綋",
+								"Bold":true,
+								"Charset":134
+							},
+							"TextAlign":"MiddleCenter",
+							"Text":"鏃ユ湡锛�"
+						},
+						{
+							"Type":"MemoBox",
+							"Name":"MemoBox43",
+							"Left":6.79979,
+							"Top":2.38125,
+							"Width":2.98979,
+							"Height":0.846667,
+							"Font":{
+								"Name":"榛戜綋",
+								"Bold":true,
+								"Charset":134
+							},
+							"ShrinkFontToFit":true,
+							"TextAlign":"MiddleCenter",
+							"Text":"[#鏃ユ湡#]"
+						},
+						{
+							"Type":"FieldBox",
+							"Name":"FieldBox2",
+							"Left":4.78896,
+							"Top":3.22792,
+							"Width":5.00063,
+							"Height":0.661458,
+							"Font":{
+								"Name":"瀹嬩綋",
+								"Bold":true,
+								"Charset":134
+							},
+							"DataField":"娴佽浆鍗＄紪鍙�"
+						},
+						{
+							"Type":"FieldBox",
+							"Name":"FieldBox3",
+							"Left":0.211667,
+							"Top":3.86292,
+							"Width":4.57729,
+							"Height":0.846667,
+							"Font":{
+								"Name":"瀹嬩綋",
+								"Bold":true,
+								"Charset":134
+							},
+							"DataField":"鑷畾涔夊瓧娈�"
+						},
+						{
+							"Type":"FieldBox",
+							"Name":"FieldBox4",
+							"Left":6.58813,
+							"Top":3.86292,
+							"Width":3.20146,
+							"Height":0.846667,
+							"Font":{
+								"Name":"瀹嬩綋",
+								"Bold":true,
+								"Charset":134
+							},
+							"DataField":"椤圭洰缂栧彿"
+						},
+						{
+							"Type":"StaticBox",
+							"Name":"StaticBox1",
+							"Left":4.78896,
+							"Top":3.86292,
+							"Width":1.79917,
+							"Height":0.846667,
+							"Font":{
+								"Name":"瀹嬩綋",
+								"Bold":true,
+								"Charset":134
+							},
+							"Text":"ID锛�"
+						}
+					]
+				}
+			]
+		},
+		"ColumnTitle":{
+			"Height":0,
+			"ColumnTitleCell":[
+				{
+					"GroupTitle":false,
+					"Column":"Column3",
+					"Text":"Column1"
+				}
+			]
+		}
+	},
+	"ReportHeader":[
+		{
+			"Name":"ReportHeader1",
+			"Height":0,
+			"RepeatOnPage":true
+		}
+	],
+	"ReportFooter":[
+		{
+			"Name":"ReportFooter1",
+			"Height":0
+		}
+	]
+}
\ No newline at end of file
diff --git "a/WebTM/views/grf/\345\214\205\350\243\205\345\215\225\347\211\251\346\226\231\346\240\207\350\257\206\345\215\241\050\347\275\221\351\241\265\347\211\210\0511.grf" "b/WebTM/views/grf/\345\214\205\350\243\205\345\215\225\347\211\251\346\226\231\346\240\207\350\257\206\345\215\241\050\347\275\221\351\241\265\347\211\210\0511.grf"
new file mode 100644
index 0000000..9ac81ce
--- /dev/null
+++ "b/WebTM/views/grf/\345\214\205\350\243\205\345\215\225\347\211\251\346\226\231\346\240\207\350\257\206\345\215\241\050\347\275\221\351\241\265\347\211\210\0511.grf"
@@ -0,0 +1,471 @@
+锘縊bject Report
+	Version='6.0.0.6'
+	Title='鐢熶骇浠诲姟鍗�'
+	PrintAsDesignPaper=F
+	Object Font
+		Name='瀹嬩綋'
+		Size=135000,0
+		Weight=400
+		Charset=134
+	End
+	Object Printer
+		Size=256
+		Width=10
+		Height=5
+		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='鐗╂枡浠ｇ爜'
+				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=Currency
+					Format='0.#########;;#'
+				End
+				Item
+					Name='姣涢噸'
+					Type=Currency
+					Format='0.#########;;#'
+				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='鏃ユ湡'
+					Type=DateTime
+					Format='yyyy/MM/dd'
+				End
+				Item
+					Name='鐢熶骇浠诲姟鍗�'
+				End
+				Item
+					Name='娴佽浆鍗＄紪鍙�'
+				End
+				Item
+					Name='鑷畾涔夊瓧娈�'
+				End
+				Item
+					Name='椤圭洰缂栧彿'
+				End
+			End
+		End
+		Items Column
+			Item
+				Name='Column3'
+				Width=10.0013
+			End
+		End
+		Object ColumnContent
+			Height=5.00063
+			RowsPerPage=1
+			Items ColumnContentCell
+				Item
+					Column='Column3'
+					FreeCell=T
+					Items Control
+						Item
+							Type=MemoBox
+							Name='MemoBox25'
+							Left=0.211667
+							Top=0.79375
+							Width=6.58813
+							Height=0.79375
+							Object Font
+								Name='榛戜綋'
+								Bold=T
+								Charset=134
+							End
+							ShrinkFontToFit=T
+							TextAlign=MiddleCenter
+							CharSpacing=4
+							Text='鏉窞鏂帿灏斿寘瑁呭崟鏍囪瘑鍗�'
+						End
+						Item
+							Type=MemoBox
+							Name='MemoBox2'
+							Left=0.211667
+							Top=1.56104
+							Width=2.19604
+							Height=0.846667
+							Object Font
+								Name='瀹嬩綋'
+								Bold=T
+								Charset=134
+							End
+							TextAlign=MiddleCenter
+							Text='浜у搧鍚嶇О锛�'
+						End
+						Item
+							Type=Barcode
+							Name='Barcode6'
+							Left=6.79979
+							Top=0.211667
+							Width=2.98979
+							Height=1.5875
+							BarcodeType=QRCode
+							CaptionPosition=None
+							Text='[#鏉＄爜缂栧彿#]'
+							Object Font
+								Name='瀹嬩綋'
+								Bold=T
+								Charset=134
+							End
+						End
+						Item
+							Type=MemoBox
+							Name='MemoBox29'
+							Left=2.40771
+							Top=1.56104
+							Width=4.39208
+							Height=0.846667
+							Object Font
+								Name='榛戜綋'
+								Bold=T
+								Charset=134
+							End
+							ShrinkFontToFit=T
+							TextAlign=MiddleCenter
+							Text='[#浜у搧鍚嶇О#]'
+						End
+						Item
+							Type=MemoBox
+							Name='MemoBox31'
+							Left=0.211667
+							Top=2.38125
+							Width=1.98438
+							Height=0.846667
+							Object Font
+								Name='瀹嬩綋'
+								Bold=T
+								Charset=134
+							End
+							TextAlign=MiddleCenter
+							Text='鏁伴噺锛�'
+						End
+						Item
+							Type=MemoBox
+							Name='MemoBox35'
+							Left=2.19604
+							Top=2.38125
+							Width=2.59292
+							Height=0.846667
+							Object Font
+								Name='榛戜綋'
+								Bold=T
+								Charset=134
+							End
+							ShrinkFontToFit=T
+							TextAlign=MiddleCenter
+							Text='[#鏁伴噺#]/Pcs'
+						End
+						Item
+							Type=MemoBox
+							Name='MemoBox41'
+							Left=6.79979
+							Top=1.79917
+							Width=2.98979
+							Height=0.608542
+							Object Font
+								Name='榛戜綋'
+								Bold=T
+								Charset=134
+							End
+							ShrinkFontToFit=T
+							WordWrap=T
+							TextAlign=MiddleCenter
+							Text='[#鏉＄爜缂栧彿#]'
+						End
+						Item
+							Type=PictureBox
+							Name='PictureBox1'
+							Left=0.211667
+							Top=0.211667
+							Width=2.77813
+							Height=0.582083
+							Picture=-10023
+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
+						End
+						Item
+							Type=FieldBox
+							Name='FieldBox1'
+							Left=0.211667
+							Top=3.22792
+							Width=4.57729
+							Height=0.661458
+							Object Font
+								Name='瀹嬩綋'
+								Bold=T
+								Charset=134
+							End
+							DataField='鐢熶骇浠诲姟鍗�'
+						End
+						Item
+							Type=MemoBox
+							Name='MemoBox42'
+							Left=4.78896
+							Top=2.38125
+							Width=2.01083
+							Height=0.846667
+							Object Font
+								Name='瀹嬩綋'
+								Bold=T
+								Charset=134
+							End
+							TextAlign=MiddleCenter
+							Text='鏃ユ湡锛�'
+						End
+						Item
+							Type=MemoBox
+							Name='MemoBox43'
+							Left=6.79979
+							Top=2.38125
+							Width=2.98979
+							Height=0.846667
+							Object Font
+								Name='榛戜綋'
+								Bold=T
+								Charset=134
+							End
+							ShrinkFontToFit=T
+							TextAlign=MiddleCenter
+							Text='[#鏃ユ湡#]'
+						End
+						Item
+							Type=FieldBox
+							Name='FieldBox2'
+							Left=4.78896
+							Top=3.22792
+							Width=5.00063
+							Height=0.661458
+							Object Font
+								Name='瀹嬩綋'
+								Bold=T
+								Charset=134
+							End
+							DataField='娴佽浆鍗＄紪鍙�'
+						End
+						Item
+							Type=FieldBox
+							Name='FieldBox3'
+							Left=0.211667
+							Top=3.86292
+							Width=4.57729
+							Height=0.846667
+							Object Font
+								Name='瀹嬩綋'
+								Bold=T
+								Charset=134
+							End
+							DataField='鑷畾涔夊瓧娈�'
+						End
+						Item
+							Type=FieldBox
+							Name='FieldBox4'
+							Left=6.58813
+							Top=3.86292
+							Width=3.20146
+							Height=0.846667
+							Object Font
+								Name='瀹嬩綋'
+								Bold=T
+								Charset=134
+							End
+							DataField='椤圭洰缂栧彿'
+						End
+						Item
+							Type=StaticBox
+							Name='StaticBox1'
+							Left=4.78896
+							Top=3.86292
+							Width=1.79917
+							Height=0.846667
+							Object Font
+								Name='瀹嬩綋'
+								Bold=T
+								Charset=134
+							End
+							Text='ID锛�'
+						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/grf/\347\211\251\346\226\231\346\235\241\347\240\201\050\344\270\203\350\241\214\347\272\270\345\244\247\051_\344\272\224\344\272\221.grf" "b/WebTM/views/grf/\347\211\251\346\226\231\346\235\241\347\240\201\050\344\270\203\350\241\214\347\272\270\345\244\247\051_\344\272\224\344\272\221.grf"
new file mode 100644
index 0000000..cd67c5d
--- /dev/null
+++ "b/WebTM/views/grf/\347\211\251\346\226\231\346\235\241\347\240\201\050\344\270\203\350\241\214\347\272\270\345\244\247\051_\344\272\224\344\272\221.grf"
@@ -0,0 +1,243 @@
+锘縊bject Report
+	Version='6.0.0.6'
+	Title='浣犵殑鎶ヨ〃鏍囬'
+	PrintAsDesignPaper=F
+	Object Font
+		Name='瀹嬩綋'
+		Size=105000,0
+		Weight=400
+		Charset=134
+	End
+	Object Printer
+		Size=256
+		Width=9.5
+		Height=5
+		LeftMargin=0
+		TopMargin=0.1
+		RightMargin=0
+		BottomMargin=0
+	End
+	Object DetailGrid
+		CenterView=T
+		ShowColLine=F
+		ShowRowLine=F
+		Object Border
+			Object Pen
+				Width=1.5
+			End
+		End
+		Object Recordset
+			Items Field
+				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='鏁伴噺'
+					Type=Currency
+				End
+				Item
+					Name='渚涘簲鍟嗕唬鐮�'
+				End
+				Item
+					Name='渚涘簲鍟�'
+				End
+				Item
+					Name='杞﹂棿'
+				End
+				Item
+					Name='鍝佺暘'
+				End
+				Item
+					Name='杈呭姪灞炴�у悕绉�'
+				End
+				Item
+					Name='璁￠噺鍗曚綅鍚嶇О'
+				End
+				Item
+					Name='HPinfanBarCode'
+				End
+				Item
+					Name='璁″垝璺熻釜鍗曞彿'
+				End
+			End
+		End
+		Items Column
+			Item
+				Name='Column1'
+				Width=9.33979
+			End
+		End
+		Object ColumnContent
+			Height=4.78896
+			Items ColumnContentCell
+				Item
+					Column='Column1'
+					FreeCell=T
+					CanShrink=T
+					Items Control
+						Item
+							Type=Barcode
+							Name='Barcode1'
+							Left=6.24417
+							Top=1.95792
+							Width=3.81
+							Height=1.98438
+							BarcodeType=QRCode
+							CaptionPosition=None
+							Text='[#鏉＄爜缂栧彿#]'
+						End
+						Item
+							Type=FreeGrid
+							Name='FreeGrid2'
+							Left=0.0529167
+							Top=0.0529167
+							Object Border
+								Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
+							End
+							ColumnCount=3
+							RowCount=8
+							Items FreeGridColumn
+								Item[1]
+									Width=2.88396
+								End
+								Item[2]
+									Width=4.1275
+								End
+								Item[3]
+									Width=2.16958
+								End
+							End
+							Items FreeGridRow
+							End
+							Items FreeGridCell
+								Item[1,1]
+									WordWrap=T
+									TextAlign=MiddleCenter
+									Text='渚涘簲鍟�*锛�'
+								End
+								Item[1,2]
+									WordWrap=T
+									TextAlign=MiddleCenter
+									Text='[#渚涘簲鍟�#]'
+									ColSpan=2
+								End
+								Item[2,1]
+									WordWrap=T
+									TextAlign=MiddleCenter
+									Text='璁″垝璺熻釜鍗曞彿锛�'
+								End
+								Item[2,2]
+									WordWrap=T
+									TextAlign=MiddleCenter
+									Text='[#璁″垝璺熻釜鍗曞彿#]'
+									ColSpan=2
+								End
+								Item[3,1]
+									WordWrap=T
+									TextAlign=MiddleCenter
+									Text='鐗╂枡浠ｇ爜锛�'
+								End
+								Item[3,2]
+									WordWrap=T
+									TextAlign=MiddleCenter
+									Text='[#鐗╂枡浠ｇ爜#]'
+									ColSpan=2
+								End
+								Item[4,1]
+									WordWrap=T
+									TextAlign=MiddleCenter
+									Text='鐗╂枡鍚嶇О锛�'
+								End
+								Item[4,2]
+									WordWrap=T
+									TextAlign=MiddleCenter
+									Text='[#鐗╂枡鍚嶇О#]'
+								End
+								Item[4,3]
+									RowSpan=4
+								End
+								Item[5,1]
+									WordWrap=T
+									TextAlign=MiddleCenter
+									Text='瑙勬牸鍨嬪彿锛�'
+								End
+								Item[5,2]
+									WordWrap=T
+									TextAlign=MiddleCenter
+									Text='[#瑙勬牸鍨嬪彿#]'
+								End
+								Item[6,1]
+									WordWrap=T
+									TextAlign=MiddleCenter
+									Text='鏁伴噺锛�'
+								End
+								Item[6,2]
+									WordWrap=T
+									TextAlign=MiddleCenter
+									Text='[#鏁伴噺#]'
+								End
+								Item[7,1]
+									TextAlign=MiddleCenter
+									Text='鏃ユ湡锛�'
+								End
+								Item[7,2]
+									WordWrap=T
+									TextAlign=MiddleCenter
+									Text='[#杩涙枡鏃ユ湡#]'
+								End
+								Item[8,1]
+									TextAlign=MiddleCenter
+									Text='澶囨敞锛�'
+								End
+								Item[8,2]
+									ColSpan=2
+								End
+							End
+						End
+					End
+				End
+			End
+		End
+		Object ColumnTitle
+			Height=0
+			Items ColumnTitleCell
+				Item
+					GroupTitle=F
+					Column='Column1'
+					TextAlign=MiddleCenter
+					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/grf/\347\231\275\346\240\207\346\211\223\345\215\260.grf" "b/WebTM/views/grf/\347\231\275\346\240\207\346\211\223\345\215\260.grf"
new file mode 100644
index 0000000..f59728a
--- /dev/null
+++ "b/WebTM/views/grf/\347\231\275\346\240\207\346\211\223\345\215\260.grf"
@@ -0,0 +1,670 @@
+锘縶
+	"Version":"6.5.0.0",
+	"Font":{
+		"Name":"瀹嬩綋",
+		"Size":105000,
+		"Weight":400,
+		"Charset":134
+	},
+	"Printer":{
+		"Size":256,
+		"Width":50,
+		"Height":35,
+		"LeftMargin":0,
+		"TopMargin":0,
+		"RightMargin":0,
+		"BottomMargin":0
+	},
+	"DetailGrid":{
+		"Recordset":{
+			"Field":[
+				{
+					"Name":"MFGPartNumber"
+				},
+				{
+					"Name":"CountryofOrigin"
+				},
+				{
+					"Name":"Quantity"
+				},
+				{
+					"Name":"GrossWeight"
+				},
+				{
+					"Name":"PartName"
+				},
+				{
+					"Name":"ContentLabelID"
+				},
+				{
+					"Name":"Supplier"
+				},
+				{
+					"Name":"MFGDate"
+				},
+				{
+					"Name":"ExpireDate"
+				},
+				{
+					"Name":"TeslaLotCode"
+				},
+				{
+					"Name":"SupplierLotCode"
+				},
+				{
+					"Name":"BBM"
+				},
+				{
+					"Name":"Field1"
+				},
+				{
+					"Name":"HSupPartName"
+				},
+				{
+					"Name":"HBarCode_White"
+				}
+			]
+		},
+		"ColumnContent":{
+		},
+		"ColumnTitle":{
+		}
+	},
+	"Parameter":[
+		{
+			"Name":"MFGPartNumber",
+			"Format":"MFGPartNumber"
+		}
+	],
+	"ReportHeader":[
+		{
+			"Name":"ReportHeader1",
+			"Height":31.406,
+			"Control":[
+				{
+					"Type":"FreeGrid",
+					"Name":"FreeGrid2",
+					"Top":0.291042,
+					"Border":{
+						"Styles":"[DrawLeft|DrawTop|DrawRight|DrawBottom]"
+					},
+					"ColumnCount":9,
+					"FreeGridColumn":[
+						{
+							"index":1,
+							"Width":0.873125
+						},
+						{
+							"index":2,
+							"Width":0.608542
+						},
+						{
+							"index":3,
+							"Width":1.00542
+						},
+						{
+							"index":4,
+							"Width":1.19063
+						},
+						{
+							"index":5,
+							"Width":1.48167
+						},
+						{
+							"index":6,
+							"Width":1.50813
+						},
+						{
+							"index":7,
+							"Width":1.56104
+						},
+						{
+							"index":8,
+							"Width":0.978958
+						},
+						{
+							"index":9,
+							"Width":0.873125
+						}
+					],
+					"FreeGridRow":[
+						{
+							"index":1,
+							"Height":2.48708
+						},
+						{
+							"index":2,
+							"Height":0.635
+						},
+						{
+							"index":3,
+							"Height":3.59833
+						},
+						{
+							"index":4,
+							"Height":1.85208
+						},
+						{
+							"index":5,
+							"Height":6.61458
+						}
+					],
+					"FreeGridCell":[
+						{
+							"row":1,
+							"col":1,
+							"FreeCell":true,
+							"Control":[
+								{
+									"Type":"Barcode",
+									"Name":"Barcode4",
+									"Left":0.105833,
+									"Top":0.132292,
+									"Width":2.30188,
+									"Height":2.2225,
+									"BarcodeType":"DataMatrix",
+									"CaptionPosition":"None",
+									"Text":"[#HBarCode_White#]"
+								}
+							],
+							"ColSpan":3
+						},
+						{
+							"row":1,
+							"col":4,
+							"FreeCell":true,
+							"Control":[
+								{
+									"Type":"MemoBox",
+									"Name":"MemoBox18",
+									"Left":0.608542,
+									"Width":0.582083,
+									"Height":1.8,
+									"Font":{
+										"Name":"Arial",
+										"Size":90000,
+										"Bold":true
+									},
+									"TextAlign":"TopLeft",
+									"TextOrientation":"U2DR2L1",
+									"Text":"Supplier"
+								},
+								{
+									"Type":"FieldBox",
+									"Name":"FieldBox20",
+									"Left":0.608542,
+									"Top":1.79917,
+									"Width":0.58,
+									"Height":4.39,
+									"Font":{
+										"Name":"Arial",
+										"Size":90000,
+										"Bold":true
+									},
+									"TextAlign":"TopLeft",
+									"TextOrientation":"U2DR2L1",
+									"DataField":"Supplier"
+								},
+								{
+									"Type":"FieldBox",
+									"Name":"FieldBox21",
+									"Width":0.61,
+									"Height":6.00604,
+									"Font":{
+										"Name":"Arial",
+										"Size":90000,
+										"Italic":true,
+										"Weight":400
+									},
+									"TextAlign":"TopLeft",
+									"TextOrientation":"U2DR2L1",
+									"DataField":"HSupPartName"
+								}
+							],
+							"RowSpan":3
+						},
+						{
+							"row":1,
+							"col":5,
+							"FreeCell":true,
+							"Control":[
+								{
+									"Type":"MemoBox",
+									"Name":"MemoBox19",
+									"Left":0.873125,
+									"Width":0.396875,
+									"Height":5.3975,
+									"Font":{
+										"Name":"Arial",
+										"Size":90000,
+										"Bold":true
+									},
+									"TextAlign":"TopLeft",
+									"TextOrientation":"U2DR2L1",
+									"Text":"Content Label ID:"
+								},
+								{
+									"Type":"FieldBox",
+									"Name":"FieldBox22",
+									"Left":0.211667,
+									"Width":0.79,
+									"Height":6.19,
+									"Font":{
+										"Name":"Arial",
+										"Size":90000,
+										"Bold":true
+									},
+									"TextAlign":"TopLeft",
+									"TextOrientation":"U2DR2L1",
+									"DataField":"ContentLabelID"
+								}
+							],
+							"RowSpan":3
+						},
+						{
+							"row":1,
+							"col":6,
+							"FreeCell":true,
+							"Control":[
+								{
+									"Type":"MemoBox",
+									"Name":"MemoBox20",
+									"Left":0.873125,
+									"Top":0.0264583,
+									"Width":0.608542,
+									"Height":6.00604,
+									"Font":{
+										"Name":"Arial",
+										"Size":90000,
+										"Bold":true
+									},
+									"TextAlign":"TopLeft",
+									"TextOrientation":"U2DR2L1",
+									"Text":"Part Name"
+								},
+								{
+									"Type":"FieldBox",
+									"Name":"FieldBox23",
+									"Left":0.0529167,
+									"Top":0.0264583,
+									"Width":0.79375,
+									"Height":6.19,
+									"Font":{
+										"Name":"Arial",
+										"Size":90000,
+										"Italic":true,
+										"Weight":400
+									},
+									"TextAlign":"TopLeft",
+									"TextOrientation":"U2DR2L1",
+									"DataField":"PartName"
+								}
+							],
+							"RowSpan":3
+						},
+						{
+							"row":1,
+							"col":7,
+							"FreeCell":true,
+							"Control":[
+								{
+									"Type":"FieldBox",
+									"Name":"FieldBox24",
+									"Left":0.0264583,
+									"Top":-0.0264583,
+									"Width":1.48,
+									"Height":5.82083,
+									"Font":{
+										"Name":"Arial",
+										"Size":360000,
+										"Bold":true
+									},
+									"TextAlign":"MiddleCenter",
+									"TextOrientation":"U2DR2L1",
+									"DataField":"MFGPartNumber"
+								}
+							],
+							"RowSpan":3
+						},
+						{
+							"row":1,
+							"col":8,
+							"FreeCell":true,
+							"Control":[
+								{
+									"Type":"MemoBox",
+									"Name":"MemoBox22",
+									"Left":0.449792,
+									"Top":-0.0264583,
+									"Width":0.5,
+									"Height":2.96333,
+									"Font":{
+										"Name":"Arial",
+										"Size":90000,
+										"Bold":true
+									},
+									"TextAlign":"TopLeft",
+									"TextOrientation":"U2DR2L1",
+									"Text":"Quantity"
+								},
+								{
+									"Type":"FieldBox",
+									"Name":"FieldBox26",
+									"Top":-0.0264583,
+									"Width":0.5,
+									"Height":2.16958,
+									"Font":{
+										"Name":"Arial",
+										"Size":90000,
+										"Bold":true
+									},
+									"TextAlign":"MiddleCenter",
+									"TextOrientation":"U2DR2L1",
+									"DataField":"Quantity"
+								},
+								{
+									"Type":"MemoBox",
+									"Name":"MemoBox23",
+									"Left":0.0264583,
+									"Top":2.35479,
+									"Width":0.4,
+									"Height":0.79,
+									"Font":{
+										"Name":"Arial",
+										"Size":90000,
+										"Bold":true
+									},
+									"TextAlign":"TopLeft",
+									"TextOrientation":"U2DR2L1",
+									"Text":"EA"
+								}
+							],
+							"RowSpan":2
+						},
+						{
+							"row":1,
+							"col":9,
+							"FreeCell":true,
+							"Control":[
+								{
+									"Type":"MemoBox",
+									"Name":"MemoBox21",
+									"Left":0.370417,
+									"Top":0.0264583,
+									"Width":0.48,
+									"Height":3.2,
+									"Font":{
+										"Name":"Arial",
+										"Size":90000,
+										"Bold":true
+									},
+									"TextAlign":"TopLeft",
+									"TextOrientation":"U2DR2L1",
+									"Text":"MFG Part Number"
+								},
+								{
+									"Type":"FieldBox",
+									"Name":"FieldBox25",
+									"Left":-0.0264583,
+									"Top":-0.0264583,
+									"Width":0.238125,
+									"Height":2.96333,
+									"Font":{
+										"Name":"Arial",
+										"Size":90000,
+										"Bold":true
+									},
+									"TextAlign":"MiddleCenter",
+									"TextOrientation":"U2DR2L1",
+									"DataField":"MFGPartNumber"
+								}
+							],
+							"RowSpan":2
+						},
+						{
+							"row":2,
+							"col":1,
+							"FreeCell":true,
+							"Control":[
+								{
+									"Type":"MemoBox",
+									"Name":"MemoBox14",
+									"Width":0.608542,
+									"Height":2.59292,
+									"Font":{
+										"Name":"Arial",
+										"Size":82500,
+										"Weight":400
+									},
+									"TextAlign":"TopLeft",
+									"TextOrientation":"U2DR2L1",
+									"Text":"Supplier Lot Code:\r"
+								},
+								{
+									"Type":"FieldBox",
+									"Name":"FieldBox18",
+									"Left":0.0529167,
+									"Width":0.264583,
+									"Height":3.4925,
+									"Font":{
+										"Name":"Arial",
+										"Size":82500,
+										"Weight":400
+									},
+									"TextAlign":"TopLeft",
+									"TextOrientation":"U2DR2L1",
+									"DataField":"SupplierLotCode"
+								}
+							],
+							"RowSpan":2
+						},
+						{
+							"row":2,
+							"col":2,
+							"FreeCell":true,
+							"Control":[
+								{
+									"Type":"MemoBox",
+									"Name":"MemoBox15",
+									"Left":-0.3175,
+									"Width":0.291042,
+									"Height":2.99,
+									"Font":{
+										"Name":"Arial",
+										"Size":82500,
+										"Weight":400
+									},
+									"TextAlign":"TopLeft",
+									"TextOrientation":"U2DR2L1",
+									"Text":"Tesla Lot Code:\r"
+								}
+							],
+							"RowSpan":2
+						},
+						{
+							"row":2,
+							"col":3,
+							"FreeCell":true,
+							"Control":[
+								{
+									"Type":"MemoBox",
+									"Name":"MemoBox16",
+									"Anchor":"[Left|Bottom]",
+									"Left":0.132292,
+									"Top":-0.0264583,
+									"Width":0.846667,
+									"Height":1.74625,
+									"Font":{
+										"Name":"Arial",
+										"Size":82500,
+										"Weight":400
+									},
+									"TextAlign":"TopLeft",
+									"TextOrientation":"U2DR2L1",
+									"Text":"MFG Date:\r"
+								},
+								{
+									"Type":"FieldBox",
+									"Name":"FieldBox19",
+									"Left":0.47625,
+									"Top":1.66688,
+									"Width":0.582083,
+									"Height":2.48708,
+									"Font":{
+										"Name":"Arial",
+										"Size":82500,
+										"Weight":400
+									},
+									"TextAlign":"TopLeft",
+									"TextOrientation":"U2DR2L1",
+									"DataField":"MFGDate"
+								},
+								{
+									"Type":"MemoBox",
+									"Name":"MemoBox17",
+									"Width":0.4,
+									"Height":1.8,
+									"Font":{
+										"Name":"Arial",
+										"Size":82500,
+										"Weight":400
+									},
+									"TextAlign":"TopLeft",
+									"TextOrientation":"U2DR2L1",
+									"Text":"Expire Date:"
+								}
+							],
+							"RowSpan":2
+						},
+						{
+							"row":3,
+							"col":8,
+							"FreeCell":true,
+							"Control":[
+								{
+									"Type":"MemoBox",
+									"Name":"MemoBox24",
+									"Left":0.449792,
+									"Top":0.0264583,
+									"Width":0.5,
+									"Height":2.96,
+									"Font":{
+										"Name":"Arial",
+										"Size":90000,
+										"Bold":true
+									},
+									"TextAlign":"TopLeft",
+									"TextOrientation":"U2DR2L1",
+									"Text":"Gross Weight"
+								},
+								{
+									"Type":"FieldBox",
+									"Name":"FieldBox27",
+									"Left":0.0264583,
+									"Top":0.0264583,
+									"Width":0.4,
+									"Height":2.2,
+									"Font":{
+										"Name":"Arial",
+										"Size":90000,
+										"Bold":true
+									},
+									"TextAlign":"MiddleCenter",
+									"TextOrientation":"U2DR2L1",
+									"DataField":"GrossWeight"
+								},
+								{
+									"Type":"MemoBox",
+									"Name":"MemoBox25",
+									"Top":2.32833,
+									"Width":0.61,
+									"Height":0.79,
+									"Font":{
+										"Name":"Arial",
+										"Size":90000,
+										"Bold":true
+									},
+									"TextAlign":"TopLeft",
+									"TextOrientation":"U2DR2L1",
+									"Text":"KG"
+								}
+							]
+						},
+						{
+							"row":3,
+							"col":9,
+							"FreeCell":true,
+							"Control":[
+								{
+									"Type":"MemoBox",
+									"Name":"MemoBox26",
+									"Left":0.370417,
+									"Width":0.48,
+									"Height":2.99,
+									"Font":{
+										"Name":"Arial",
+										"Size":90000,
+										"Bold":true
+									},
+									"TextAlign":"TopLeft",
+									"TextOrientation":"U2DR2L1",
+									"Text":"Country of Origin"
+								},
+								{
+									"Type":"FieldBox",
+									"Name":"FieldBox28",
+									"Width":0.48,
+									"Height":2.94,
+									"Font":{
+										"Name":"Arial",
+										"Size":90000,
+										"Bold":true
+									},
+									"TextAlign":"MiddleCenter",
+									"TextOrientation":"U2DR2L1",
+									"DataField":"CountryofOrigin"
+								}
+							]
+						},
+						{
+							"row":4,
+							"col":1,
+							"FreeCell":true,
+							"Control":[
+								{
+									"Type":"Barcode",
+									"Name":"Barcode3",
+									"Left":1.64042,
+									"Top":0.132292,
+									"Width":8.44021,
+									"Height":8.20208,
+									"BarcodeType":"QRCode",
+									"CaptionPosition":"None",
+									"Text":"[#ContentLabelID#]"
+								},
+								{
+									"Type":"FieldBox",
+									"Name":"FieldBox17",
+									"Left":0.0264583,
+									"Top":-0.0264583,
+									"Width":1.5875,
+									"Height":8.49313,
+									"Font":{
+										"Name":"Arial",
+										"Size":360000,
+										"Bold":true
+									},
+									"TextAlign":"MiddleCenter",
+									"TextOrientation":"U2DR2L1",
+									"DataField":"BBM"
+								}
+							],
+							"ColSpan":9,
+							"RowSpan":2
+						}
+					]
+				}
+			]
+		}
+	]
+}
\ No newline at end of file
diff --git "a/WebTM/views/grf/\347\273\204\346\211\230\345\215\225\347\211\251\346\226\231\346\240\207\350\257\206\345\215\241\050\347\275\221\351\241\265\347\211\210\051.grf" "b/WebTM/views/grf/\347\273\204\346\211\230\345\215\225\347\211\251\346\226\231\346\240\207\350\257\206\345\215\241\050\347\275\221\351\241\265\347\211\210\051.grf"
new file mode 100644
index 0000000..e7cd0b2
--- /dev/null
+++ "b/WebTM/views/grf/\347\273\204\346\211\230\345\215\225\347\211\251\346\226\231\346\240\207\350\257\206\345\215\241\050\347\275\221\351\241\265\347\211\210\051.grf"
@@ -0,0 +1,457 @@
+锘縊bject Report
+	Version='6.0.0.6'
+	Title='鐢熶骇浠诲姟鍗�'
+	PrintAsDesignPaper=F
+	Object Font
+		Name='瀹嬩綋'
+		Size=135000,0
+		Weight=400
+		Charset=134
+	End
+	Object Printer
+		Size=256
+		Width=10
+		Height=5
+		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='鐗╂枡浠ｇ爜'
+				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=Currency
+					Format='0.#########;;#'
+				End
+				Item
+					Name='姣涢噸'
+					Type=Currency
+					Format='0.#########;;#'
+				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='鏃ユ湡'
+					Type=DateTime
+					Format='yyyy/MM/dd'
+				End
+				Item
+					Name='鐢熶骇浠诲姟鍗�'
+				End
+				Item
+					Name='娴佽浆鍗＄紪鍙�'
+				End
+				Item
+					Name='鑷畾涔夊瓧娈�'
+				End
+				Item
+					Name='椤圭洰缂栧彿'
+				End
+			End
+		End
+		Items Column
+			Item
+				Name='Column3'
+				Width=10.0013
+			End
+		End
+		Object ColumnContent
+			Height=5.00063
+			RowsPerPage=1
+			Items ColumnContentCell
+				Item
+					Column='Column3'
+					FreeCell=T
+					Items Control
+						Item
+							Type=MemoBox
+							Name='MemoBox25'
+							Left=0.211667
+							Top=0.79375
+							Width=6.58813
+							Height=1.40229
+							Object Font
+								Name='榛戜綋'
+								Bold=T
+								Charset=134
+							End
+							ShrinkFontToFit=T
+							TextAlign=MiddleCenter
+							CharSpacing=4
+							Text='鏉窞鏂帿灏斾富鎵樺崟鏍囪瘑鍗�'
+						End
+						Item
+							Type=MemoBox
+							Name='MemoBox2'
+							Left=0.211667
+							Top=2.80458
+							Width=2.19604
+							Height=0.79375
+							Object Font
+								Name='瀹嬩綋'
+								Bold=T
+								Charset=134
+							End
+							TextAlign=MiddleCenter
+							Text='浜у搧鍚嶇О锛�'
+						End
+						Item
+							Type=Barcode
+							Name='Barcode6'
+							Left=6.79979
+							Top=0.211667
+							Width=2.98979
+							Height=1.5875
+							BarcodeType=QRCode
+							CaptionPosition=None
+							Text='[#鏉＄爜缂栧彿#]'
+							Object Font
+								Name='瀹嬩綋'
+								Bold=T
+								Charset=134
+							End
+						End
+						Item
+							Type=MemoBox
+							Name='MemoBox29'
+							Left=2.01083
+							Top=2.80458
+							Width=3.20146
+							Height=0.79375
+							Object Font
+								Name='榛戜綋'
+								Bold=T
+								Charset=134
+							End
+							ShrinkFontToFit=T
+							TextAlign=MiddleCenter
+							Text='[#浜у搧鍚嶇О#]'
+						End
+						Item
+							Type=MemoBox
+							Name='MemoBox31'
+							Left=0.396875
+							Top=3.59833
+							Width=2.01083
+							Height=0.79375
+							Object Font
+								Name='瀹嬩綋'
+								Bold=T
+								Charset=134
+							End
+							Text='鏁伴噺锛�'
+						End
+						Item
+							Type=MemoBox
+							Name='MemoBox35'
+							Left=2.40771
+							Top=3.59833
+							Width=2.59292
+							Height=0.79375
+							Object Font
+								Name='榛戜綋'
+								Bold=T
+								Charset=134
+							End
+							ShrinkFontToFit=T
+							Text='[#鏁伴噺#]/Pcs'
+						End
+						Item
+							Type=MemoBox
+							Name='MemoBox41'
+							Left=7.01146
+							Top=2.19604
+							Width=2.77813
+							Height=0.608542
+							Object Font
+								Name='榛戜綋'
+								Bold=T
+								Charset=134
+							End
+							ShrinkFontToFit=T
+							WordWrap=T
+							TextAlign=MiddleCenter
+							Text='[#鏉＄爜缂栧彿#]'
+						End
+						Item
+							Type=PictureBox
+							Name='PictureBox1'
+							Left=0.211667
+							Top=0.211667
+							Width=2.77813
+							Height=0.582083
+							Picture=-10023
+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
+						End
+						Item
+							Type=MemoBox
+							Name='MemoBox42'
+							Left=0.396875
+							Top=2.01083
+							Width=2.01083
+							Height=0.79375
+							Object Font
+								Name='瀹嬩綋'
+								Bold=T
+								Charset=134
+							End
+							Text='鏃ユ湡锛�'
+						End
+						Item
+							Type=MemoBox
+							Name='MemoBox43'
+							Left=2.59292
+							Top=2.01083
+							Width=3.01625
+							Height=0.79375
+							Object Font
+								Name='榛戜綋'
+								Bold=T
+								Charset=134
+							End
+							ShrinkFontToFit=T
+							Text='[#鏃ユ湡#]'
+						End
+						Item
+							Type=MemoBox
+							Name='MemoBox44'
+							Left=5.3975
+							Top=2.80458
+							Width=1.79917
+							Height=0.79375
+							Object Font
+								Name='瀹嬩綋'
+								Bold=T
+								Charset=134
+							End
+							TextAlign=MiddleCenter
+							Text='榛戞爣鍙凤細'
+						End
+						Item
+							Type=MemoBox
+							Name='MemoBox45'
+							Left=7.19667
+							Top=2.80458
+							Width=2.80458
+							Height=0.79375
+							Object Font
+								Name='榛戜綋'
+								Bold=T
+								Charset=134
+							End
+							ShrinkFontToFit=T
+							TextAlign=MiddleCenter
+							Text='[#榛戞爣鍙�#]'
+						End
+						Item
+							Type=MemoBox
+							Name='MemoBox46'
+							Left=5.3975
+							Top=3.62479
+							Width=1.79917
+							Height=0.79375
+							Object Font
+								Name='瀹嬩綋'
+								Bold=T
+								Charset=134
+							End
+							Text='鍏ュ簱鎵规锛�'
+						End
+						Item
+							Type=MemoBox
+							Name='MemoBox47'
+							Left=7.32896
+							Top=3.62479
+							Width=2.59292
+							Height=0.79375
+							Object Font
+								Name='榛戜綋'
+								Bold=T
+								Charset=134
+							End
+							ShrinkFontToFit=T
+							Text='[#鍏ュ簱鎵规#]'
+						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/grf/\351\200\201\350\264\247\345\215\225\050A4\347\272\270\051.grf" "b/WebTM/views/grf/\351\200\201\350\264\247\345\215\225\050A4\347\272\270\051.grf"
new file mode 100644
index 0000000..b7701ae
--- /dev/null
+++ "b/WebTM/views/grf/\351\200\201\350\264\247\345\215\225\050A4\347\272\270\051.grf"
@@ -0,0 +1,447 @@
+锘縊bject Report
+	Version='6.0.0.6'
+	Object Font
+		Name='瀹嬩綋'
+		Size=105000,0
+		Weight=400
+		Charset=134
+	End
+	Object Printer
+		Height=29.7
+		LeftMargin=1
+		TopMargin=1.5
+		RightMargin=1
+		BottomMargin=1.5
+	End
+	Object DetailGrid
+		Object Recordset
+			Items Field
+				Item
+					Name='鍗曟嵁鍙�'
+				End
+				Item
+					Name='鏃ユ湡'
+					Type=DateTime
+				End
+				Item
+					Name='渚涘簲鍟�'
+				End
+				Item
+					Name='鐗╂枡浠ｇ爜'
+				End
+				Item
+					Name='鐗╂枡'
+				End
+				Item
+					Name='瑙勬牸鍨嬪彿'
+				End
+				Item
+					Name='璁￠噺鍗曚綅'
+				End
+				Item
+					Name='鏁伴噺'
+					Type=Integer
+				End
+				Item
+					Name='鍗曚环'
+					Type=Currency
+				End
+				Item
+					Name='閲戦'
+					Type=Currency
+				End
+				Item
+					Name='鍚◣鍗曚环'
+					Type=Currency
+				End
+				Item
+					Name='浜よ揣鏃ユ湡'
+					Type=DateTime
+				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.16417
+			End
+			Item
+				Name='璁″垝璺熻釜鍗曞彿'
+				Width=3.20146
+			End
+			Item
+				Name='鐗╂枡浠ｇ爜'
+				Width=3.30729
+			End
+			Item
+				Name='鐗╂枡'
+				Width=2.59292
+			End
+			Item
+				Name='瑙勬牸鍨嬪彿'
+				Width=3.01625
+			End
+			Item
+				Name='璁￠噺鍗曚綅'
+				Width=1.19063
+			End
+			Item
+				Name='鏁伴噺'
+				Width=1.69333
+			End
+			Item
+				Name='Column1'
+				Width=3.20146
+			End
+			Item
+				Name='Column2'
+				Width=1.21708
+			End
+		End
+		Object ColumnContent
+			Height=1.00542
+			Items ColumnContentCell
+				Item
+					Column='搴忓彿'
+					FreeCell=T
+					Items Control
+						Item
+							Type=SystemVarBox
+							Name='SystemVarBox1'
+							Left=0.079375
+							Top=0.185208
+							Width=0.926042
+							Height=0.582083
+							SystemVar=RowNo
+						End
+					End
+				End
+				Item
+					Column='璁″垝璺熻釜鍗曞彿'
+					WordWrap=T
+					TextAlign=MiddleCenter
+					ShrinkFontToFit=T
+					DataField='璁″垝璺熻釜鍗曞彿'
+				End
+				Item
+					Column='鐗╂枡浠ｇ爜'
+					WordWrap=T
+					TextAlign=MiddleCenter
+					ShrinkFontToFit=T
+					DataField='鐗╂枡浠ｇ爜'
+				End
+				Item
+					Column='鐗╂枡'
+					WordWrap=T
+					TextAlign=MiddleCenter
+					ShrinkFontToFit=T
+					DataField='鐗╂枡'
+				End
+				Item
+					Column='瑙勬牸鍨嬪彿'
+					WordWrap=T
+					TextAlign=MiddleCenter
+					ShrinkFontToFit=T
+					DataField='瑙勬牸鍨嬪彿'
+				End
+				Item
+					Column='璁￠噺鍗曚綅'
+					WordWrap=T
+					TextAlign=MiddleCenter
+					ShrinkFontToFit=T
+					DataField='璁￠噺鍗曚綅'
+				End
+				Item
+					Column='鏁伴噺'
+					WordWrap=T
+					TextAlign=MiddleCenter
+					ShrinkFontToFit=T
+					DataField='鏁伴噺'
+				End
+				Item
+					Column='Column1'
+					FreeCell=T
+					Items Control
+						Item
+							Type=StaticBox
+							Name='StaticBox35'
+							Center=Vertical
+							Left=-0.0529167
+							Top=0.079375
+							Width=3.59833
+							Height=0.79375
+							Object Font
+								Name='瀹嬩綋'
+								Size=90000,0
+								Weight=400
+								Charset=134
+							End
+							ShrinkFontToFit=T
+							Text='鍙ｅ悎鏍煎彛鐗归噰鍙ｉ��璐�'
+						End
+					End
+				End
+				Item
+					Column='Column2'
+					FreeCell=T
+					Items Control
+						Item
+							Type=StaticBox
+							Name='StaticBox36'
+							Center=Both
+							Left=-1.19063
+							Top=0.079375
+							Width=3.59833
+							Height=0.79375
+							ShrinkFontToFit=T
+						End
+					End
+				End
+			End
+		End
+		Object ColumnTitle
+			Height=1.00542
+			Items ColumnTitleCell
+				Item
+					GroupTitle=F
+					Column='搴忓彿'
+					TextAlign=MiddleCenter
+					Text='搴忓彿'
+				End
+				Item
+					GroupTitle=F
+					Column='璁″垝璺熻釜鍗曞彿'
+					TextAlign=MiddleCenter
+					Text='璁″垝璺熻釜鍗曞彿'
+				End
+				Item
+					GroupTitle=F
+					Column='鐗╂枡浠ｇ爜'
+					WordWrap=T
+					TextAlign=MiddleCenter
+					Text='鐗╂枡浠ｇ爜'
+				End
+				Item
+					GroupTitle=F
+					Column='鐗╂枡'
+					WordWrap=T
+					TextAlign=MiddleCenter
+					Text='鐗╂枡鍚嶇О'
+				End
+				Item
+					GroupTitle=F
+					Column='瑙勬牸鍨嬪彿'
+					WordWrap=T
+					TextAlign=MiddleCenter
+					Text='瑙勬牸鍨嬪彿'
+				End
+				Item
+					GroupTitle=F
+					Column='璁￠噺鍗曚綅'
+					Object Font
+						Name='瀹嬩綋'
+						Size=112500,0
+						Weight=400
+						Charset=134
+					End
+					WordWrap=T
+					TextAlign=MiddleCenter
+					Text='璁￠噺鍗曚綅'
+				End
+				Item
+					GroupTitle=F
+					Column='鏁伴噺'
+					WordWrap=T
+					TextAlign=MiddleCenter
+					Text='鏁伴噺'
+				End
+				Item
+					GroupTitle=F
+					Column='Column1'
+					TextAlign=MiddleCenter
+					Text='妫�楠岀粨鏋�'
+				End
+				Item
+					GroupTitle=F
+					Column='Column2'
+					TextAlign=MiddleCenter
+					Text='澶囨敞'
+				End
+			End
+		End
+		Items Group
+			Item
+				Name='Group1'
+				Object GroupHeader
+					Height=0
+				End
+				Object GroupFooter
+					Height=0.79375
+					RepeatOnPage=T
+					Items Control
+						Item
+							Type=StaticBox
+							Name='StaticBox34'
+							Center=Vertical
+							Left=13.4144
+							Top=-0.15875
+							Width=0.978958
+							Height=1.11125
+							Object Border
+								Styles=[DrawRight]
+							End
+							Object Font
+								Name='瀹嬩綋'
+								Size=90000,0
+								Weight=400
+								Charset=134
+							End
+							Text='鍚堣锛�'
+						End
+						Item
+							Type=SummaryBox
+							Name='SummaryBox1'
+							Left=14.4463
+							Width=2.59292
+							Height=0.79375
+							Object Border
+								Styles=[DrawLeft]
+							End
+							DataField='鏁伴噺'
+						End
+					End
+				End
+			End
+		End
+	End
+	Items ReportHeader
+		Item
+			Name='ReportHeader1'
+			Height=2.98979
+			Items Control
+				Item
+					Type=MemoBox
+					Name='MemoBox3'
+					Left=6.0325
+					Width=4.20688
+					Height=1.00542
+					Object Border
+						Styles=[DrawBottom]
+					End
+					Object Font
+						Name='瀹嬩綋'
+						Size=240000,0
+						Bold=T
+						Charset=134
+					End
+					Text='閫� 璐� 鍗昞r\n'
+				End
+				Item
+					Type=Barcode
+					Name='Barcode1'
+					Left=0.238125
+					Top=0.211667
+					Width=3.38667
+					Height=2.59292
+					BarcodeType=QRCode
+					Text='[#鍗曟嵁鍙�#]'
+					Object Font
+						Name='瀹嬩綋'
+						Size=82500,0
+						Weight=400
+						Charset=134
+					End
+				End
+				Item
+					Type=MemoBox
+					Name='MemoBox4'
+					Left=3.83646
+					Top=1.40229
+					Width=8.20208
+					Height=0.608542
+					Text='渚涘簲鍟�:[#渚涘簲鍟�#]'
+				End
+				Item
+					Type=MemoBox
+					Name='MemoBox5'
+					Left=12.1179
+					Top=1.40229
+					Width=3.81
+					Height=0.608542
+					Text='鏃ユ湡:[#鏃ユ湡#]'
+				End
+				Item
+					Type=MemoBox
+					Name='MemoBox6'
+					ForeColor=Red
+					Left=10.5304
+					Top=0.47625
+					Width=6.00604
+					Height=0.608542
+					Text='閫佽揣鍗曞彿:[#閫佽揣鍗曞彿#]'
+				End
+			End
+			RepeatOnPage=T
+		End
+	End
+	Items ReportFooter
+		Item
+			Name='ReportFooter1'
+			Height=1.40229
+			Items Control
+				Item
+					Type=StaticBox
+					Name='StaticBox3'
+					Left=0.211667
+					Top=0.396875
+					Width=3.38667
+					Height=0.608542
+					Text='鏀舵枡鍛�:'
+				End
+				Item
+					Type=StaticBox
+					Name='StaticBox4'
+					Left=6.40292
+					Top=0.396875
+					Width=3.38667
+					Height=0.608542
+					Text='妫�楠屽憳:'
+				End
+				Item
+					Type=StaticBox
+					Name='StaticBox5'
+					Left=12.5942
+					Top=0.396875
+					Width=3.38667
+					Height=0.608542
+					Text='浠撶鍛�:'
+				End
+			End
+			RepeatOnPage=T
+		End
+	End
+End
diff --git "a/WebTM/views/grf/\351\200\201\350\264\247\345\215\225\050\346\240\207\347\255\276\347\272\270\051.grf" "b/WebTM/views/grf/\351\200\201\350\264\247\345\215\225\050\346\240\207\347\255\276\347\272\270\051.grf"
new file mode 100644
index 0000000..0c4d419
--- /dev/null
+++ "b/WebTM/views/grf/\351\200\201\350\264\247\345\215\225\050\346\240\207\347\255\276\347\272\270\051.grf"
@@ -0,0 +1,195 @@
+锘縊bject Report
+	Version='6.0.0.6'
+	Title='浣犵殑鎶ヨ〃鏍囬'
+	PrintAsDesignPaper=F
+	Object Font
+		Name='瀹嬩綋'
+		Size=105000,0
+		Weight=400
+		Charset=134
+	End
+	Object Printer
+		Size=256
+		Width=9.5
+		Height=5
+		LeftMargin=0
+		TopMargin=0.1
+		RightMargin=0
+		BottomMargin=0
+	End
+	Object DetailGrid
+		CenterView=T
+		ShowColLine=F
+		ShowRowLine=F
+		Object Border
+			Object Pen
+				Width=1.5
+			End
+		End
+		Object Recordset
+			Items Field
+				Item
+					Name='鏃ユ湡'
+					Type=DateTime
+					Format='yyyy//MM//dd'
+				End
+				Item
+					Name='渚涘簲鍟�'
+				End
+				Item
+					Name='澶囨敞'
+				End
+				Item
+					Name='鐗╂枡鎬昏鏁�'
+					Type=Integer
+				End
+				Item
+					Name='鍗曟嵁鍙�'
+				End
+				Item
+					Name='閫佽揣鍗曞彿'
+				End
+				Item
+					Name='Field1'
+				End
+			End
+		End
+		Items Column
+			Item
+				Name='Column1'
+				Width=9.33979
+			End
+		End
+		Object ColumnContent
+			Height=0
+			Items ColumnContentCell
+				Item
+					Column='Column1'
+					FreeCell=T
+					CanShrink=T
+				End
+			End
+		End
+		Object ColumnTitle
+			Height=4.39208
+			Items ColumnTitleCell
+				Item
+					GroupTitle=F
+					Column='Column1'
+					FreeCell=T
+					Items Control
+						Item
+							Type=FreeGrid
+							Name='FreeGrid3'
+							Left=0.0529167
+							Top=0.132292
+							Object Border
+								Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
+							End
+							ColumnCount=3
+							RowCount=6
+							Items FreeGridColumn
+								Item[1]
+									Width=2.38125
+								End
+								Item[3]
+									Width=3.73063
+								End
+							End
+							Items FreeGridRow
+								Item[1]
+									Height=0.767292
+								End
+								Item[6]
+									Height=0.926042
+								End
+							End
+							Items FreeGridCell
+								Item[1,1]
+									Object Font
+										Name='瀹嬩綋'
+										Size=217500,0
+										Bold=T
+										Charset=134
+									End
+									TextAlign=MiddleCenter
+									Text='閫佽揣鍗�'
+									ColSpan=3
+								End
+								Item[2,1]
+									Text='渚涘簲鍟嗭細'
+								End
+								Item[2,2]
+									WordWrap=T
+									ShrinkFontToFit=T
+									Text='[#渚涘簲鍟�#]'
+									ColSpan=2
+								End
+								Item[3,1]
+									Text='鍗曟嵁鍙凤細'
+								End
+								Item[3,2]
+									WordWrap=T
+									ShrinkFontToFit=T
+									Text='[#鍗曟嵁鍙�#]'
+								End
+								Item[3,3]
+									FreeCell=T
+									Items Control
+										Item
+											Type=Barcode
+											Name='Barcode1'
+											Top=0.185208
+											Width=3.59833
+											Height=2.2225
+											BarcodeType=QRCode
+											Text='[#鍗曟嵁鍙�#]'
+										End
+									End
+									RowSpan=4
+								End
+								Item[4,1]
+									Text='鐗╂枡鎬昏鏁帮細'
+								End
+								Item[4,2]
+									WordWrap=T
+									ShrinkFontToFit=T
+									Text='[#鐗╂枡鎬昏鏁�#]'
+								End
+								Item[5,1]
+									Text='鏃ユ湡锛�'
+								End
+								Item[5,2]
+									WordWrap=T
+									ShrinkFontToFit=T
+									Text='[#鏃ユ湡#]'
+								End
+								Item[6,1]
+									Text='澶囨敞锛�'
+								End
+								Item[6,2]
+									WordWrap=T
+									ShrinkFontToFit=T
+									Text='[#澶囨敞#]'
+								End
+							End
+						End
+					End
+				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/grf/\351\200\201\350\264\247\345\215\225.grf" "b/WebTM/views/grf/\351\200\201\350\264\247\345\215\225.grf"
new file mode 100644
index 0000000..a706b74
--- /dev/null
+++ "b/WebTM/views/grf/\351\200\201\350\264\247\345\215\225.grf"
@@ -0,0 +1,712 @@
+锘縊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=0.5
+		RightMargin=1.5
+		BottomMargin=0.5
+	End
+	Object DetailGrid
+		Object Recordset
+			Items Field
+				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='鏁伴噺'
+					Type=Integer
+				End
+				Item
+					Name='鍗曚环'
+					Type=Currency
+				End
+				Item
+					Name='閲戦'
+					Type=Currency
+				End
+				Item
+					Name='鍚◣鍗曚环'
+					Type=Currency
+				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='Field3'
+				End
+				Item
+					Name='琛ㄤ綋澶囨敞'
+				End
+			End
+		End
+		Items Column
+			Item
+				Name='搴忓彿'
+				Width=0.767292
+			End
+			Item
+				Name='璁″垝璺熻釜鍗曞彿'
+				Width=2.80458
+			End
+			Item
+				Name='鐗╂枡浠ｇ爜'
+				Width=3.20146
+			End
+			Item
+				Name='鐗╂枡'
+				Width=2.98979
+			End
+			Item
+				Name='瑙勬牸鍨嬪彿'
+				Width=3.01625
+			End
+			Item
+				Name='璁￠噺鍗曚綅'
+				Width=1.79917
+			End
+			Item
+				Name='鏁伴噺'
+				Width=1.98438
+			End
+			Item
+				Name='Column2'
+				Width=0.899583
+			End
+			Item
+				Name='Column3'
+				Width=1.905
+			End
+			Item
+				Name='Column4'
+				Width=2.01083
+			End
+			Item
+				Name='Column5'
+				Width=1.98438
+			End
+			Item
+				Name='Column6'
+				Width=3.20146
+			End
+		End
+		Object ColumnContent
+			Height=1.00542
+			Items ColumnContentCell
+				Item
+					Column='搴忓彿'
+					FreeCell=T
+					Items Control
+						Item
+							Type=SystemVarBox
+							Name='SystemVarBox1'
+							Dock=Fill
+							Object Font
+								Name='瀹嬩綋'
+								Weight=400
+								Charset=134
+							End
+							SystemVar=RowNo
+						End
+					End
+				End
+				Item
+					Column='璁″垝璺熻釜鍗曞彿'
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					WordWrap=T
+					TextAlign=MiddleCenter
+					ShrinkFontToFit=T
+					DataField='婧愬崟鍗曞彿'
+				End
+				Item
+					Column='鐗╂枡浠ｇ爜'
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					WordWrap=T
+					TextAlign=MiddleCenter
+					ShrinkFontToFit=T
+					DataField='鐗╂枡浠ｇ爜'
+				End
+				Item
+					Column='鐗╂枡'
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					WordWrap=T
+					TextAlign=MiddleCenter
+					ShrinkFontToFit=T
+					DataField='鐗╂枡鍚嶇О'
+				End
+				Item
+					Column='瑙勬牸鍨嬪彿'
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					WordWrap=T
+					TextAlign=MiddleCenter
+					ShrinkFontToFit=T
+					DataField='瑙勬牸鍨嬪彿'
+				End
+				Item
+					Column='璁￠噺鍗曚綅'
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					WordWrap=T
+					TextAlign=MiddleCenter
+					ShrinkFontToFit=T
+					DataField='鎵规'
+				End
+				Item
+					Column='鏁伴噺'
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					WordWrap=T
+					TextAlign=MiddleCenter
+					ShrinkFontToFit=T
+					DataField='鐢熶骇鏃ユ湡'
+				End
+				Item
+					Column='Column2'
+					FreeCell=T
+					Items Control
+						Item
+							Type=FieldBox
+							Name='FieldBox1'
+							Dock=Fill
+							Object Font
+								Name='瀹嬩綋'
+								Weight=400
+								Charset=134
+							End
+							TextAlign=MiddleCenter
+							DataField='璁￠噺鍗曚綅'
+						End
+					End
+				End
+				Item
+					Column='Column3'
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					TextAlign=MiddleCenter
+					DataField='鏁伴噺'
+				End
+				Item
+					Column='Column4'
+					TextAlign=MiddleCenter
+				End
+				Item
+					Column='Column5'
+				End
+				Item
+					Column='Column6'
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					FreeCell=T
+					Items Control
+						Item
+							Type=FieldBox
+							Name='FieldBox2'
+							Dock=Fill
+							DataField='琛ㄤ綋澶囨敞'
+						End
+					End
+				End
+			End
+		End
+		Object ColumnTitle
+			Height=1.00542
+			RepeatStyle=OnPage
+			Items ColumnTitleCell
+				Item
+					GroupTitle=F
+					Column='搴忓彿'
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					TextAlign=MiddleCenter
+					Text='搴忓彿'
+				End
+				Item
+					GroupTitle=F
+					Column='璁″垝璺熻釜鍗曞彿'
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					TextAlign=MiddleCenter
+					Text='璁㈠崟鍙�'
+				End
+				Item
+					GroupTitle=F
+					Column='鐗╂枡浠ｇ爜'
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					WordWrap=T
+					TextAlign=MiddleCenter
+					Text='鐗╂枡浠ｇ爜'
+				End
+				Item
+					GroupTitle=F
+					Column='鐗╂枡'
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					WordWrap=T
+					TextAlign=MiddleCenter
+					Text='鐗╂枡鍚嶇О'
+				End
+				Item
+					GroupTitle=F
+					Column='瑙勬牸鍨嬪彿'
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					WordWrap=T
+					TextAlign=MiddleCenter
+					Text='瑙勬牸鍨嬪彿'
+				End
+				Item
+					GroupTitle=F
+					Column='璁￠噺鍗曚綅'
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					WordWrap=T
+					TextAlign=MiddleCenter
+					Text='鎵规鍙�'
+				End
+				Item
+					GroupTitle=F
+					Column='鏁伴噺'
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					WordWrap=T
+					TextAlign=MiddleCenter
+					Text='鐢熶骇鏃ユ湡'
+				End
+				Item
+					GroupTitle=F
+					Column='Column2'
+					Object Font
+						Name='瀹嬩綋'
+						Size=82500,0
+						Weight=400
+						Charset=134
+					End
+					WordWrap=T
+					TextAlign=MiddleCenter
+					Text='璁￠噺鍗曚綅'
+				End
+				Item
+					GroupTitle=F
+					Column='Column3'
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					TextAlign=MiddleCenter
+					Text='閫佽揣鏁伴噺'
+				End
+				Item
+					GroupTitle=F
+					Column='Column4'
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					TextAlign=MiddleCenter
+					Text='鍖呰鏁�*瀹氶噺'
+				End
+				Item
+					GroupTitle=F
+					Column='Column5'
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					TextAlign=MiddleCenter
+					Text='绛炬敹鏁伴噺'
+				End
+				Item
+					GroupTitle=F
+					Column='Column6'
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					WordWrap=T
+					TextAlign=MiddleCenter
+					Text='澶囨敞'
+				End
+			End
+		End
+	End
+	Items ReportHeader
+		Item
+			Name='ReportHeader1'
+			Height=5.60917
+			Items Control
+				Item
+					Type=MemoBox
+					Name='MemoBox3'
+					Left=7.59354
+					Top=1.5875
+					Width=11.6152
+					Height=0.873125
+					Object Border
+						Styles=[DrawBottom]
+					End
+					Object Font
+						Name='瀹嬩綋'
+						Size=180000,0
+						Bold=T
+						Charset=134
+					End
+					TextAlign=TopCenter
+					Text='閫�     璐�    娓�    鍗昞r\n'
+				End
+				Item
+					Type=Barcode
+					Name='Barcode1'
+					Left=21.0079
+					Top=0.608542
+					Width=3.59833
+					Height=2.80458
+					BarcodeType=QRCode
+					Text='[#鍗曟嵁鍙�#]'
+					Object Font
+						Name='瀹嬩綋'
+						Size=82500,0
+						Weight=400
+						Charset=134
+					End
+				End
+				Item
+					Type=MemoBox
+					Name='MemoBox4'
+					Left=0.396875
+					Top=0.740833
+					Width=15.0019
+					Height=0.79375
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					Text='渚涘簲鍟�:[#渚涘簲鍟�#]'
+				End
+				Item
+					Type=MemoBox
+					Name='MemoBox6'
+					Left=0.396875
+					Top=2.51354
+					Width=14.605
+					Height=0.6
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					TextAlign=TopLeft
+					Text='鍘熼�佽揣鍗曞彿:[#閫佽揣鍗曞彿#]'
+				End
+				Item
+					Type=MemoBox
+					Name='MemoBox7'
+					Left=0.396875
+					Top=3.09563
+					Width=8.20208
+					Height=0.6
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					TextAlign=TopLeft
+					Text='鍗曟嵁鍙�:[#鍗曟嵁鍙�#]'
+				End
+				Item
+					Type=MemoBox
+					Name='MemoBox10'
+					Left=0.396875
+					Top=3.70417
+					Width=14.605
+					Height=0.6
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					TextAlign=TopLeft
+					Text='鏀惰揣鍦板潃锛氭禉姹熺渷鍙板窞甯傛姹熷尯寮�鍙戝ぇ閬撲笢娈�818鍙穃r'
+				End
+				Item
+					Type=MemoBox
+					Name='MemoBox11'
+					Left=12.7
+					Top=3.09563
+					Width=6.40292
+					Height=0.6
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					Text='渚涘簲鍟嗙紪鐮侊細[#渚涘簲鍟嗕唬鐮�#]'
+				End
+				Item
+					Type=MemoBox
+					Name='MemoBox12'
+					Left=0.396875
+					Top=4.31271
+					Width=8.20208
+					Height=0.6
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					TextAlign=TopLeft
+					Text='閫佽揣鏃ユ湡锛歔#鏃ユ湡#]'
+				End
+				Item
+					Type=MemoBox
+					Name='MemoBox13'
+					Left=0.396875
+					Top=4.92125
+					Width=8.20208
+					Height=0.6
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					TextAlign=TopLeft
+					Text='鏀惰揣鑱旂郴浜猴細榛勫缓'
+				End
+				Item
+					Type=MemoBox
+					Name='MemoBox14'
+					Left=12.7
+					Top=4.92125
+					Width=8.20208
+					Height=0.6
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					TextAlign=TopLeft
+					Text='鐢佃瘽锛�13185687491'
+				End
+				Item
+					Type=PictureBox
+					Name='PictureBox1'
+					Left=0.396875
+					Top=0.211667
+					Width=2.80458
+					Height=0.582083
+					Picture=-2055
+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
+				End
+				Item
+					Type=MemoBox
+					Name='MemoBox15'
+					Left=12.7
+					Top=4.33917
+					Width=8.20208
+					Height=0.6
+					Object Font
+						Name='瀹嬩綋'
+						Weight=400
+						Charset=134
+					End
+					TextAlign=TopLeft
+					Text='棰勮鍒拌揣鏃ユ湡锛歔#棰勮鍒拌揣鏃ユ湡#]'
+				End
+			End
+			RepeatOnPage=T
+		End
+	End
+	Items ReportFooter
+		Item
+			Name='ReportFooter1'
+			Height=3.41313
+			Items Control
+				Item
+					Type=ShapeBox
+					Name='ShapeBox1'
+					Left=0.132292
+					Top=0.396875
+					Width=26.4054
+					Height=1.19063
+				End
+				Item
+					Type=StaticBox
+					Name='StaticBox3'
+					Left=0.211667
+					Top=2.40771
+					Width=3.38667
+					Height=0.582083
+					Text='閫佽揣浜猴細'
+				End
+				Item
+					Type=StaticBox
+					Name='StaticBox4'
+					Left=16.4042
+					Top=2.40771
+					Width=3.20146
+					Height=0.582083
+					Text='鏀惰揣浜猴細'
+				End
+				Item
+					Type=MemoBox
+					Name='MemoBox16'
+					Left=0.211667
+					Top=0.502708
+					Width=26.1938
+					Height=0.978958
+					Object Font
+						Name='瀹嬩綋'
+						Size=120000,0
+						Weight=400
+						Charset=134
+					End
+					Text='澶囨敞锛歔#琛ㄥご澶囨敞#]'
+				End
+			End
+			RepeatOnPage=T
+		End
+	End
+End
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index c6722c6..35d2bb1 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -213,7 +213,7 @@
             var sWhere = "";
             var sBillType = "3801";
             var HModName = "Gy_BarCodeBill";
-            var titleData = ["鐗╂枡ID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "杈呭姪灞炴�D", "璁￠噺鍗曚綅ID", "瀹㈡埛ID", "HItemID", "hmainid", "hsubid", "HinterID", "杞﹂棿ID", "渚涘簲鍟咺D", "HSTOCKORGID","鎿嶄綔鍛業D","鐝粍ID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["鐗╂枡ID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "杈呭姪灞炴�D", "璁￠噺鍗曚綅ID", "瀹㈡埛ID", "HItemID", "hmainid", "hsubid", "HinterID", "杞﹂棿ID", "渚涘簲鍟咺D", "HSTOCKORGID", "鎿嶄綔鍛業D", "鐝粍ID", "澶栫鏁�", "閽㈠嵎鎹嗗寘鍙�", "鐐夊彿", "鍘傚晢", "瀹㈡埛浠ｇ爜", "瀹㈡埛鍚嶇О", "閿�鍞鍗曞彿", "鐢熶骇鏃ユ湡", "淇濊川鏈熻嚦", "鐑鐞�", "杈呭姪灞炴�т唬鐮�", "杈呭姪灞炴�у悕绉�", "杈呭崟浣嶆暟閲�", "鏄惁鍚敤淇濊川鏈�", "鏄惁璧犲搧","杩涙枡鏃ユ湡"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
 
             var HMaterID = "";
             var HBatchNo = "";
@@ -267,7 +267,7 @@
 
             var rowdata = [{
                 "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
-                "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "","HMTONo": ""
+                "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": ""
             }];
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
@@ -299,7 +299,7 @@
 
                 var NewRow = {
                     "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
-                    "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": ""
+                    "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": ""
                 };
                 //console.log(NewRow);
                 switch (obj.event) {
@@ -626,7 +626,7 @@
                     $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //鍗曟嵁鏃ユ湡
                     $("#HSourceBillType").val('1'); //閫夋嫨涓嬫媺妗嗛粯璁ょ涓�涓�夐」
                     $("#HBarCodeType").val('0');
-                        var arr = [{ HBillNo: '', HMaterNumber: '', HMaterName: '', HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: '', HUnitName: '', HBatchNo: '', HGiveAwayFlag: '0', HQty: '0', HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0, HEmpNumber: '', HEmpName: '', HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: ''}]
+                    var arr = [{ HBillNo: '', HMaterNumber: '', HMaterName: '', HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: '', HUnitName: '', HBatchNo: '', HGiveAwayFlag: '0', HQty: '0', HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0, HEmpNumber: '', HEmpName: '', HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: '', HCusModel: "", HCusMaterName: "" }]
                     table.reload('mainTable', {
                         data: arr // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
                     });
@@ -634,7 +634,7 @@
                         "HBarCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HAuxPropNumber": "", "HAuxPropName": ""
                         , "HGiveAwayFlag": "", "HUnitCode": "", "HUnitName": "", "HQty": 0, "HDate": "", "HCusNumber": "", "HCusName": ""
                         , "HSourceBillNo": "", "HSeOrderBillNo": "", "HRemark": "", "HMTONo": "", "HShowDate": "", "HInnerBillNo": "", "HMaker": ""
-                        , "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": ""
+                        , "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": ""
                     }]
                     table.reload('mainTable1', {
                         data: arr1 // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
@@ -670,7 +670,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].鐗╂枡浠ｇ爜, HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].璁￠噺鍗曚綅浠ｇ爜, HUnitName: checkStatus.data[0].璁￠噺鍗曚綅, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].鏁伴噺.toString("#0.00"), HMinQty: checkStatus.data[0].鏈�灏忓寘瑁呮暟, HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0, HEmpNumber: '', HEmpName: '', HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: '' }]
+                        var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].鐗╂枡浠ｇ爜, HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].璁￠噺鍗曚綅浠ｇ爜, HUnitName: checkStatus.data[0].璁￠噺鍗曚綅, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].鏁伴噺.toString("#0.00"), HMinQty: checkStatus.data[0].鏈�灏忓寘瑁呮暟, HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0, HEmpNumber: '', HEmpName: '', HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: '', "HCusModel": "", "HCusMaterName": "" }]
                         //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                         table.reload('mainTable', {
                             data: arr // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
@@ -833,9 +833,11 @@
                     , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterNumber', width: 200 }
                     , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 200 }
                     , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 200 }
+                    , { field: 'HCusModel', title: '瀹㈡埛瑙勬牸鍨嬪彿', edit: 'text', width: 200 }
+                    , { field: 'HCusMaterName', title: '瀹㈡埛鐗╂枡鍚嶇О', edit: 'text', width: 200 }
                     , { field: 'HEmpID', title: '鎿嶄綔鍛業D', width: 100, hide: true }
-                    , { field: 'HEmpNumber', title: '鎿嶄綔鍛樹唬鐮�', edit: 'text', width: 200, event: 'HEmpNumber'}
-                    , { field: 'HEmpName', title: '鎿嶄綔鍛�', width: 200 }
+                    , { field: 'HEmpNumber', title: '鎿嶄綔鍛樹唬鐮�', edit: 'text', width: 200, event: 'HEmpNumber' }
+                    , { field: 'HEmpName', title: '鎿嶄綔鍛�', width: 200 }                   
                     , { field: 'HGroupID', title: '鐝粍ID', width: 100, hide: true }
                     , { field: 'HGroupNumber', title: '鐝粍浠ｇ爜', edit: 'text', width: 200, event: 'HGroupNumber' }
                     , { field: 'HGroupName', title: '鐝粍鍚嶇О', width: 200 }
@@ -999,7 +1001,7 @@
                     , "HAuxPropID": 0, "HAuxPropNumber": "", "HAuxPropName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HBatchNo": "", "HGiveAwayFlag": 0
                     , "HQty": 0, "HMinQty": '', "HBQty": 0, "HPackQty": 0, "HDate": "", "HCusID": 0, "HCusNumber": "", "HCusName": "", "HSeOrderBillNo": "", "HRemark": ""
                     , "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
-                    "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": ""
+                    "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": ""
                 }];
                 table.render(option);
                 //鍒锋柊琛ㄦ牸鏁版嵁
@@ -1013,7 +1015,7 @@
                     "HBarCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HAuxPropNumber": "", "HAuxPropName": ""
                     , "HGiveAwayFlag": "", "HUnitCode": "", "HUnitName": "", "HQty": 0, "HDate": "", "HCusNumber": "", "HCusName": ""
                     , "HSourceBillNo": "", "HSeOrderBillNo": "", "HRemark": "", "HMTONo": "", "HShowDate": "", "HInnerBillNo": "", "HMaker": ""
-                    , "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": ""
+                    , "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HCusModel": "", "HCusMaterName": ""
                 }];
                 table.render(option1);
                 //鍒锋柊琛ㄦ牸鏁版嵁
@@ -1156,7 +1158,7 @@
                             for (var i = 0; i < option.cols[0].length - 2; i++) {
                                 if (dataCol[i]) {
                                     var dataCols = dataCol[i].split('|');
-                                }                                
+                                }
                                 //闅愯棌鍒�
                                 if (dataCols[1] == 1) {
                                     option.cols[0][i + 1]["hide"] = true;
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_MouldLowerBillEdit_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_MouldLowerBillEdit_PDA.html"
index bb508be..3ea65fb 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_MouldLowerBillEdit_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_MouldLowerBillEdit_PDA.html"
@@ -439,7 +439,7 @@
                     $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庝繚瀛樻寜閽鐢�
                 $.ajax({
                     type: "POST",
-                    url: GetWEBURL() + "Sc_MouldUpperBill/SaveAddSc_MouldLowerBill_PDA",
+                    url: GetWEBURL() + "Sc_MouldUpperBill/AddSc_MouldLowerBill_PDA",
                     async: true,
                     data: { "oMain": oMain },
                     dataType: "json",
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 d018727..3d615c2 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"
@@ -441,7 +441,7 @@
                                      $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庝繚瀛樻寜閽鐢�
                             $.ajax({
                                 type: "POST",
-                                url: GetWEBURL() + "Sc_MouldUpperBill/SaveAddSc_MouldUpperBill_PDA",
+                                url: GetWEBURL() + "Sc_MouldUpperBill/AddSc_MouldUpperBill_PDA",
                                 async: true,
                                 data: { "oMain": oMain },
                                 dataType: "json",
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
index a229d0f..0f48b5b 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
@@ -12,6 +12,17 @@
         .layui-form-label {
             width: 85px;
         }
+
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
     </style>
 </head>
 <body>
@@ -76,7 +87,7 @@
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                     </button>
                                                 </div>
-                                            </div>                                            
+                                            </div>
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
@@ -110,7 +121,7 @@
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                     </button>
                                                 </div>
-                                            </div>                                            
+                                            </div>
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
@@ -124,7 +135,14 @@
                                                 <div class="layui-input-inline">
                                                     <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
                                                 </div>
-                                            </div>                                            
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鏈�缁堢粨璁�</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="radio" name="HLastResult" id="HLastResult" value="OK" title="OK" checked>
+                                                    <input type="radio" name="HLastResult" id="HLastResult" value="NG" title="NG">
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
@@ -179,6 +197,14 @@
         <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
         <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del1">鍒犻櫎</a>
     </script>
+    <!--琛屼笅鎷夐�夋嫨(淇濆吇缁撴灉)-->
+    <script type="text/html" id="HMaintainResult">
+        <select name="HMaintainResult" lay-filter="HMaintainResult" id="HMaintainResult{{d.LAY_TABLE_INDEX+1}}">
+            <!--<option value="">璇烽�夋嫨</option>-->
+            <option value="Y" selected>Y</option>
+            <option value="X">X</option>
+        </select>
+    </script>
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -213,7 +239,7 @@
             var option;
             var option2;
             var sBillType = "3807";
-            var TabRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " };
+            var TabRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HMaintainResult": "Y" };
             var TabRow1 = { "HMaterID": 0, "HMaterNumber": " ", "HMaterName": " ", "HMaterSpec": " ", "HUnitID": "0", "HUnitNumber": " ", "HUnitName": " ", "HQty": "0", "HQtyMust": "0", "HRemark": " " };
             //#endregion
 
@@ -257,7 +283,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " };
+                var NewRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HMaintainResult": "Y" };
                 switch (obj.event) {
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
@@ -295,6 +321,35 @@
             table.on('tool(mainTable1)', function (obj) {
                 set_GridDelete1(obj);   //琛屽唴鍒犻櫎
                 set_GridCellCheck1(obj); //琛屽唴蹇嵎閿瓫閫�
+            });
+
+            //琛岄�夋嫨澶勭悊锛堢偣妫�缁撴灉锛�
+            form.on('select(HMaintainResult)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HMaintainResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+
+                console.log(table.cache['mainTable']);
+
+                var HQty = 0;//琛ㄤ綋琛屼笉鍚堟牸鏁伴噺
+                for (let i = 0; i < table.cache['mainTable'].length; i++) {
+                    if (table.cache['mainTable'][i].HMaintainResult == "X") {
+                        HQty++;
+                    }
+                }
+                if (HQty > 0) {
+                    document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+                    $("input:radio[name=HLastResult][value=" + "NG" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+                } else {
+                    document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+                    $("input:radio[name=HLastResult][value=" + "OK" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+                }
+                form.render('radio');
             });
 
             //琛ㄥご淇℃伅淇濆吇璁″垝婧愬崟寮圭獥
@@ -483,7 +538,7 @@
                                 var PJData = result.list[1];//閰嶄欢
                                 var rowdate1 = layui.table.cache["mainTable"];
                                 var rowdate2 = layui.table.cache["mainTable1"];
-                                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
+                                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HMaintainResult": "Y"}];
                                 option2.data = [{ "HMaterID": 0, "HMaterNumber": " ", "HMaterName": " ", "HMaterSpec": " ", "HUnitID": "0", "HUnitNumber": " ", "HUnitName": " ", "HQty": "0", "HQtyMust": "0", "HRemark": " " }];
                                 table.render(option);
                                 table.render(option2);
@@ -498,7 +553,7 @@
                                         var checkrow = {
                                             "HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].HMaintainItemNumber, "HMaintainItem": BYData[i].HMaintainItem,
                                             "HMaintainPart": BYData[i].HMaintainPart, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
-                                            "HManagerName": BYData[i].HManagerName, "HClaim": BYData[i].HClaim, "HRemark": BYData[i].HRemark
+                                            "HManagerName": BYData[i].HManagerName, "HClaim": BYData[i].HClaim, "HRemark": BYData[i].HRemark, "HMaintainResult": "Y"
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
@@ -549,7 +604,7 @@
                                 var PJData = result.data[1];//閰嶄欢
                                 var rowdate1 = layui.table.cache["mainTable"];
                                 var rowdate2 = layui.table.cache["mainTable1"];
-                                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
+                                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HMaintainResult": "Y" }];
                                 option2.data = [{ "HMaterID": 0, "HMaterNumber": " ", "HMaterName": " ", "HMaterSpec": " ", "HUnitID": "0", "HUnitNumber": " ", "HUnitName": " ", "HQty": "0", "HQtyMust": "0", "HRemark": " " }];
                                 table.render(option);
                                 table.render(option2);
@@ -571,7 +626,7 @@
                                         var checkrow = {
                                             "HMaintainItemID": BYData[i].HMaintainItemID == null ? 0 : BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].淇濆吇椤圭洰浠ｇ爜, "HMaintainItem": BYData[i].淇濆吇椤圭洰,
                                             "HMaintainPart": BYData[i].淇濆吇閮ㄤ綅, "HManagerID": BYData[i].HEmployeeID == null ? 0 : BYData[i].HEmployeeID, "HManagerNumber": BYData[i].璐熻矗浜轰唬鐮�,
-                                            "HManagerName": BYData[i].璐熻矗浜哄悕绉�, "HClaim": BYData[i].鍏蜂綋瑕佹眰, "HRemark": ""
+                                            "HManagerName": BYData[i].璐熻矗浜哄悕绉�, "HClaim": BYData[i].鍏蜂綋瑕佹眰, "HRemark": "", "HMaintainResult": "Y"
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
@@ -620,7 +675,7 @@
                                 var PJData = result.list[1];//閰嶄欢
                                 var rowdate1 = layui.table.cache["mainTable"];
                                 var rowdate2 = layui.table.cache["mainTable1"];
-                                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
+                                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HMaintainResult": "Y" }];
                                 option2.data = [{ "HMaterID": 0, "HMaterNumber": " ", "HMaterName": " ", "HMaterSpec": " ", "HUnitID": "0", "HUnitNumber": " ", "HUnitName": " ", "HQty": "0", "HQtyMust": "0", "HRemark": " " }];
                                 table.render(option);
                                 table.render(option2);
@@ -632,13 +687,12 @@
                                         var checkrow = {
                                             "HMaintainItemID": BYData[i].淇濆吇椤圭洰ID, "HMaintainItemNumber": BYData[i].淇濆吇椤圭洰浠ｇ爜, "HMaintainItem": BYData[i].淇濆吇椤圭洰,
                                             "HMaintainPart": BYData[i].淇濆吇閮ㄤ綅, "HManagerID": BYData[i].璐熻矗浜篒D, "HManagerNumber": BYData[i].璐熻矗浜轰唬鐮�,
-                                            "HManagerName": BYData[i].璐熻矗浜哄悕绉�, "HClaim": BYData[i].鍏蜂綋瑕佹眰, "HRemark": BYData[i].瀛愬娉�2
+                                            "HManagerName": BYData[i].璐熻矗浜哄悕绉�, "HClaim": BYData[i].鍏蜂綋瑕佹眰, "HRemark": BYData[i].瀛愬娉�2, "HMaintainResult": "Y"
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
-                                    table.reload("mainTable", {
-                                        data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
-                                    })
+                                    option.data = buttonArr;
+                                    table.render(option);
                                 }
 
 
@@ -655,9 +709,8 @@
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
-                                    table.reload("mainTable1", {
-                                        data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
-                                    })
+                                    option2.data = buttonArr;
+                                    table.render(option2);
                                 }
 
                             } else {
@@ -949,6 +1002,7 @@
                     , { field: 'HMaintainItemID', title: '淇濆吇椤圭洰ID', edit: 'text', hide: true }
                     , { field: 'HMaintainItemNumber', title: '淇濆吇椤圭洰浠ｇ爜', edit: 'text', event: 'HMaintainItemNumber' }
                     , { field: 'HMaintainItem', title: '淇濆吇椤圭洰' }
+                    , { field: 'HMaintainResult', title: '淇濆吇缁撴灉', templet: '#HMaintainResult', event: 'HMaintainResult' }
                     , { field: 'HMaintainPart', title: '淇濆吇閮ㄤ綅', edit: 'text' }
                     , { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
                     , { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text', hide: true }
@@ -1009,7 +1063,7 @@
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
+                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HMaintainResult": "Y" }];
                 option2.data = [{ "HMaterID": 0, "HMaterNumber": " ", "HMaterName": " ", "HMaterSpec": " ", "HUnitID": "0", "HUnitNumber": " ", "HUnitName": " ", "HQty": "0", "HQtyMust": "0", "HRemark": " " }];
                 table.render(option);
                 table.render(option2);
@@ -1076,7 +1130,14 @@
                                 , "HMaintainLevID": data.HMaintainLevID
                                 , "HMaintainLevName": data.淇濆吇绾у埆鍚嶇О
                             });
-
+                            if (data.鏈�缁堢粨璁� == "涓嶅悎鏍�") {
+                                document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+                                $("input:radio[name=HLastResult][value=" + "NG" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+                            } else {
+                                document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+                                $("input:radio[name=HLastResult][value=" + "OK" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+                            }
+                            form.render('radio');
                         } else {
                             layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
                         }
@@ -1110,10 +1171,21 @@
                     success: function (result) {
                         if (result.count == 1) {
                             option.data = result.list[0];
+                            for (let i = 0; i < option.data.length; i++) {
+                                if (option.data[i].HMaintainResult == "鍚堟牸") {
+                                    option.data[i].HMaintainResult = "Y";
+                                } else {
+                                    option.data[i].HMaintainResult = "X";
+                                }
+                            }
                             table.render(option);
                             option2.data = result.list[1];
                             table.render(option2);
 
+                            for (let j = 0; j < result.list[0].length; j++) {
+                                $("#HMaintainResult" + (j + 1)).val(result.list[0][j].HMaintainResult == "鍚堟牸" ? 'Y' : (result.list[0][j].HMaintainResult == 'Y' ? 'Y' : 'X'))
+                            }
+                            form.render('select');
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
                         }
@@ -1129,6 +1201,11 @@
                 table.cache["mainTable"].push(NewRow);
                 option.data = table.cache["mainTable"];
                 table.render(option);
+
+                for (var i = 1; i <= option.data.length; i++) {
+                    $('#HMaintainResult' + i + '').find("option[value='" + option.data[i - 1].HMaintainResult + "']").attr("selected", true);
+                }
+                form.render('select');
             }
 
             //澧炲姞涓�琛�
@@ -1153,6 +1230,11 @@
                     table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
                     option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
                     table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+
+                    for (var i = 1; i <= option.data.length; i++) {
+                        $('#HMaintainResult' + i + '').find("option[value='" + option.data[i - 1].HMaintainResult + "']").attr("selected", true);
+                    }
+                    form.render('select');
                 }
             }
 
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html"
index ed2bc31..3326e5f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html"
@@ -552,6 +552,8 @@
                                     var LoadData = data.data;
                                     $("#HDeptID").val(LoadData[0].HDeptID); //閮ㄩ棬ID
                                     $("#HDeptName").val(LoadData[0].鍙戦�侀儴闂�); //鍙戦�侀儴闂�
+                                    $("#HErrMsgBackTypeID").val(LoadData[0].HErrMsgBackTypeID); //寮傚父绫诲瀷鍚嶇ОID
+                                    $("#HErrMsgBackTypeName").val(LoadData[0].寮傚父绫诲瀷鍚嶇О); //寮傚父绫诲瀷鍚嶇О
                                     $("#HSendMan").val(LoadData[0].鍙戦�佷汉); //鍙戦�佷汉
                                     $("#HReceiveMan").val(LoadData[0].鎺ユ敹浜�); //鎺ユ敹浜�
                                     $("#HCopyMan").val(LoadData[0].鎶勯��); //鎶勯��
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackReceiveBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackReceiveBillMain.html"
index 877e2b1..1977202 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackReceiveBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackReceiveBillMain.html"
@@ -542,6 +542,8 @@
                                 var LoadData = data.data;
                                 $("#HDeptID").val(LoadData[0].HDeptID); //閮ㄩ棬ID
                                 $("#HDeptName").val(LoadData[0].鍙戦�侀儴闂�); //鍙戦�侀儴闂�
+                                $("#HErrMsgBackTypeID").val(LoadData[0].HErrMsgBackTypeID); //寮傚父绫诲瀷鍚嶇ОID
+                                $("#HErrMsgBackTypeName").val(LoadData[0].寮傚父绫诲瀷鍚嶇О); //寮傚父绫诲瀷鍚嶇О
                                 $("#HSendMan").val(LoadData[0].鍙戦�佷汉); //鍙戦�佷汉
                                 $("#HReceiveMan").val(LoadData[0].鎺ユ敹浜�); //鎺ユ敹浜�
                                 $("#HCopyMan").val(LoadData[0].鎶勯��); //鎶勯��
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html"
index ca9cecd..000178c 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html"
@@ -536,6 +536,8 @@
                                     var LoadData = data.data;
                                     $("#HDeptID").val(LoadData[0].HDeptID); //閮ㄩ棬ID
                                     $("#HDeptName").val(LoadData[0].鍙戦�侀儴闂�); //鍙戦�侀儴闂�
+                                    $("#HErrMsgBackTypeID").val(LoadData[0].HErrMsgBackTypeID); //寮傚父绫诲瀷鍚嶇ОID
+                                    $("#HErrMsgBackTypeName").val(LoadData[0].寮傚父绫诲瀷鍚嶇О); //寮傚父绫诲瀷鍚嶇О
                                     $("#HSendMan").val(LoadData[0].鍙戦�佷汉); //鍙戦�佷汉
                                     $("#HReceiveMan").val(LoadData[0].鎺ユ敹浜�); //鎺ユ敹浜�
                                     $("#HCopyMan").val(LoadData[0].鎶勯��); //鎶勯��
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
index f19db1b..f1587a7 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
@@ -121,7 +121,7 @@
                                                     <div class="layui-inline">
                                                         <label class="layui-form-label">涓婚:<label style="color:red"> * </label></label>
                                                         <div class="layui-input-inline">
-                                                            <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" autocomplete="off" style="width:485px">
+                                                            <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" autocomplete="off" style="width:485px" readonly>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -168,7 +168,7 @@
                                                 <div class="layui-form-item">
 
                                                     <div class="layui-inline">
-                                                        <label class="layui-form-label">鎶勯��:<label style="color:red"> * </label></label>
+                                                        <label class="layui-form-label">鎶勯��:</label>
                                                         <div>
                                                             <input type="text" name="HCopyMan" id="HCopyMan" class="layui-input" value="" style="float:left;width:1035px;" disabled>
                                                             <button type="button" lay-submit="" class="layui-btn" lay-filter="HCopyManList" id="HCopyManList" style="width:40px;">
@@ -446,14 +446,20 @@
                 set_AddNew();
             }
             else if (OperationType == 3) {//缂栬緫
-
                 set_EditFromGrid();
-            } else if (OperationType == 4) {
+            }
+            else if (OperationType == 4) {
                 set_AddFNew();
                 var Datetime = Format(new Date(), "yyyy-MM-dd hh:mm:ss");
                 var Person = sessionStorage["HUserName"];              
                 //鎶ュ伐鍙拌烦杞〉闈㈣嚜鍔ㄧ敓鎴愬唴瀹�
                 $("#HDescription").val(generateString(Datetime, Person, HSourceName, HICMOBillNo, HType));
+                $("#HContext").val(HType);
+            }
+            else if (OperationType == 5) {  //鏌ョ湅
+                set_EditFromGrid(); 
+                $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#VerIfySaver').addClass("layui-btn-disabled").attr("disabled", true);
             }
             else {
                 layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
@@ -587,6 +593,7 @@
                                 , "HMainSourceBillNo": data.HSourceBillNo                   //婧愬崟鍗曞彿
                                 , "HMainSourceBillType": data.HSourceBillType               //婧愬崟绫诲瀷
                                 , "HHasten": data.HHasten
+                                , "HMaterNumber": data.HMaterNumber
                                 , "HMaterName": data.HMaterName
                                 , "HHandleEmpID": data.HHandleEmpID
                                 , "HHandleEmpName": data.HHandleEmpName
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_MESExecptFeedBackBillType.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_MESExecptFeedBackBillType.html"
index 9677a3c..b959ffd 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_MESExecptFeedBackBillType.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_MESExecptFeedBackBillType.html"
@@ -81,6 +81,7 @@
             display: inline-block;
             margin-right: 20px; /* 鏍规嵁闇�瑕佽皟鏁撮棿璺� */
         }
+       
     </style>
 </head>
 <body>
@@ -109,14 +110,14 @@
                                                     <div class="layui-inline">
                                                         <div class="layui-input-inline" style="margin-left:200px">
                                                             <label class="radio-label">
-                                                                <input type="radio" name="faultType" value="鐜鏁呴殰">鐜鏁呴殰
+                                                                <input type="radio" name="faultType" value="浜哄憳鍘熷洜">浜哄憳鍘熷洜
                                                             </label>
                                                         </div>
                                                     </div>
                                                     <div class="layui-inline">
                                                         <div class="layui-input-inline" style="margin-left:400px">
                                                             <label class="radio-label">
-                                                                <input type="radio" name="faultType" value="澹伴煶寮傚父">澹伴煶寮傚父
+                                                                <input type="radio" name="faultType" value="璁惧寮傚父">璁惧寮傚父
                                                             </label>
                                                         </div>
                                                     </div>
@@ -126,14 +127,14 @@
                                                     <div class="layui-inline">
                                                         <div class="layui-input-inline" style="margin-left:200px">
                                                             <label class="radio-label">
-                                                                <input type="radio" name="faultType" value="鎬ц兘寮傚父">鎬ц兘寮傚父
+                                                                <input type="radio" name="faultType" value="鐗╂枡寮傚父">鐗╂枡寮傚父
                                                             </label>
                                                         </div>
                                                     </div>
                                                     <div class="layui-inline">
                                                         <div class="layui-input-inline" style="margin-left:400px">
                                                             <label class="radio-label">
-                                                                <input type="radio" name="faultType" value="娑插帇鏁呴殰">娑插帇鏁呴殰
+                                                                <input type="radio" name="faultType" value="宸ヨ壓鍘熷洜">宸ヨ壓鍘熷洜
                                                             </label>
                                                         </div>
                                                     </div>
@@ -143,14 +144,14 @@
                                                     <div class="layui-inline">
                                                         <div class="layui-input-inline" style="margin-left:200px">
                                                             <label class="radio-label">
-                                                                <input type="radio" name="faultType" value="浜轰负鏁呴殰">浜轰负鏁呴殰
+                                                                <input type="radio" name="faultType" value="妫�娴嬪師鍥�">妫�娴嬪師鍥�
                                                             </label>
                                                         </div>
                                                     </div>
                                                     <div class="layui-inline">
                                                         <div class="layui-input-inline" style="margin-left:400px">
                                                             <label class="radio-label">
-                                                                <input type="radio" name="faultType" value="纭欢鏁呴殰">纭欢鏁呴殰
+                                                                <input type="radio" name="faultType" value="涓嶅悎鏍煎師鍥�">涓嶅悎鏍煎師鍥�
                                                             </label>
                                                         </div>
                                                     </div>
@@ -172,11 +173,18 @@
         //鑾峰彇鍙傛暟
         var HICMOBillNo = "";  //宸ュ崟鍙�
         var HSourceName = "";  //璁惧
-
+        var HNumber = "";
+        var HName = "";
+        var HModel = "";
+        var HQty = "";
 
         var edit = function (data) {
             HICMOBillNo = data[0].HICMOBillNo;
             HSourceName = data[0].HSourceName;
+            //HNumber = data[0].HNumber;
+            //HName = data[0].HName;
+            //HModel = data[0].HModel;
+            //HQty = data[0].HQty;
         }
 
         layui.config({
@@ -195,7 +203,6 @@
 
 
             //#endregion
-
 
             //閫�鍑�
             form.on('submit(Exit)', function (data) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
index 4c4ff17..deed7b0 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
@@ -323,6 +323,11 @@
                 set_InitGrid();
                 setInit_PushByICMOBill(linterid);
             }
+            else if (OperationType == 5) {                                                  //娴佽浆鍗′笅鎺�
+                //瀛愯〃鍒濆鍖�
+                set_InitGrid();
+                set_ProcessBill(linterid, HEntryID);
+            }
             //#endregion
 
             //#region 鍒濆鍖栫粍缁�
@@ -412,6 +417,8 @@
                     "鐗╂枡浠ｇ爜": "",
                     "鐗╂枡鍚嶇О": "",
                     "瑙勬牸鍨嬪彿": "",
+                    "HPRocID": "0",
+                    "宸ュ簭": "",
                     "HUnitID": "0",
                     "璁￠噺鍗曚綅": "",
                     "HQty": "0",
@@ -626,6 +633,8 @@
                         , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, event: "HMaterID", edit: 'text' }//f7
                         , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: "background-color:#efefef4d;" }
                         , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: "background-color:#efefef4d;" }
+                        , { field: 'HProcID', title: 'HProcID', width: 100, style: "background-color:#efefef4d;", hide: true }
+                        , { field: '宸ュ簭', title: '宸ュ簭', width: 150 }
                         , { field: 'HUnitID', title: 'HUnitID', width: 100, style: "background-color:#efefef4d;", hide: true }
                         , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, style: "background-color:#efefef4d;" }//f7
                         , { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true, edit: 'text' }
@@ -640,10 +649,10 @@
 
                         , { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟涓诲唴鐮�', hide: true, style: 'background-color: #f9f9f9;' }     //f7
                         , { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', hide: true, style: 'background-color: #f9f9f9;' }     //f7
-                        , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', hide: true, style: 'background-color: #f9f9f9;' }     //f7
+                        , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�',  style: 'background-color: #f9f9f9;' }     //f7
                         , { field: 'HProcExchInterID', title: '宸ュ簭娴佽浆鍗″唴鐮�', hide: true, style: 'background-color: #f9f9f9;' }     //f7
                         , { field: 'HProcExchEntryID', title: '宸ュ簭娴佽浆鍗″瓙鍐呯爜', hide: true, style: 'background-color: #f9f9f9;' }     //f7
-                        , { field: 'HProcExchBillNo', title: '宸ュ簭娴佽浆鍗″彿', hide: true, style: 'background-color: #f9f9f9;' }     //f7
+                        , { field: 'HProcExchBillNo', title: '宸ュ簭娴佽浆鍗″彿', style: 'background-color: #f9f9f9;' }     //f7
                         , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', hide: true, style: 'background-color: #f9f9f9;' }     //f7
                         , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', hide: true, style: 'background-color: #f9f9f9;' }     //f7
                         , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', hide: true, style: 'background-color: #f9f9f9;' }     //f7
@@ -681,6 +690,8 @@
                     "鐗╂枡浠ｇ爜": "",
                     "鐗╂枡鍚嶇О": "",
                     "瑙勬牸鍨嬪彿": "",
+                    "HPRocID": "0",
+                    "宸ュ簭": "",
                     "HUnitID": "0",
                     "璁￠噺鍗曚綅": "",
                     "HQty": "0",
@@ -933,6 +944,95 @@
             }
             //#endregion
 
+            //#region (宸ュ簭娴佽浆鍗�)涓嬫帹椤甸潰鍒濆鍖�
+            function set_ProcessBill(linterid, HEntryID) {
+                //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+                createBillNo();
+
+                //鐩稿叧鏂囨湰妗嗕俊鎭垵濮嬪寲
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+                var ajaxLoad = layer.load();
+
+                $.ajax({
+                    url: GetWEBURL() + "/LEMS/MES_IF_ProcessBillList_Json",
+                    type: "GET",
+                    async: false,
+                    data: { "hinterid": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
+                    success: function (d) {
+                        var result = d;
+
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+
+                            //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
+                            HOrgIDBar = data.HPRDORGID;
+                            //瀛愯〃  璧嬪��
+                            var rowdata = [];
+                            for (var i = 0; i < result.data.length; i++) {
+                                rowdata.push(
+                                    {
+                                        "HMaterID": result.data[i]["HMaterID"],
+                                        "鐗╂枡浠ｇ爜": result.data[i]["浜у搧浠ｇ爜"],
+                                        "鐗╂枡鍚嶇О": result.data[i]["浜у搧鍚嶇О"],
+                                        "瑙勬牸鍨嬪彿": result.data[i]["瑙勬牸鍨嬪彿"],
+                                        "HProcID": result.data[i]["HProcID"],
+                                        "宸ュ簭": result.data[i]["宸ュ簭鍚嶇О"],
+                                        "HUnitID": result.data[i]["HUnitID"],
+                                        "璁￠噺鍗曚綅": result.data[i]["璁￠噺鍗曚綅"],
+                                        "HQty": result.data[i]["鐢熶骇浠诲姟鍗曟暟閲�"],
+                                        "HSourceID": "0",
+                                        "鐢熶骇璧勬簮": "",
+
+                                        "HRemark": "",
+                                        "HProcExchInterID": "0",
+                                        "HProcExchEntryID": "0",
+                                        "HProcExchBillNo": "",
+                                        "HICMOInterID": result.data[i]["hicmointerid"],
+                                        "HICMOEntryID": result.data[i]["HICMOEntryID"],
+                                        "HICMOBillNo": result.data[i]["浠诲姟鍗曞彿"],
+
+                                        "HProcExchInterID": result.data[i]["hmainid"],
+                                        "HProcExchEntryID": result.data[i]["HEntryID"],
+                                        "HProcExchBillNo": result.data[i]["鍗曟嵁鍙�"],
+                                      
+
+                                        "HSourceInterID": result.data[i]["hmainid"],
+                                        "HSourceEntryID": result.data[i]["HEntryID"],
+                                        "HSourceBillNo": result.data[i]["鍗曟嵁鍙�"],
+                                        "HSourceBillType": result.data[i]["鍗曟嵁绫诲瀷"],
+
+                                        "HResult": "鎶ュ簾",
+                                        "HEmpID": "0",
+                                        "妫�楠屽憳": "",
+                                        "HBadReasonID": "0",
+                                        "涓嶈壇鍘熷洜": "",
+                                        "HBarCode": "",
+                                        "HReportType": "3",
+                                        "HAddr": "",
+                                        "HMaker": "",
+                                        "HMakeDate": Format(new Date(), 'yyyy-MM-dd')
+                                    }
+                                );
+                            }
+                            option.data = rowdata;
+
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
             //#region 寮圭獥閫夋嫨鏂规硶
             //#region 鐢熶骇杞﹂棿閫夋嫨椤甸潰
             function get_checkDept() {
@@ -1017,7 +1117,7 @@
             function set_SaveBill(data) {
                 //璁板綍鎿嶄綔绫诲瀷
                 var refSav = "";
-                if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
+                if (OperationType == 1 || OperationType == 2 || OperationType == 4 || OperationType == 5) {
                     refSav = "Add";
                     data.field.HChangeDate = new Date();
                     data.field.HSTOCKORGID = data.field.HOrgID;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillMonth.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillMonth.html"
index 054a764..97d2433 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillMonth.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillMonth.html"
@@ -131,17 +131,26 @@
                 var HTitle = "";//鍥惧舰鏍囬
                 if (option.data.length > 0) {
                     var HMaterName = option.data[0].鐗╂枡鍚嶇О
+                    for (let i = 0; i < H_X.length; i++) {
+                        HProcSumNum.push(0);
+                        HQualifiedNum.push(0);
+                        HFirstPassRate.push(0);
+                    }
+                    // 濉厖鏁版嵁
                     for (let i = 0; i < option.data.length; i++) {
                         if (option.data[i].鐗╂枡鍚嶇О === HMaterName) {
-                            HProcSumNum.push(option.data[i].娉ㄥ鏁伴噺);
-                            var qualifiedRateString = option.data[i].娉ㄥ鑹巼; // "5.00%"
-                            var qualifiedRate = parseFloat(qualifiedRateString.replace('%', '')); // 绉婚櫎鐧惧垎鍙峰苟杞崲涓烘暟瀛�
-                            HQualifiedNum.push(qualifiedRate);
+                            let monthIndex = option.data[i].鏈� - 1; // 鏈堜唤鍦ㄦ暟缁勪腑鐨勭储寮曪紙娉ㄦ剰杞崲涓轰粠0寮�濮嬶級
+                            HProcSumNum[monthIndex] += option.data[i].娉ㄥ鏁伴噺;
+
+                            // 澶勭悊娉ㄥ鑹巼
+                            let qualifiedRateString = option.data[i].娉ㄥ鑹巼; // "5.00%"
+                            let qualifiedRate = parseFloat(qualifiedRateString.replace('%', '')); // 绉婚櫎鐧惧垎鍙峰苟杞崲涓烘暟瀛�
+                            HQualifiedNum[monthIndex] = qualifiedRate;
 
                             // 澶勭悊鍏ㄦ鑹巼
-                            var firstPassRateString = option.data[i].鍏ㄦ鑹巼; // "5.00%"
-                            var firstPassRate = parseFloat(firstPassRateString.replace('%', '')); // 绉婚櫎鐧惧垎鍙峰苟杞崲涓烘暟瀛�
-                            HFirstPassRate.push(firstPassRate);
+                            let firstPassRateString = option.data[i].鍏ㄦ鑹巼; // "5.00%"
+                            let firstPassRate = parseFloat(firstPassRateString.replace('%', '')); // 绉婚櫎鐧惧垎鍙峰苟杞崲涓烘暟瀛�
+                            HFirstPassRate[monthIndex] = firstPassRate;
                         }
                     }
                     //for (let i = 1; i <= 12; i++) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
index 8162b1a..e743364 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
@@ -55,6 +55,7 @@
                     <div class="layui-card-header">
                         <div class="layui-btn-group">
                             <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">淇濆瓨</button>
+                            <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSumSave">鎵归噺淇濆瓨</button>
                             <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
                             <button type="button" id="set_SaveBarCode" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBarCode" style="display:none;">鎵爜淇濆瓨</button>
                         </div>
@@ -467,6 +468,13 @@
             });
             //#endregion
 
+
+            //#region 鎵归噺淇濆瓨鎸夐挳
+            form.on('submit(btnSumSave)', function () {
+                get_SumSave();
+            });
+            //#endregion
+
             //#region 鎵笉鑹潯鐮�
             $('#HBarCode').on('keydown', function (event) {
                 if (event.keyCode == 13) {
@@ -593,7 +601,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/Sc_QualityReportBill/set_SaveBill',
                     type: "GET",
-                    data: { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HChecker": sessionStorage["HUserName"], "HBadReasonHQty": $("HBadReasonHQty").val() },
+                    data: { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HChecker": sessionStorage["HUserName"],"HBadReasonHQty": $("#HBadReasonHQty").val() },
                     success: function (result) {
                         if (result.count == 1) {
                             $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
@@ -778,6 +786,50 @@
             }
             //#endregion
 
+            //#region 鎵归噺淇濆瓨鎸夐挳
+            function get_SumSave() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板鎵归噺淇濆瓨',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: './Sc_QualityReportBillSumSave.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+
+                    },
+                    success: function (dom, index) {
+                        var data = [];
+                        data.push({
+                            "HInterID":$("#HInterID").val(),
+                            "HBillNo":$("#HBillNo").val(),
+                            "HMaterID": $("#HMaterID").val(),
+                            "HMaterName": $("#HMaterName").val(),
+                            "HProcID": $("#HProcID").val(),
+                            "HProcNo": $("#HProcNo").val(),
+                            "HGroupID": $("#HGroupID").val(),
+                            "HGroupName": $("#HGroupName").val(),
+                            "HSourceID": $("#HSourceID").val(),
+                            "HSourceName": $("#HSourceName").val(),
+                            "HICMOInterID": $("#HICMOInterID").val(),
+                            "HICMOEntryID": $("#HICMOEntryID").val(),
+                            "HICMOBillNo": $("#HICMOBillNo").val(),
+                            "HProcExchInterID": $("#HProcExchInterID").val(),
+                            "HProcExchEntryID": $("#HProcExchEntryID").val(),
+                            "HProcExchBillNo": $("#HProcExchBillNo").val()
+                        });
+
+                        //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+                        var iframe = window['layui-layer-iframe' + index];
+                        //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+                        iframe.edit(data);
+                    },
+                });
+            }
+            //#endregion
+
             //#region 鎵笉鑹潯鐮佸悗璋冪敤鐨勬樉绀烘壂鎻忚褰曟柟娉�
             function get_BarCodeDetail() {
                 var ajaxLoad = layer.load();
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillSumSave.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillSumSave.html"
new file mode 100644
index 0000000..7514c1e
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillSumSave.html"
@@ -0,0 +1,830 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>涓嶈壇閲囬泦鎵归噺淇濆瓨</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
+    <style>
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 2px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <h1 style="text-align: center; padding: 10px 0;"><b>涓嶈壇閲囬泦鎵归噺淇濆瓨</b></h1>
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">                                  
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4  layui-inline">
+                                            <label class="layui-form-label">鍗曟嵁鍙�<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline" >
+                                                <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇璁㈠崟鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0">
+                                                <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">娴佽浆鍗″彿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HProcExchInterID" id="HProcExchInterID" value="0">
+                                                <input type="hidden" name="HProcExchEntryID" id="HProcExchEntryID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">褰撳墠宸ュ簭</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HProcNo" id="HProcNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HProcID" id="HProcID" value="0">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浜у搧浠ｇ爜</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浜у搧鍚嶇О</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HMaterID" id="HMaterID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>鐢熶骇璧勬簮</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>鐢熶骇鐝粍</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HGroupName" id="HGroupName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HGroupID" id="HGroupID" value="0">
+                                            </div>
+                                        </div>
+                                    </div>                                   
+                                </div>
+                            </div>
+                            <!--鍏朵粬淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <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="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <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="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <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="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <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="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <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="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <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="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <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="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <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="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <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="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <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="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">娴佺▼</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--瀛愯〃-->
+                            <div class="layui-tab-item layui-show">
+                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                                <script type="text/html" id="toolbarDemo">
+                                    <div class="layui-btn-container">
+                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                                    </div>
+                                </script>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <!--瀛愯〃琛細鍒犻櫎-->
+    <script type="text/html" id="barDemo">
+        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+    <script>
+        var HMaterID = "";        // 鐗╂枡ID
+        var HMaterName = "";      // 鐗╂枡鍚嶇О
+        var HGroupID = "";        // 鐝粍ID
+        var HGroupName = "";      // 鐝粍鍚嶇О
+        var HSourceID = "";       // 鐢熶骇璧勬簮ID
+        var HSourceName = "";     // 鐢熸垚璧勬簮鍚嶇О
+        var HICMOInterID = "";    // 鐢熶骇璁㈠崟涓诲唴鐮�
+        var HICMOEntryID = "";    // 鐢熶骇璁㈠崟瀛愬唴鐮�
+        var HICMOBillNo = "";     // 鐢熶骇璁㈠崟鍙�
+        var HProcExchInterID = "";    // 宸ュ簭娴佽浆鍗′富鍐呯爜
+        var HProcExchEntryID = "";    // 宸ュ簭娴佽浆鍗″瓙鍐呯爜
+        var HProcExchBillNo = "";     // 宸ュ簭娴佽浆鍗″彿
+        var HProcID = "";           //宸ュ簭
+        var HProcNo = "";           //宸ュ簭鍚嶇О
+        var HInterID = "";
+        var HBillNo = "";
+       
+
+        var edit = function (data) {
+            HInterID = data[0].HInterID;
+            HBillNo = data[0].HBillNo;
+            HMaterID = data[0].HMaterID;
+            HMaterName = data[0].HMaterName;
+            HProcID = data[0].HProcID;
+            HProcNo = data[0].HProcNo;
+            HGroupID = data[0].HGroupID;
+            HGroupName = data[0].HGroupName;
+            HSourceID = data[0].HSourceID;
+            HSourceName = data[0].HSourceName;
+            HICMOInterID = data[0].HICMOInterID
+            HICMOEntryID = data[0].HICMOEntryID;
+            HICMOBillNo = data[0].HICMOBillNo
+            HProcExchInterID = data[0].HProcExchInterID;
+            HProcExchEntryID = data[0].HProcExchEntryID
+            HProcExchBillNo = data[0].HProcExchBillNo;
+        }
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙ｆā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
+
+            //妯″潡鍚�
+            var HModName = "Sc_QualityReportBillSumSave";
+            //鍏ㄥ眬鍙橀噺
+            window.HDeptType = 0;
+
+            //琛ㄦ牸娓叉煋鍙傛暟
+            var option = {};            //瀛愯〃娓叉煋鍙傛暟
+            //璁板綍缁勭粐鐨勫��
+            var HOrgIDBar = 0;
+            //鑾峰彇鍙傛暟
+            var params = getUrlVars();
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
+            var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var HEntryID = params[params[3]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            //var HProjectStageID = params[params[3]]; //闃舵鍐呯爜
+
+            //鍏ㄥ眬鍙橀噺
+
+
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+         
+
+            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { window.location.href = "../../user/login.html"; });
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍�
+
+            //#endregion
+
+            //#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
+            if (OperationType == null || OperationType == 1) {                            //鏂板
+
+                OperationType = 1;
+                $("#HInterID").val(HInterID),
+                $("#HBillNo").val(HBillNo),
+                $("#HMaterID").val(HMaterID);
+                $("#HMaterName").val(HMaterName);
+                $("#HProcID").val(HProcID);
+                $("#HProcNo").val(HProcNo);
+                $("#HGroupID").val(HGroupID);
+                $("#HGroupName").val(HGroupName);
+                $("#HSourceID").val(HSourceID);
+                $("#HSourceName").val(HSourceName);
+                $("#HICMOInterID").val(HICMOInterID);
+                $("#HICMOEntryID").val(HICMOEntryID);
+                $("#HICMOBillNo").val(HICMOBillNo);
+                $("#HProcExchInterID").val(HProcExchInterID);
+                $("#HProcExchEntryID").val(HProcExchEntryID);
+                $("#HProcExchBillNo").val(HProcExchBillNo);
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栭」鐩樁娈佃〃
+                get_InitGrid();
+
+              
+                //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+
+                //$("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+                //$("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍               
+                //$("#HSourceID").val(sessionStorage["HSourceID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+                //$("#HSourceName").val(sessionStorage["HSource"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
+
+            }
+           
+            //#endregion
+
+            //#region 鍒濆鍖栫粍缁�
+            Organ();
+            //#endregion
+
+
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 寮圭獥閫夋嫨瑙﹀彂浜嬩欢
+         
+            //#endregion
+
+            //#region 鎿嶄綔鎸夐挳瑙﹀彂浜嬩欢
+            //#region 淇濆瓨鎻愪氦
+            form.on('submit(btnSave)', function (data) {//鎻愪氦
+                if (AllowLoadData(data)) {
+                    set_AddNew(data);
+                }
+            });
+            //#endregion
+
+            //#region 閫�鍑�
+            form.on('submit(btnEdit)', function (data) {
+                if (params[1] != null) {
+                    Pub_Close(1);
+                } else if (params[1] == null) {
+                    Pub_Close(2);
+                }
+            });
+            //#endregion
+          
+            //#endregion
+
+            //#endregion
+
+            //#region 瀛愯〃锛氬ご宸ュ叿鏍忎簨浠�
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow =
+                {
+                    "HInterID": $("#HInterID").val(),
+                    "HBillNo_bak": $("#HBillNo").val(),
+                    "HMaterID": $("#HMaterID").val(),
+                    "HMaterName": $("#HMaterName").val(),
+                    "HBadReasonID": "",
+                    "HBadReasonNumber": "",
+                    "HBadReasonHName": "",
+                    "HEmpID": $("#HMaker").val(sessionStorage["HEmpID"]),
+                    "HCheckMan": $("#HMaker").val(),
+                    "HGroupID": $("#HGroupID").val(),
+                    "HGroupName": $("#HGroupName").val(),
+                    "HSourceID": $("#HSourceID").val(),
+                    "HSourceName": $("#HSourceName").val(),
+                    "HQty": "",
+                    "HSourceInterID": $("#HICMOInterID").val(),
+                    "HSourceEntryID": $("#HICMOEntryID").val(),
+                    "HSourceBillNo": $("#HICMOBillNo").val(),
+                    "HSourceBillType": "3722",
+                    "HICMOInterID": $("#HICMOInterID").val(),
+                    "HICMOEntryID": $("#HICMOEntryID").val(),
+                    "HICMOBillNo": $("#HICMOBillNo").val(),
+                    "HProcExchInterID": $("#HProcExchInterID").val(),
+                    "HProcExchEntryID": $("#HProcExchEntryID").val(),
+                    "HProcExchBillNo": $("#HProcExchBillNo").val()
+                };
+                switch (obj.event) {
+                    case 'btn-AddLine':
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+                        table.render(option);
+                       
+                        form.render('select');
+                        break;
+                    case 'btn-CopyLine':
+                        var copydata = JSON.stringify(data);
+                        if (data.length <= 0) {
+                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                        }
+                        else if (data.length > 1) {
+                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                        }
+                        else {
+                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            
+                            form.render('select');
+                        }
+                        break;
+                    //涓婁竴琛�
+                    case 'btn_up':
+                        btn_up(data);
+                        break;
+                    //涓嬩竴琛�
+                    case 'btn_under':
+                        btn_under(data);
+                        break;
+                }
+            });
+            //#endregion
+
+            //#region 瀛愯〃锛氳鍐呬簨浠�
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+            });
+            //#endregion
+
+            form.on('submit(Cancel)', function () {
+                //sessionStorage["SourceFlag"] = false;
+                parent.location.href = "../../../views/index.html"
+                //window.close();//鍏抽棴褰撳墠椤�
+            })
+
+            //#region 鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+            //#endregion
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            //#region 鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HOrgID").append(Organization);
+                            if (OperationType == 1 || OperationType == 4 || OperationType == 2) {
+                                HOrgIDBar = sessionStorage["OrganizationID"];
+                            }
+                            $("#HOrgID").val(HOrgIDBar);
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+            //#endregion
+
+
+            //#region 涓嶈壇閲囬泦琛ㄥ垵濮嬪寲
+            function get_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , limit: 100
+                    , totalRow: true
+                    , cellMinWidth: 120
+                    , height: 400
+                    , cols: [[
+                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        , { type: 'numbers', title: '搴忓彿', totalRow: true }
+                        , { field: 'HInterID', title: '涓籭d', hide: true }
+                        , { field: 'HBillNo_bak', title: '鍗曟嵁鍙�', hide: true }
+                        , { field: 'HMaterID', title: '鐗╂枡id', hide: true }
+                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', style: 'background-color: #f9f9f9;' }
+                        , { field: 'HBadReasonID', title: '涓嶈壇鍘熷洜id', hide: true }
+                        , { field: 'HBadReasonNumber', title: '涓嶈壇鍘熷洜浠ｇ爜', event: "HBadReasonNumber"}
+                        , { field: 'HBadReasonHName', title: '涓嶈壇鍘熷洜', style: 'background-color: #f9f9f9;' }
+                        , { field: 'HEmpID', title: '妫�楠屽憳id', hide: true }
+                        , { field: 'HCheckMan', title: '妫�楠屽憳', event: "HCheckMan" }
+                        , { field: 'HGroupID', title: '鐝粍id', hide: true }
+                        , { field: 'HGroupName', title: '鐢熶骇鐝粍', event: "HGroupName" }
+                        , { field: 'HSourceID', title: '鐢熶骇璧勬簮id', hide: true }
+                        , { field: 'HSourceName', title: '鐢熶骇璧勬簮', event: "HSourceName" }
+                        , { field: 'HQty', title: '涓嶈壇鏁伴噺', edit: 'text' }
+                        , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', hide: true, style: 'background-color: #f9f9f9;' }     
+                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', hide: true, style: 'background-color: #f9f9f9;' }   
+                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', hide: true, style: 'background-color: #f9f9f9;' }   
+                        , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', hide: true, style: 'background-color: #f9f9f9;' }
+
+                        , { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟涓诲唴鐮�', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', hide: true, style: 'background-color: #f9f9f9;' }
+
+                        , { field: 'HProcExchInterID', title: '宸ュ簭娴佽浆涓诲唴鐮�', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HProcExchEntryID', title: '宸ュ簭娴佽浆瀛愬唴鐮�', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HProcExchBillNo', title: '宸ュ簭娴佽浆鍗″彿', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                    ]]
+                }
+
+                var rowdata = [
+                    {
+                        "HInterID": $("#HInterID").val(),
+                        "HBillNo_bak": $("#HBillNo").val(),
+                        "HMaterID": $("#HMaterID").val(),
+                        "HMaterName": $("#HMaterName").val(),
+                        "HBadReasonID": "",
+                        "HBadReasonNumber": "",
+                        "HBadReasonHName": "",
+                        "HEmpID": $("#HMaker").val(sessionStorage["HEmpID"]),
+                        "HCheckMan": $("#HMaker").val(),
+                        "HGroupID": $("#HGroupID").val(),
+                        "HGroupName": $("#HGroupName").val(),
+                        "HSourceID": $("#HSourceID").val(),
+                        "HSourceName": $("#HSourceName").val(),
+                        "HQty": "",
+                        "HSourceInterID": $("#HICMOInterID").val(),
+                        "HSourceEntryID": $("#HICMOEntryID").val(),
+                        "HSourceBillNo": $("#HICMOBillNo").val(),
+                        "HSourceBillType": "3722",
+                        "HICMOInterID": $("#HICMOInterID").val(),
+                        "HICMOEntryID": $("#HICMOEntryID").val(),
+                        "HICMOBillNo": $("#HICMOBillNo").val(),
+                        "HProcExchInterID": $("#HProcExchInterID").val(),
+                        "HProcExchEntryID": $("#HProcExchEntryID").val(),
+                        "HProcExchBillNo": $("#HProcExchBillNo").val()
+                    }
+                ];
+                option.data = rowdata;
+                table.render(option);
+                form.render('select');
+            }
+            //#endregion
+
+           
+
+            //#region 淇濆瓨HMaker
+            function set_AddNew(data) {
+                //鑾峰彇瀛愯〃鏁版嵁
+                var num = [];
+                for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                    if (table.cache["mainTable"][i] != "") {
+                        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+                        num.push(table.cache["mainTable"][i])
+                    }
+                }
+
+
+                //鑾峰彇鎿嶄綔鏂瑰紡
+                var refSav = "";
+                if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
+                    refSav = "Add";
+                }
+                //鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
+                if (OperationType == 3) {
+                    refSav = "Update";
+                    data.field.HUpdater = sessionStorage["HUserName"];
+                    data.field.HUpdaterDate = Format(new Date(), "yyyy-MM-dd");
+                    $("#HUpdater").val(sessionStorage["HUserName"]);
+                    $("#HUpdaterDate").val(Format(new Date(), "yyyy-MM-dd"));
+                }
+
+                //鑾峰彇琛ㄥご鏁版嵁骞跺簭鍒楀寲
+                var sMainStr = JSON.stringify(data.field);              //涓昏〃鏁版嵁
+                //瀛愯〃鏁版嵁搴忓垪鍖�
+                var sSubStr = JSON.stringify(num);
+
+                //鎷兼帴搴忓垪鍖栫殑鏁版嵁
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ";" + sessionStorage["HUserName"];
+
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "Sc_MESTransFerWorkBill/SaveOA_AndengFlowRuleBill",
+                    async: true,
+                    data: { "msg": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+                            layer.close(index);
+                            layer.msg("鎻愪氦鎴愬姛");
+
+                        }
+                        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: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            //#endregion
+
+          
+
+
+            //#region 闈炵┖楠岃瘉
+            function AllowLoadData(data) {
+                //#region 琛ㄥご鏁版嵁妫�楠�
+                if ($("#HBillNo").val() == "") {
+                    layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
+                    return false;
+                }
+
+              
+
+                //#endregion
+
+
+                return true;
+            }
+            //#endregion
+
+
+            //#region 瀛愯〃锛氬垹闄ゆ寚瀹氳
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            var oldData = table.cache["mainTable"];
+                            oldData.splice(obj.tr.data('index'), 1)
+                            option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);
+                            for (var i = 0; i < oldData.length; i++) {
+                                $('#HReceiveType' + (i + 1)).find("option[value='" + oldData[i].HReceiveType + "']").attr("selected", true);
+                            }
+                            form.render('select');
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+            //#endregion
+
+            //#region 瀛愯〃锛氬揩鎹烽敭(F7)鎵撳紑寮圭獥
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        if (obj.event == "HBadReasonNumber") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim"                           //鍔犱笂杈规
+                                , title: "涓嶈壇鍘熷洜"                             //鏍囬
+                                , closeBtn: 1                                       //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2                                          //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"]                              //绐椾綋澶у皬
+                                , maxmin: true                                      //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.html', "yes"]
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    obj.update({
+                                        "HBadReasonID": checkStatus.data[0].HItemID
+                                        , "HBadReasonNumber": checkStatus.data[0].涓嶈壇鍘熷洜浠ｇ爜
+                                        , "HBadReasonHName": checkStatus.data[0].涓嶈壇鍘熷洜鍚嶇О
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , btn2: function (index, layero) { }                                
+                            })
+                        }
+                        if (obj.event == "HCheckMan") {
+                            layer.open({
+                                type: 2//寮圭獥绫诲瀷
+                                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                                , area: ['90%', '90%']//澶у皬
+                                , title: '妫�楠屽憳鍒楄〃'//鏍囬
+                                , shift: 2//寮瑰嚭鍔ㄧ敾
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?type=HEmp', 'yes']
+                                , btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    obj.update({
+                                        "HEmpID": checkStatus.data[0].HItemID
+                                        , "HCheckMan": checkStatus.data[0].鑱屽憳鍚嶇О
+                                    })
+                                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                                }
+                                , btn2: function (index, layero) { }
+                            })
+                        }
+                        if (obj.event == "HGroupName") {
+                            layer.open({
+                                type: 2//寮圭獥绫诲瀷
+                                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                                , area: ['90%', '90%']//澶у皬
+                                , title: '鐝粍鍒楄〃'//鏍囬
+                                , shift: 2//寮瑰嚭鍔ㄧ敾
+                                , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?type=HGroup', 'yes']
+                                , btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    obj.update({
+                                        "HGroupID": checkStatus.data[0].HItemID
+                                        , "HGroupName": checkStatus.data[0].鐝粍鍚嶇О
+                                    })
+                                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                                }
+                                , btn2: function (index, layero) { }
+                            })
+                        }
+                        if (obj.event == "HSourceName") {
+                            layer.open({
+                                type: 2//寮圭獥绫诲瀷
+                                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                                , area: ['90%', '90%']//澶у皬
+                                , title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬
+                                , shift: 2//寮瑰嚭鍔ㄧ敾
+                                , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+                                , btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    obj.update({
+                                        "HSourceID": checkStatus.data[0].HItemID
+                                        , "HSourceName": checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О
+                                    })
+                                 
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                                }
+                                , btn2: function (index, layero) { }
+                            });
+                        }
+                        obj.event = "";
+                        return false;
+                    }
+                })
+            }
+            //#endregion
+
+
+
+            //#endregion
+
+
+
+
+        });
+    
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserGroupListEdit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserGroupListEdit.html"
index e93fad5..f3a6409 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserGroupListEdit.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserGroupListEdit.html"
@@ -76,11 +76,12 @@
                                             <label class="layui-form-label" style="width: 85px;">绾у埆</label>
                                             <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                                 <select name="HLev" id="HLev" lay-verify="HLev">
-                                                    <option value="1鎬荤粡鐞嗙骇">1鎬荤粡鐞嗙骇</option>
-                                                    <option value="2鍓�荤骇">2鍓�荤骇</option>
+                                                    <option value="1鎬荤粡鐞嗙骇">1鎬荤粡鐞�</option>
+                                                    <option value="2鍓�荤骇">2鍓�荤粡鐞�</option>
+                                                    <option value="2璐ㄩ噺鎬荤洃">2璐ㄩ噺鎬荤洃</option>
                                                     <option value="3閮ㄩ暱绾�">3閮ㄩ暱绾�</option>
                                                     <option value="4涓荤绾�">4涓荤绾�</option>
-                                                    <option value="5鍛樼骇">5鍛樼骇</option>
+                                                    <option value="5鐝粍闀跨骇">5鐝粍闀跨骇</option>
                                                 </select>
                                             </div>
                                         </div>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html"
index d0df943..3336a2a 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html"
@@ -113,6 +113,13 @@
                                                 <input type="datetime" name="HEndDate" class="layui-input LineHeight" id="HEndDate" placeholder="璇烽�夋嫨鏃ユ湡" style="border-radius: 50px;">
                                             </td>
                                         </tr>
+                                        <tr>
+                                            <th>鏈�缁堢粨璁�</th>
+                                            <td class="bz_td">
+                                                <input type="radio" name="HLastResult" value="OK" title="OK" checked="">
+                                                <input type="radio" name="HLastResult" value="NG" title="NG">
+                                            </td>
+                                        </tr>
                                         <tr style="display:none;">
                                             <th>鏁�&ensp;&ensp;&ensp;&ensp;閲�</th>
                                             <td class="bz_td">
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/OA_AndengFlowRuleBillMain.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/OA_AndengFlowRuleBillMain.html"
index ee41153..32bf96b 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/OA_AndengFlowRuleBillMain.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/OA_AndengFlowRuleBillMain.html"
@@ -568,7 +568,7 @@
                         , "HDutyName": ""
                         , "HTimes": ""
                         , "HRemark": ""
-                        , "HReceiveType": ""
+                        , "HReceiveType": "鐭俊" 
                         , "HSourceInterID": "0"
                         , "HSourceEntryID": "0"
                         , "HSourceBillNo": ""
@@ -613,7 +613,7 @@
                         }
                         //鑾峰彇鏁版嵁
                         $("#HErrMsgBackTypeID").val(checkStatus.data[0].HItemID);//宀椾綅id
-                        $("#HErrMsgBackTypeName").val(checkStatus.data[0].宀椾綅鍚嶇О);//宀椾綅鍚嶇О
+                        $("#HErrMsgBackTypeName").val(checkStatus.data[0].寮傚父鍙嶉绫诲瀷鍚嶇О);//宀椾綅鍚嶇О
 
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
                     }
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
index ecc561f..0931266 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
@@ -867,6 +867,7 @@
                             $("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
                             $("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
                             $("#HProcName").val(data.褰撳墠宸ュ簭);//
+                            $("#HBatchNo").val(data.鎵瑰彿);
                             //鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
                             get_CheckItem();
                         } else {
@@ -1454,7 +1455,7 @@
                 var ajaxLoad = layer.load();
                 var sWhere = " and hmainid=" + linterid;
                 $.ajax({
-                    url: GetWEBURL() + "/QC_PatrolProcCheckOtherBill/QC_PatrolProcCheckOtherBillList",
+                    url: GetWEBURL() + "/QC_PatrolProcCheckOtherBill/QC_PatrolProcCheckOtherBillList_Edit",
                     type: "GET",
                     data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (result) {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index 103433b..1b64b06 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -1390,7 +1390,7 @@
                 var ajaxLoad = layer.load();
                 var sWhere = " and hmainid=" + linterid;
                 $.ajax({
-                    url: GetWEBURL() + "/QC_ProcessCheckBill/QC_ProcessCheckBillList",
+                    url: GetWEBURL() + "/QC_ProcessCheckBill/QC_ProcessCheckBill_Edit",
                     type: "GET",
                     data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (result) {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html"
index ec082e7..11af015 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html"
@@ -390,7 +390,7 @@
                 var ajaxLoad = layer.load();
                 $.ajax({
                     //h_v_QC_ProcessCheckBill
-                    url: GetWEBURL() + '/QC_ProcessCheckBill/QC_ProcessCheckBillList',
+                    url: GetWEBURL() + '/QC_ProcessCheckMainBill/QC_ProcessCheckMainBillList',
                     type: "GET",
                     async: true,
                     data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery.html"
new file mode 100644
index 0000000..9d77cb9
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery.html"
@@ -0,0 +1,446 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>寮傚父鍙嶉鏌ヨ鍒楄〃</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/grwebapp.js"></script>
+    <script src="../../../layuiadmin/HideButton.js"></script>
+    <script src="../../../layuiadmin/soulTable.slim.js"></script>
+
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-tab layui-tab-card" style="margin-top:20px;">
+                            <ul class="layui-tab-title">
+                                <li class="layui-this">鎴戞帴鏀剁殑</li>
+                                <li>鎴戝彂閫佺殑</li>
+                                <li>鎶勯�佹垜鐨�</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <!--鎴戞帴鏀剁殑-->
+                                    <table class="layui-hide" id="mainTable_receive" lay-filter="mainTable_receive"></table>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <!--鎴戝彂閫佺殑-->
+                                    <table class="layui-hide" id="mainTable_send" lay-filter="mainTable_send"></table>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <!--鎶勯�佹垜鐨�-->
+                                    <table class="layui-hide" id="mainTable_copy" lay-filter="mainTable_copy"></table>
+                                </div>
+                            </div>
+                        </div>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTSign-in" id="btn-XTSign-in"><i class="layui-icon layui-icon-radio"></i>涓嬫帹寮傚父鍙嶉绛惧埌鍗�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTReceive" id="btn-XTReceive"><i class="layui-icon layui-icon-radio"></i>涓嬫帹寮傚父鍙嶉澶勭悊鍗�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-View" id="btn-View"><i class="layui-icon layui-icon-radio"></i>鏌ョ湅</button>
+                            </div>
+                        </script>
+                        <script type="text/html" id="toolbarDemo1">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTCheck" id="btn-XTCheck"><i class="layui-icon layui-icon-radio"></i>涓嬫帹寮傚父鍙嶉楠屾敹鍗�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-View1" id="btn-View1"><i class="layui-icon layui-icon-radio"></i>鏌ョ湅</button>
+                            </div>
+                        </script>
+                        <script type="text/html" id="toolbarDemo2">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-View2" id="btn-View2"><i class="layui-icon layui-icon-radio"></i>鏌ョ湅</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙ｆā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+                , soulTable = layui.soulTable
+            var sWhere = "";
+            var option_receive = "";  //鏈畬鎴�
+            var option_copy = ""; //宸插畬鎴�
+            var option_send = ""; //姝ｅ湪杩涜
+            var ins;
+            //var TableTab = "mainTable_receive";  //鍒濆鍖栭〉闈㈡椂榛樿涓� 鈥滄湭瀹屾垚鈥� 椤电
+            //var cur_title = "鏈畬鎴�"; //褰撳墠閫変腑椤电
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //
+            var HModName = "OA_ErrMsgBackSelfQuery";
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堟垜鎺ユ敹鐨勶級
+            var titleData = ["HInterID", "HEntryID", "HDeptID", "HRecDeptID", "HHandleEmpID","HErrMsgBackTypeID"];
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堟垜鍙戦�佺殑锛�
+            var titleData = ["HInterID", "HEntryID", "HDeptID", "HRecDeptID", "HHandleEmpID","HErrMsgBackTypeID"];
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堟妱閫佹垜鐨勶級
+            var titleData = ["HInterID", "HEntryID", "HDeptID", "HRecDeptID", "HHandleEmpID","HErrMsgBackTypeID"];
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#endregion         
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+            function set_ClearBill() {
+                //鍒濆鍖栨帴鏀跺垪琛�
+                set_InitGrid_notStart();
+                //鍒濆鍖栧彂閫�
+                set_InitGrid_send();
+                //鍒濆鍖栨妱閫佸垪琛�
+                set_InitGrid_copy();
+                //鏌ヨ
+                get_Display();
+            }
+
+            table.on('toolbar(mainTable_receive)', function (obj) {
+                switch (obj.event) {
+                    //涓嬫帹寮傚父鍙嶉绛惧埌鍗�
+                    case 'btn-XTSign-in': XTSign();
+                        break;
+                    //涓嬫帹寮傚父鍙嶉澶勭悊鍗�
+                    case 'btn-XTReceive': XTReceive();
+                        break;
+                    //鏌ョ湅
+                    case 'btn-View': View();
+                        break;
+
+                };
+            });
+            table.on('toolbar(mainTable_send)', function (obj) {
+                switch (obj.event) {
+                    //涓嬫帹寮傚父鍙嶉楠屾敹鍗�
+                    case 'btn-XTCheck': XTCheck();
+                        break;
+                    //鏌ョ湅
+                    case 'btn-View1': View();
+                        break;
+                };
+            });
+            table.on('toolbar(mainTable_copy)', function (obj) {
+                switch (obj.event) {                   
+                    //鏌ョ湅
+                    case 'btn-View2': View();
+                        break;
+                };
+            });
+         
+
+            //鍒濆鍖栨帴鏀跺垪琛�
+            function set_InitGrid_notStart() {
+                option_receive = {
+                    elem: '#mainTable_receive'
+                    , toolbar: '#toolbarDemo'
+                    , page: true
+                    , totalRow: true
+                    , height: 300
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , cols: []
+                };
+                //table.render(option);
+            }
+
+            //鍒濆鍖栧彂閫佸垪琛�
+            function set_InitGrid_send() {
+                option_send = {
+                    elem: '#mainTable_send'
+                    , toolbar: '#toolbarDemo1'
+                    , page: false
+                    , height: 500
+                    , totalRow: true
+                    , cellMinWidth: 90
+                    , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+                    , cols: []
+                };
+            }
+
+            //鍒濆鍖栨妱閫佸垪琛�
+            function set_InitGrid_copy() {
+                option_copy = {
+                    elem: '#mainTable_copy'                  
+                    , page: false
+                    , height: 500
+                    , totalRow: true
+                    , cellMinWidth: 90
+                    , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+                    , cols: []
+                };
+            }         
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_MESTransFerWorkBill/GetSc_MESTransFerWorkBillQuery',
+                    type: "GET",
+                    async: false,
+                    data: {  "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+
+                            //鎴戞帴鏀剁殑
+                            option_receive = {
+                                elem: '#mainTable_receive'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data.h_p_OA_ErrMsgBackSelfQuery
+                                , height: 'full-80'
+                                , page: true
+                                , totalRow: true
+                                , limits: [50, 500, 5000, 50000]
+                                , limit: 50
+                                , cellMinWidth: 90
+                            }
+                            table.render(option_receive);
+                            ins = table.render(option_receive);
+
+                            //鎴戝彂閫佺殑
+                            option_send = {
+                                elem: '#mainTable_send'
+                                , toolbar: '#toolbarDemo1'
+                                , cols: [col]
+                                , data: data1.data.h_p_OA_ErrMsgBackSelfQuery1
+                                , height: 'full-80'
+                                , page: true
+                                , totalRow: true
+                                , limits: [50, 500, 5000, 50000]
+                                , limit: 50
+                                , cellMinWidth: 90
+                            }
+                            table.render(option_send);
+
+                            //鎶勯�佹垜鐨�
+                            option_copy = {
+                                elem: '#mainTable_copy'
+                                , toolbar: '#toolbarDemo2'
+                                , cols: [col]
+                                , data: data1.data.h_p_OA_ErrMsgBackSelfQuery2
+                                , height: 'full-80'
+                                , page: true
+                                , totalRow: true
+                                , limits: [50, 500, 5000, 50000]
+                                , limit: 50
+                                , cellMinWidth: 90
+                            }
+                            table.render(option_copy);
+
+                          
+
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                            var HBillType = "寮傚父鍙嶉鏌ヨ";
+                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                           // DisPlay_HideColumn();
+
+                            layer.close(ajaxLoad);
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+
+            }
+            //#endregion
+
+            //#region 瀵煎嚭Execel
+            function get_Export() {
+                var data = option_receive.data
+                data.forEach((item) => {
+                    // 濡傛灉鏌愪釜瀛楁鐨勫�煎お闀匡紝闇�瑕佸幓闄ゆ崲琛岀
+                    if (item.浠诲姟鎻忚堪.length > 0) {  // 鍋囪瀛楁鍚嶄负field
+                        item.浠诲姟鎻忚堪 = item.浠诲姟鎻忚堪.replace(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                    }
+                });
+                table.exportFile(ins.config.id, data, "xls");
+            }
+            //#endregion
+
+            //涓嬫帹寮傚父鍙嶉澶勭悊鍗�
+            function XTReceive() {
+                var checkStatus = table.checkStatus('mainTable_receive')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HInterID.toString();
+                    layer.open({
+                        type: 2
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['100%', '100%']
+                        , title: '鏂板寮傚父鍙嶉鎺ユ敹鍗�'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackHandleBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=1&HSouceBillType=' + 4502 + ''
+                        , btn: [],
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                }
+            }      
+
+            //涓嬫帹寮傚父鍙嶉绛惧埌鍗�
+            function XTSign() {
+                var checkStatus = table.checkStatus('mainTable_receive')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HInterID.toString();
+                    layer.open({
+                        type: 2
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['100%', '100%']
+                        , title: '鏂板寮傚父鍙嶉绛惧埌鍗�'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackSignBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=1&HSouceBillType=' + 4502 + ''
+                        , btn: [],
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                }
+            }
+
+            //涓嬫帹寮傚父鍙嶉楠屾敹鍗�
+            function XTCheck() {
+                var checkStatus = table.checkStatus('mainTable_send')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HInterID.toString();
+                    layer.open({
+                        type: 2
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['100%', '100%']
+                        , title: '鏂板寮傚父鍙嶉楠屾敹鍗�'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackCheckBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=1&HSouceBillType=' + 4502 + ''
+                        , btn: [],
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                }
+            }
+
+
+            //#region 姹囨姤
+            function View() {
+                var activeTab = getActiveTab();
+
+                if (activeTab == "鎴戞帴鏀剁殑") {
+                    var checkStatus = table.checkStatus('mainTable_receive')
+                        , data = checkStatus.data;
+                } else if (activeTab == "鎴戝彂閫佺殑") {
+                    var checkStatus = table.checkStatus('mainTable_send')
+                        , data = checkStatus.data;
+                } else if (activeTab == "鎶勯�佹垜鐨�") {
+                    var checkStatus = table.checkStatus('mainTable_copy')
+                        , data = checkStatus.data;
+                }
+
+                var HInterID = data[0].HInterID;
+                if (data.length == 1) {
+                    layer.open({
+                        type: 2
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['100%', '100%']
+                        , title: '宸ヤ綔浠诲姟-涓嬫帹'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/Sc_Add_MESExecptFeedBackBillList.html?OperationType=5&linterid=' + HInterID + '&HEntryID=1&HSouceBillType=' + 4502 + ''
+                        , btn: ['纭畾'],
+                        // 鎸夐挳1 鐨勫洖璋�
+                        btn1: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹笅鎺紒');
+                }
+            }
+            //#endregion
+
+       
+            // 鑾峰彇鏍囩
+            function getActiveTab() {
+                var tabs = document.getElementsByClassName("layui-tab-title")[0].getElementsByTagName("li");
+                var activeTab;
+                for (var i = 0; i < tabs.length; i++) {
+                    if (tabs[i].classList.contains("layui-this")) {
+                        activeTab = tabs[i].innerText;
+                        break;
+                    }
+                }
+                return activeTab;
+
+            }
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+</body>
+</html>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
index abfd8e7..043c41e 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
@@ -15,6 +15,7 @@
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script src='../../../layuiadmin/lib/extend/echarts.min.js'></script>
+    <script src="../../../layuiadmin/soulTable.slim.js"></script>
     <style type="text/css">
         input.layui-input.layui-unselect {
             padding-right: 0;
@@ -55,9 +56,11 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">宸ュ簭</label>
-                                    <div class="layui-input-block" style="margin-left: 120px;">
-                                        <input type="text" class="layui-input" name="HProcName" id="HProcName">
+                                    <label class="layui-form-label">鏍锋湰鏁�</label>
+                                    <div class="layui-input-block">
+                                        <select name="limit" id="limit" lay-verify="required" lay-search class="layui-input">
+                                            <!--鍔ㄦ�佹覆鏌撹溅闂�-->
+                                        </select>
                                     </div>
                                 </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -69,21 +72,25 @@
                                     <div class="layui-row" style="margin-top:10px;">
                                         <!--鍏朵粬鏉′欢-->
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鐗╂枡浠ｇ爜</label>
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠ｇ爜</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
+                                                <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0">
+                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px; margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <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="HMaterName" id="HMaterName">
+                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <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="HMaterModel" id="HMaterModel">
+                                                <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -95,9 +102,13 @@
                                     </div>
                                     <div class="layui-row" style="margin-top:5px;">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">妫�楠岄」鐩�</label>
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠岄」鐩�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HCheckItem" id="HCheckItem">
+                                                <input type="hidden" class="layui-input" lay-verify="HQCCheckItemID" name="HQCCheckItemID" id="HQCCheckItemID" value="0">
+                                                <input type="text" class="layui-input" name="HQCCheckItemNumber" id="HQCCheckItemNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHQCCheckItemID" id="btnHQCCheckItemID" style="padding: 0 10px;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -175,7 +186,7 @@
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index', //涓诲叆鍙ｆā鍧�
-        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
 
             //#region 鍏叡鍙橀噺
             var $ = layui.$
@@ -187,6 +198,7 @@
                 , laypage = layui.laypage
                 , laydate = layui.laydate
                 , util = layui.util
+                , soulTable = layui.soulTable
             //鏌ヨ鏉′欢
             var sWhere = "";
             var option = [];
@@ -215,6 +227,19 @@
                         break;
                 };
             });
+
+            //#region 浜у搧缂栫爜
+            form.on('submit(btnHMaterID)', function (data) {
+                btnHMaterID();
+            });
+        //#endregion
+
+            //#region 妫�楠岄」鐩�
+            form.on('submit(btnHQCCheckItemID)', function (data) {
+                btnHQCCheckItemID();
+            });
+        //#endregion
+
             //閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
                 set_ClearQuery();
@@ -269,101 +294,74 @@
             //鍒濆鍖栫晫闈�
             function set_ClearBill() {
                 get_Dept();
+                get_Limit();
                 //鍒濆鍖栨椂闂�
                 $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
                 $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
-                //鍔犺浇鏁版嵁鍒扮綉鏍�
-                get_Display();
                 //get_FastQuery();
                 DisPlay_HideColumn();
-                set_Line();
+                //set_Line();
             }
 
             //鍒濆鍖栬〃鏍�
             function set_InitGrid() {
+                var columns = [];
+
+                columns.push({ type: 'numbers', title: '搴忓彿' });
+            
+                //鑾峰彇涓や釜鏈堟湡涔嬮棿鐨勭浉宸�
+                var time1 = Date.parse(new Date($("#HBeginDate").val()));//寮�濮嬫椂闂�
+                var time2 = Date.parse(new Date($("#HEndDate").val()));//缁撴潫鏃堕棿
+                var Days = Math.abs(parseInt((time2 - time1) / 1000 / 3600 / 24));
+                //鑾峰彇骞�
+                var yyyy = new Date($("#HBeginDate").val()).getFullYear();
+                //鑾峰彇鏈堜唤
+                var MM = new Date($("#HBeginDate").val()).getMonth() + 1;
+                //鑾峰彇寮�濮嬫湀浠界殑鏈�澶уぉ鏁�
+                var SumMonth = new Date(yyyy, MM, 0).getDate(); //鍔ㄦ�佷袱鏈堜箣宸�
+                //鑾峰彇寮�濮嬫棩鏈熺殑澶╂暟
+                var HBEGINDATE = new Date(new Date($("#HBeginDate").val())).getDate(); //鑾峰彇寮�濮嬫棩鏈熷ぉ鏁�
+
+                var k = 0;//鏀堕泦寰幆娆℃暟
+                for (var j = 0; j <= (Days - k); j++) {
+                    columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70, totalRow: true })
+                    //璺ㄥ勾鐨勮瘽 浼氫粠涓�鏈堜竴鍙峰紑濮�
+                    if (MM == 12 && (HBEGINDATE + j) == 31) {
+                        yyyy += 1;
+                        MM = 1;
+                        SumMonth = new Date(yyyy, MM, 0).getDate();
+                        HBEGINDATE = 0;
+                        k += j;
+                        j = 0;
+                    } else if ((HBEGINDATE + j) == SumMonth) { //璺ㄦ湀 鏈堟暟鍔犱竴  澶╂暟浠庝竴寮�濮�
+                        HBEGINDATE = 0;
+                        MM += 1;
+                        SumMonth = new Date(yyyy, MM, 0).getDate();
+                        k += j;
+                        j = 0;
+                    }
+                }
+
                 option = {
                     elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
-                    , height: 'full-430'
-                    //, page: true
+                    , height: 'full-50'
+                    , cellMinWidth: 90
+                    , limit: 500
                     , totalRow: true
-                    , cellMinWidth: 70
-                    , limit: 50
-                    , limits: [50, 500, 5000, 20000]
-                    , cols: [[
-                        { type: 'checkbox', fixed: 'left', totalRowText: '鈭慩' }
-                        ,{ field: 'xh', title: '搴忓彿' }
-                        , { field: '1', title: '1' , totalRow: true}
-                        , { field: '2', title: '2' , totalRow: true}
-                        , { field: '3', title: '3' , totalRow: true}
-                        , { field: '4', title: '4' , totalRow: true}
-                        , { field: '5', title: '5' , totalRow: true}
-                        , { field: '6', title: '6' , totalRow: true}
-                        , { field: '7', title: '7' , totalRow: true}
-                        , { field: '8', title: '8' , totalRow: true}
-                        , { field: '9', title: '9', totalRow: true}
-                        , { field: '10', title: '10' , totalRow: true}
-                        , { field: '11', title: '11' , totalRow: true}
-                        , { field: '12', title: '12' , totalRow: true}
-                        , { field: '13', title: '13' , totalRow: true}
-                        , { field: '14', title: '14' , totalRow: true}
-                        , { field: '15', title: '15' , totalRow: true}
-                        , { field: '16', title: '16' , totalRow: true}
-                        , { field: '17', title: '17' , totalRow: true}
-                        , { field: '18', title: '18' , totalRow: true}
-                        , { field: '19', title: '19' , totalRow: true}
-                        , { field: '20', title: '20' , totalRow: true}
-                        , { field: '21', title: '21' , totalRow: true}
-                        , { field: '22', title: '22' , totalRow: true}
-                        , { field: '23', title: '23' , totalRow: true}
-                        , { field: '24', title: '24' , totalRow: true}
-                        , { field: '25', title: '25', totalRow: true}
-                    ]]
-                    , data: []
-                }
-                var sj = [];
-                for (let i = 0; i < 5; i++) {
-                    var obj = {
-                        xh : i+1,
-                        1: (Math.random() * (15 - 13) ).toFixed(2),
-                        2: (Math.random() * (15 - 13) ).toFixed(2),
-                        3: (Math.random() * (15 - 13) ).toFixed(2),
-                        4: (Math.random() * (15 - 13) ).toFixed(2),
-                        5: (Math.random() * (15 - 13) ).toFixed(2),
-                        6: (Math.random() * (15 - 13) ).toFixed(2),
-                        7: (Math.random() * (15 - 13) ).toFixed(2),
-                        8: (Math.random() * (15 - 13) ).toFixed(2),
-                        9: (Math.random() * (15 - 13) ).toFixed(2),
-                        10: (Math.random() * (15 - 13) ).toFixed(2),
-                        11: (Math.random() * (15 - 13) ).toFixed(2),
-                        12: (Math.random() * (15 - 13) ).toFixed(2),
-                        13: (Math.random() * (15 - 13) ).toFixed(2),
-                        14: (Math.random() * (15 - 13) ).toFixed(2),
-                        15: (Math.random() * (15 - 13) ).toFixed(2),
-                        16: (Math.random() * (15 - 13) ).toFixed(2),
-                        17: (Math.random() * (15 - 13) ).toFixed(2),
-                        18: (Math.random() * (15 - 13) ).toFixed(2),
-                        19: (Math.random() * (15 - 13) ).toFixed(2),
-                        20: (Math.random() * (15 - 13) ).toFixed(2),
-                        21: (Math.random() * (15 - 13) ).toFixed(2),
-                        22: (Math.random() * (15 - 13) ).toFixed(2),
-                        23: (Math.random() * (15 - 13) ).toFixed(2),
-                        24: (Math.random() * (15 - 13) ).toFixed(2),
-                        25: (Math.random() * (15 - 13) ).toFixed(2)
-                    };
-                    sj.push(obj);
-                }
-                option.data = sj;
-
-
+                    , loading: false
+                    , cols: [columns]
+                    , done: function (res, curr, count) {
+                        soulTable.render(this);
+                    }
+                };
                 table.render(option);
             }
 
             //鍔犺浇缃戞牸
             function get_Display(sWhere) {
-                sWhere = $("#HYear").val();
                 var wait = layer.load();//閬僵
                 $.ajax({
                     url: GetWEBURL() + '/QC_CustomerAppealReport/QC_InspectionFormReport',
@@ -371,34 +369,8 @@
                     async: false,
                     data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
-                        var col = [];
                         if (data1.count == 1) {
-                            var data = [];
-                            //缁欑┖鐨勬暟缁勮祴鍊�
-                            for (var key in data1.list) {
-                                data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
-                            }
-                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '姹囨��' });
-                            //鍒ゆ柇鏄惁鏄函鑻辨枃
-                            var patrn = new RegExp("[\u4E00-\u9FA5]+");
-                            for (var i = 0; i < data.length; i++) {
-                                if (!patrn.test(data[i].name)) {
-                                    col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
-                                }
-                                else {
-                                    switch (data[i].Type) {
-                                        case 'DateTime':
-                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
-                                            break;
-                                        default:
-                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true });
-                                    }
-                                }
-                            }
-
-                            option.cols = [col];
                             option.data = data1.data;
-
                             table.render(option);
                             layer.close(wait);
                         } else {
@@ -563,18 +535,8 @@
                     success: function (result) {
                         if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             var data = result.data;
-                            if (sessionStorage["OrganizationID"] == 100014) {
-                                HDeptName += '<option  style="color:blue;"  value="2679633" >姘寸涓�鏉℃祦</option>';
-                                HDeptName += '<option  style="color:blue;"  value="1592361" >閮ㄤ欢娌瑰喎鍣ㄥ反</option>';
-                                HDeptName += '<option  style="color:blue;"  value="1592371" >灏忚溅瑁呰姱宸�</option>';
-                                HDeptName += '<option  style="color:blue;"  value="1592374" >灏忚溅鎬绘垚宸�</option>';
-                                HDeptName += '<option  style="color:blue;"  value="1743766" >鍗¤溅瑁呰姱宸�</option>';
-                                HDeptName += '<option  style="color:blue;"  value="1743767" >鍗¤溅鎬绘垚宸�</option>';
-                                HDeptName += '<option  style="color:blue;"  value="2679647" >鍗¤溅姘寸涓�鏉℃祦</option>';
-                            } else {
-                                for (var i = 0; i < data.length; i++) {
-                                    HDeptName += '<option  style="color:blue;"  value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
-                                }
+                            for (var i = 0; i < data.length; i++) {
+                                HDeptName += '<option  style="color:blue;"  value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
                             }
 
                             $("#HDeptName").append(HDeptName);
@@ -585,70 +547,104 @@
                 })
             }
 
+            //鏍锋湰鏁伴噺
+            function get_Limit() {
+                var limit = "";
+                for (var i = 1; i <= 50; i++) {
+                    limit += '<option  style="color:blue;"  value="' + i + '" >' + i + '</option>';
+                }
+                $("#limit").append(limit);
+                form.render('select');
+            }
+
             //蹇�熻繃婊�
             function get_FastQuery() {
                 var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
                 var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
-                var HBillNo = $("#HBillNo").val();//娴佽浆鍗″彿
-                var HICMOBillNo = $("#HICMOBillNo").val(); //鎵瑰彿
-                var HWorkShopID = $("#HDeptName").val();//杞﹂棿
-                var F_BSV_WYID = $("#F_BSV_WYID").val();//鍞竴ID
-                var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
-                var HState = $("#HState").val();//鐘舵��
-                var HSTATUS = $("#HSTATUS").val();//鐢熶骇璁㈠崟鐘舵��
-                var HOrgID = sessionStorage["OrganizationID"];
-                var checkWRuku = $("input[name='checkWRuku']").prop("checked");//澶嶉�夋
-                var ColName = $("#ColName").val();//澶嶉�夋
-                var Comparator = $("#Comparator").val()
-                var ColContent = $("#ColContent").val();
-                var sWhere1 = "";
-                if (ColName != 0 && Comparator != 0) {
-                    var com = "";
-                    switch (Comparator) {
-                        case "7":
-                            com = "like''%" + ColContent + "%''";
-                            break;
-                        case "8":
-                            com = "like''%" + ColContent + "''";
-                            break;
-                        case "9":
-                            com = "like''" + ColContent + "%''";
-                            break;
-                        case "10":
-                            com = "not like''%" + ColContent + "%''";
-                            break;
-                        default:
-                            com = "" + Comparator + "''" + ColContent + "''";
-                            break;
-                    }
-                    sWhere1 += " and " + ColName + " " + com;
+                var HDeptID = $("#HDeptName").val();//杞﹂棿
+                var limit = $("#limit").val();//鏍锋湰鏁�
+                var HMaterID = $("#HMaterID").val();//鐗╂枡
+                var HQCCheckItemID = $("#HQCCheckItemID").val();//妫�楠岄」鐩�
+
+                if (limit == 0) {
+                    return layer.msg("鏍锋湰鏁伴噺涓嶈兘涓�0!");
                 }
 
-                if (checkWRuku) {
-                    checkWRuku = 1;
-                } else {
-                    checkWRuku = 0;
+                if (HMaterID == 0) {
+                    return layer.msg("鐗╂枡涓嶈兘涓虹┖!");
+                }
+
+                if (HQCCheckItemID == 0) {
+                    return layer.msg("妫�楠岄」鐩笉鑳戒负绌�!");
                 }
 
                 sWhere = {
                     HBeginDate: HBeginDate
                     , HEndDate: HEndDate
-                    , HICMOBillNo: HICMOBillNo
-                    , HWorkShopID: HWorkShopID
-                    , F_BSV_WYID: F_BSV_WYID
-                    , HMaterNumber: HMaterNumber
-                    , HOrgID: HOrgID
-                    , HBillNo: HBillNo
-                    , IsTrue: checkWRuku
-                    , HState: HState
-                    , HSTATUS: HSTATUS
-                    , sWhere1: sWhere1
+                    , HDeptID: HDeptID
+                    , limit: limit
+                    , HMaterID: HMaterID
+                    , HQCCheckItemID: HQCCheckItemID
                 }
 
-                //get_Display(JSON.stringify(sWhere));
+                get_Display(JSON.stringify(sWhere));
                 //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
                 sWhere = "";
             }
+
+            //鐗╂枡鍒楄〃
+            function btnHMaterID() {
+                layer.open({
+                    type: 2 //绫诲瀷
+                    , skin: 'layui-layer-rim'//鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鐗╂枡鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HMaterID").val(checkStatus.data[0].HItemID);
+                        $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);
+                        $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                        $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+
+            //妫�楠岄」鐩垪琛�
+            function btnHQCCheckItemID() {
+                layer.open({
+                    type: 2 //绫诲瀷
+                    , skin: 'layui-layer-rim'//鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '妫�楠岄」鐩垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HQCCheckItemID").val(checkStatus.data[0].HItemID);
+                        $("#HQCCheckItemNumber").val(checkStatus.data[0].浠ｇ爜);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+
+
             //閲嶇疆杩囨护鏉′欢
             function set_ClearQuery() {
                 $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
@@ -666,32 +662,6 @@
                 $("input[name='checkWRuku']").prop("checked", false);
                 form.render()
                 sWhere = "";
-            }
-
-            //鐗╂枡
-            function get_btnHMaterID() {
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '鐗╂枡'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
-                    , btn: ['纭畾', '鍙栨秷']
-                    , btn1: function (index, layero) {
-
-                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                        if (checkStatus.data.length === 0) {
-                            return layer.msg('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HMaterID").val(checkStatus.data[0].HItemID);
-                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
-                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
-                    }
-                })
             }
 
             //闅愯棌鍒楄缃�
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 606b04b..df96f65 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -1495,7 +1495,7 @@
                 var ajaxLoad = layer.load();
                 var sWhere = " and hmainid=" + linterid;
                 $.ajax({
-                    url: GetWEBURL() + "/QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList",
+                    url: GetWEBURL() + "/QC_FirstPieceCheckBill/QC_FirstPieceCheckBill_Edit",
                     type: "GET",
                     data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (result) {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html"
index 2db33e9..b6e398b 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html"
@@ -450,7 +450,7 @@
                 var ajaxLoad = layer.load();
                 $.ajax({
                     //h_v_QC_FirstPieceCheckBill
-                    url: GetWEBURL() + '/QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList',
+                    url: GetWEBURL() + '/QC_FirstPieceCheckBillMain/QC_FirstPieceCheckBillMainList',
                     type: "GET",
                     async: false,
                     data: { "sWhere": sqlWhere, "user": sessionStorage["HUserName"] },
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
index 91123ac..3a3bd46 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
@@ -39,6 +39,7 @@
                             </div>
                         </div>
                         <button type="button" lay-submit="" lay-filter="Print" id="Print" class="layui-btn layui-btn-radius">鎵撳嵃</button>
+                        <button type="button" lay-submit="" lay-filter="Print2" id="Print2" hidden="hidden" ></button>
                         <div class="layui-inline" style="width: 200px;">
                             <div class="layui-input-block">
                                 <select name="PrintName" lay-verify="required" id="PrintName">
@@ -1028,7 +1029,7 @@
             });
 
             //鎵撳嵃鎸夐挳
-            form.on('submit(Print)', function (data) {//閫�鍑�
+            form.on('submit(Print2)', function (data) {//閫�鍑�
                 //鎵撳紑鎵撳嵃妯℃澘
                 var linterid = $("#HInterID").val();
                 //var linterid = "28973";
@@ -1089,6 +1090,17 @@
                 })
             });
 
+            //鎵撳嵃鎸夐挳
+            form.on('submit(Print)', function (data) {//閫�鍑�
+                //鎵撳紑鎵撳嵃妯℃澘
+                var linterid = $("#HInterID").val();
+                var Type = "HBarCodePrint";
+                var OpenTmp = "鐧芥爣鎵撳嵃1";
+                //var ReportViewer = document.getElementById("ReportViewer");
+                window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
+                $("#Print2").click();
+            });
+
             //鐩戝惉琛ㄦ牸涓宸ュ叿浜嬩欢
             table.on('tool(smjl-table)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
                 var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
index 9cff146..2959eb5 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
@@ -445,7 +445,7 @@
                 ////var linterid = $("#HInterID").val();
                 ////var linterid = "28973";
                 var Type = "HBarCodePrint";
-                var OpenTmp = "鐧芥爣鎵撳嵃";
+                var OpenTmp = "鐧芥爣鎵撳嵃1";
                 //var ReportViewer = document.getElementById("ReportViewer");
                 window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
             });
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 d95fdb1..9ddf4b4 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"
@@ -264,25 +264,27 @@
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_FirstPieceCheck" id="set_FirstPieceCheck"><i class="layui-icon layui-icon-form"></i>棣栨</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ProcessCheck" id="set_ProcessCheck"><i class="layui-icon layui-icon-form"></i>宸ュ簭妫�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_PatrolCheck" id="set_PatrolCheck"><i class="layui-icon layui-icon-form"></i>宸℃</button>
                             </div>
                         </script>
                         <script type="text/html" id="toolbarDemo2">
                             <div class="layui-btn-container">
                                 <!--<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>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></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>
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗�</button>
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>宸ュ簭杩涚珯鎺ユ敹鍗�</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_HideColumn2" lay-event="get_HideColumn2"><i class="layui-icon layui-icon-file-b"></i>鏄庣粏鍒楄缃�</button>
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Fg"><i class="layui-icon layui-icon-file-b"></i>宸ュ簭杩斿伐</button>-->
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Pg"><i class="layui-icon layui-icon-file-b"></i>宸ュ簭娲惧伐</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Fg" lay-event="get_Fg"><i class="layui-icon layui-icon-file-b"></i>杩斿伐鐢宠</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Jl" lay-event="get_Jl"><i class="layui-icon layui-icon-file-b"></i>杩斿伐璁板綍</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_zlzk" lay-event="get_zlzk"><i class="layui-icon layui-icon-file-b"></i>瀛愭祦杞崱</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ProcessExchange" id="set_ProcessExchange"><i class="layui-icon layui-icon-form"></i>涓嬫帹鐢熶骇璐ㄩ噺姹囨姤鍗�</button>
                             </div>
                         </script>
                         <script type="text/html" id="toolbarDemo3">
@@ -477,6 +479,9 @@
                     //宸ュ簭妫�
                     case 'set_ProcessCheck': set_ProcessCheck();
                         break;
+                    //宸℃
+                    case 'set_PatrolCheck': set_PatrolCheck();
+                        break;                        
                 };
             });
 
@@ -532,9 +537,9 @@
                     //瀛愭祦杞崱
                     case 'get_zlzk': get_zlzk();
                         break
-                    //宸ュ簭娲惧伐鍗�
-                    //case 'get_Pg': get_Pg();
-                    //    break
+                    //涓嬫帹鐢熶骇璐ㄩ噺姹囨姤鍗�
+                    case 'set_ProcessExchange': set_ProcessExchange();
+                        break;
                 };
             });
             table.on('toolbar(mainTable3)', function (obj) {
@@ -2738,6 +2743,34 @@
                 }
             }
 
+            //宸℃            
+            function set_PatrolCheck() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].hmainid.toString();
+                    var OperationType = 2;
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '宸℃璁板綍鍗�-缂栬緫'
+                        , shade: 0.6
+                        , maxmin: false
+                        , anim: 0
+                        , content: ['../../璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0', 'yes']
+                        , resize: false
+                        , cancel: function () {
+                            btnIs();
+                        }
+                        , end: function () {
+                            get_FastQuery();
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
             //鍒楁槑鏄剧ず涓嬫媺妗�
             function ColFilter() {
                 var Organization = '<option  value="0" selected="selected" ></option>';
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_CF.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_CF.html"
index 87b4d42..72eae9c 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_CF.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_CF.html"
@@ -158,6 +158,14 @@
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 85px;">椤圭洰鍙�</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" class="layui-input" name="HProjectNum" id="HProjectNum" style="">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">鎽樿</label>
                                                 <div class="layui-input-inline">
                                                     <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
@@ -166,7 +174,7 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">澶囨敞</label>
                                                 <div class="layui-input-inline">
-                                                    <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark"   style="background-color:#efefef4d;" readonly></textarea>
+                                                    <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark" style="background-color:#efefef4d;" readonly></textarea>
                                                 </div>
                                             </div>
                                         </div>
@@ -406,6 +414,7 @@
                             , "HWorkShopID": d.data[0].HWorkShopID
                             , "HExplanation": d.data[0].鎽樿
                             , "HRemark": d.data[0].琛ㄥご澶囨敞
+                            , "HProjectNum": d.data[0].椤圭洰鍙�
                         });
 
                         layer.close(ajaxLoad);

--
Gitblit v1.9.1