From e261e4ab0848bcdd36aafe63e6835eac723270f1 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 16 八月 2022 18:16:33 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/App_Data/MssqlReportData.cs                                       |    6 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillList.html                   |    2 
 WebTM/Vlog/webapi20220811.txt                                           |  239 +++++++++
 WebTM/views/基础资料/公用基础资料/xmlLBM_Gy_HEquipResumeBillList.aspx.cs          |   17 
 WebTM/views/组装单/Sc_PCruxBindingPDA.html                                 |   14 
 WebTM/views/模治具管理/模治具管理/Gy_MouldFileResume.html                         |  537 ++++++++++++++++++++
 WebTM/views/基础资料/公用基础资料/xmlLBM_Gy_HEquipResumeBillList.aspx             |   28 +
 WebTM/Vlog/webapi20220815.txt                                           |    5 
 WebTM/views/设备管理/Sb_EquipDotCheckBillEdit.html                          |   12 
 WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_HPPickingBillList.aspx                |    7 
 WebTM/views/设备管理/设备档案/Gy_EquipFileBillResume.html                       |  420 ++++++++++++++++
 WebTM/views/Baseset/SRM_OpenTmpList.html                                |    4 
 WebTM/views/index.html                                                  |    2 
 WebTM/views/基础资料/公用基础资料/xmlLBM_Gy_HEquipResumeBillList.aspx.designer.cs |   26 +
 WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html                              |    3 
 WebTM/views/grf/cabinet-SB.grf                                          |  154 +++++
 WebTM/WebTM.csproj                                                      |   11 
 WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html                          |    2 
 WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html                         |   24 
 19 files changed, 1,478 insertions(+), 35 deletions(-)

diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs
index b606bc3..7282839 100644
--- a/WebTM/App_Data/MssqlReportData.cs
+++ b/WebTM/App_Data/MssqlReportData.cs
@@ -18,12 +18,12 @@
     //public const string SqlConnStr = "Data Source=10.0.2.9;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=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ch娴嬭瘯
-    //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL娴嬭瘯
+   public const string SqlConnStr = "Data Source=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;";//涓镐簳
     //public const string SqlConnStr = "Data Source=192.168.0.200;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涓镐簳鍦板潃
     //public const string SqlConnStr = "Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//闆呯惇璇烘祴璇�
-    //public const string SqlConnStr = "Data Source=183.129.128.86:26589;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鍑礉濂堢壒
-    public const string SqlConnStr = "Data Source=192.168.0.199;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鐟炵惇
+    //public const string SqlConnStr = "Data Source=.;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 string sServer;
     //public string sDataBase;
diff --git a/WebTM/Vlog/webapi20220811.txt b/WebTM/Vlog/webapi20220811.txt
new file mode 100644
index 0000000..79be8d3
--- /dev/null
+++ b/WebTM/Vlog/webapi20220811.txt
@@ -0,0 +1,239 @@
+2022/8/11 9:58:39 select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+                            b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+                            from Kf_ICStockBillMain a
+                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+                            left join Gy_Material m on b.HMaterID=m.HItemID
+                            left join gy_unit u on m.HUnitID=u.HItemID
+                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163')
+
+2022/8/11 9:58:39 鎵撳嵃sql:select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+                            b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+                            from Kf_ICStockBillMain a
+                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+                            left join Gy_Material m on b.HMaterID=m.HItemID
+                            left join gy_unit u on m.HUnitID=u.HItemID
+                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163')
+
+2022/8/11 17:36:17 select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+                            b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+                            from Kf_ICStockBillMain a
+                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+                            left join Gy_Material m on b.HMaterID=m.HItemID
+                            left join gy_unit u on m.HUnitID=u.HItemID
+                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2728')
+
+2022/8/11 17:36:17 鎵撳嵃sql:select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+                            b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+                            from Kf_ICStockBillMain a
+                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+                            left join Gy_Material m on b.HMaterID=m.HItemID
+                            left join gy_unit u on m.HUnitID=u.HItemID
+                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2728')
+
+2022/8/11 17:36:18 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2022/8/11 17:36:18 ReportDataSet:0
+
+2022/8/11 17:36:39 select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+                            b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+                            from Kf_ICStockBillMain a
+                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+                            left join Gy_Material m on b.HMaterID=m.HItemID
+                            left join gy_unit u on m.HUnitID=u.HItemID
+                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2728','12500117-5830')
+
+2022/8/11 17:36:39 鎵撳嵃sql:select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+                            b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+                            from Kf_ICStockBillMain a
+                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+                            left join Gy_Material m on b.HMaterID=m.HItemID
+                            left join gy_unit u on m.HUnitID=u.HItemID
+                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2728','12500117-5830')
+
+2022/8/11 17:36:39 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2022/8/11 17:36:39 ReportDataSet:0
+
+2022/8/11 17:37:18 select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+                            b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+                            from Kf_ICStockBillMain a
+                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+                            left join Gy_Material m on b.HMaterID=m.HItemID
+                            left join gy_unit u on m.HUnitID=u.HItemID
+                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('12500063-5817','12500117-5830')
+
+2022/8/11 17:37:18 鎵撳嵃sql:select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+                            b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+                            from Kf_ICStockBillMain a
+                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+                            left join Gy_Material m on b.HMaterID=m.HItemID
+                            left join gy_unit u on m.HUnitID=u.HItemID
+                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('12500063-5817','12500117-5830')
+
+2022/8/11 17:37:18 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2022/8/11 17:37:18 ReportDataSet:0
+
+2022/8/11 17:44:51 select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+                            b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+                            from Kf_ICStockBillMain a
+                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+                            left join Gy_Material m on b.HMaterID=m.HItemID
+                            left join gy_unit u on m.HUnitID=u.HItemID
+                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2729')
+
+2022/8/11 17:44:51 鎵撳嵃sql:select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+                            b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+                            from Kf_ICStockBillMain a
+                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+                            left join Gy_Material m on b.HMaterID=m.HItemID
+                            left join gy_unit u on m.HUnitID=u.HItemID
+                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2729')
+
+2022/8/11 17:44:51 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2022/8/11 17:44:51 ReportDataSet:0
+
+2022/8/11 17:45:07 select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+                            b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+                            from Kf_ICStockBillMain a
+                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+                            left join Gy_Material m on b.HMaterID=m.HItemID
+                            left join gy_unit u on m.HUnitID=u.HItemID
+                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2729')
+
+2022/8/11 17:45:07 鎵撳嵃sql:select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+                            b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+                            from Kf_ICStockBillMain a
+                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+                            left join Gy_Material m on b.HMaterID=m.HItemID
+                            left join gy_unit u on m.HUnitID=u.HItemID
+                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2729')
+
+2022/8/11 17:45:07 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2022/8/11 17:45:07 ReportDataSet:0
+
+2022/8/11 17:48:28 select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+                            b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+                            from Kf_ICStockBillMain a
+                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+                            left join Gy_Material m on b.HMaterID=m.HItemID
+                            left join gy_unit u on m.HUnitID=u.HItemID
+                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2728')
+
+2022/8/11 17:48:28 鎵撳嵃sql:select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+                            b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+                            from Kf_ICStockBillMain a
+                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+                            left join Gy_Material m on b.HMaterID=m.HItemID
+                            left join gy_unit u on m.HUnitID=u.HItemID
+                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2728')
+
+2022/8/11 17:48:28 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2022/8/11 17:48:28 ReportDataSet:0
+
+2022/8/11 17:56:08 select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+                            b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+                            from Kf_ICStockBillMain a
+                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+                            left join Gy_Material m on b.HMaterID=m.HItemID
+                            left join gy_unit u on m.HUnitID=u.HItemID
+                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('12360550-2981','12481123-5304')
+
+2022/8/11 17:56:09 鎵撳嵃sql:select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+                            b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+                            from Kf_ICStockBillMain a
+                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+                            left join Gy_Material m on b.HMaterID=m.HItemID
+                            left join gy_unit u on m.HUnitID=u.HItemID
+                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('12360550-2981','12481123-5304')
+
+2022/8/11 17:56:09 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2022/8/11 17:56:09 ReportDataSet:0
+
+2022/8/11 18:05:56 select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+                            b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,pm.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+                            from Kf_ICStockBillMain a
+                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+                            left join Gy_Material m on b.HMaterID=m.HItemID
+                            left join gy_unit u on m.HUnitID=u.HItemID
+                            left JOIN Sc_PPBomBillSub p ON b.HSourceEntryID = p.HInterID
+							left JOIN Sc_PPBomBillMain pm ON p.HInterID=pm.HInterID
+                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2729','123865-3394')
+
+2022/8/11 18:05:56 鎵撳嵃sql:select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+                            b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,pm.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+                            from Kf_ICStockBillMain a
+                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+                            left join Gy_Material m on b.HMaterID=m.HItemID
+                            left join gy_unit u on m.HUnitID=u.HItemID
+                            left JOIN Sc_PPBomBillSub p ON b.HSourceEntryID = p.HInterID
+							left JOIN Sc_PPBomBillMain pm ON p.HInterID=pm.HInterID
+                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2729','123865-3394')
+
+2022/8/11 18:05:56 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2022/8/11 18:05:56 ReportDataSet:2
+
+2022/8/11 18:49:18 select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+                            b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,pm.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+                            from Kf_ICStockBillMain a
+                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+                            left join Gy_Material m on b.HMaterID=m.HItemID
+                            left join gy_unit u on m.HUnitID=u.HItemID
+                            left JOIN Sc_PPBomBillSub p ON b.HSourceEntryID = p.HInterID
+							left JOIN Sc_PPBomBillMain pm ON p.HInterID=pm.HInterID
+                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2728','123371-2729')
+
+2022/8/11 18:49:18 鎵撳嵃sql:select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+                            b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,pm.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+                            from Kf_ICStockBillMain a
+                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+                            left join Gy_Material m on b.HMaterID=m.HItemID
+                            left join gy_unit u on m.HUnitID=u.HItemID
+                            left JOIN Sc_PPBomBillSub p ON b.HSourceEntryID = p.HInterID
+							left JOIN Sc_PPBomBillMain pm ON p.HInterID=pm.HInterID
+                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2728','123371-2729')
+
+2022/8/11 18:50:49 select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+                            b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,pm.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+                            from Kf_ICStockBillMain a
+                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+                            left join Gy_Material m on b.HMaterID=m.HItemID
+                            left join gy_unit u on m.HUnitID=u.HItemID
+                            left JOIN Sc_PPBomBillSub p ON b.HSourceEntryID = p.HInterID
+							left JOIN Sc_PPBomBillMain pm ON p.HInterID=pm.HInterID
+                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2728','123371-2729')
+
+2022/8/11 18:50:49 鎵撳嵃sql:select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+                            b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,pm.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+                            from Kf_ICStockBillMain a
+                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+                            left join Gy_Material m on b.HMaterID=m.HItemID
+                            left join gy_unit u on m.HUnitID=u.HItemID
+                            left JOIN Sc_PPBomBillSub p ON b.HSourceEntryID = p.HInterID
+							left JOIN Sc_PPBomBillMain pm ON p.HInterID=pm.HInterID
+                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123371-2728','123371-2729')
+
+2022/8/11 18:50:50 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2022/8/11 18:50:50 ReportDataSet:2
diff --git a/WebTM/Vlog/webapi20220815.txt b/WebTM/Vlog/webapi20220815.txt
new file mode 100644
index 0000000..2aef440
--- /dev/null
+++ b/WebTM/Vlog/webapi20220815.txt
@@ -0,0 +1,5 @@
+2022/8/15 11:06:42 鎵撳嵃sql:select * from h_v_Gy_EquipFileMainList where hmainid=49
+
+2022/8/15 11:06:42 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2022/8/15 11:06:42 ReportDataSet:1
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index cae0eff..3ceef40 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -216,6 +216,7 @@
     <Content Include="views\grf\宸ュ簭娴佽浆.grf" />
     <Content Include="views\grf\cabinet-CG.grf" />
     <Content Include="views\grf\鐟炰笌绁烘睙鑻忔墦鍗版ā鏉�.grf" />
+    <Content Include="views\grf\cabinet-SB.grf" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>
@@ -625,6 +626,7 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipMaintainBill.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipMaintainPlanBill.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipTypeBill.aspx" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_HEquipResumeBillList.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Material.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_DepartmentList.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill.aspx" />
@@ -785,6 +787,7 @@
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_CheckToolsFileMainList.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_MouldFileList.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_MouldFile.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_MouldFileResume.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sb_Add_MouldRepairWorkBillList.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_Add_MouldConkBookBillList.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_Add_MouldDotCheckBillList.html" />
@@ -936,6 +939,7 @@
     <Content Include="views\璁惧绠＄悊\Sb_EquipMaintainPlanBillEdit.html" />
     <Content Include="views\璁惧绠＄悊\Sb_EquipMaintainPlanBillList.html" />
     <Content Include="views\璁惧绠＄悊\Sc_Add_MouldDotCheckBillList.html" />
+    <Content Include="views\璁惧绠＄悊\璁惧妗ｆ\Gy_EquipFileBillResume.html" />
     <Content Include="views\璁惧绠＄悊\璁惧妗ｆ\Gy_EquipFileMainEdit.html" />
     <Content Include="views\璁惧绠＄悊\璁惧妗ｆ\Gy_EquipFileMainList.html" />
     <Content Include="views\璁惧绠＄悊\璁惧缁翠慨娲惧伐鍗昞Sb_EquipRepairSendWorkBillEdit.html" />
@@ -1141,6 +1145,13 @@
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipTypeBill.aspx.designer.cs">
       <DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
     </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_HEquipResumeBillList.aspx.cs">
+      <DependentUpon>xmlLBM_Gy_HEquipResumeBillList.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_HEquipResumeBillList.aspx.designer.cs">
+      <DependentUpon>xmlLBM_Gy_HEquipResumeBillList.aspx</DependentUpon>
+    </Compile>
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Material.aspx.cs">
       <DependentUpon>xmlLBM_Gy_Material.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/WebTM/views/Baseset/SRM_OpenTmpList.html b/WebTM/views/Baseset/SRM_OpenTmpList.html
index cfd9d8f..f445970 100644
--- a/WebTM/views/Baseset/SRM_OpenTmpList.html
+++ b/WebTM/views/Baseset/SRM_OpenTmpList.html
@@ -18,8 +18,8 @@
                     <div class="layui-form-item">
                         <div class="layui-inline">
                             <div class="layui-btn-group">
-                                <!--<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Add">鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Del">鍒犻櫎</button>-->
+                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Add">鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Del">鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Reload">鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Select">閫夋嫨</button>
                                 <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Exit">閫�鍑�</button>
diff --git a/WebTM/views/grf/cabinet-SB.grf b/WebTM/views/grf/cabinet-SB.grf
new file mode 100644
index 0000000..a1a1c0c
--- /dev/null
+++ b/WebTM/views/grf/cabinet-SB.grf
@@ -0,0 +1,154 @@
+锘縊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.7
+		Height=6
+		LeftMargin=0.1
+		TopMargin=0
+		RightMargin=0.1
+		BottomMargin=0
+	End
+	Object DetailGrid
+		CenterView=T
+		Object Border
+			Object Pen
+				Width=1.5
+			End
+		End
+		Object Recordset
+			Items Field
+				Item
+					Name='璁惧缂栫爜'
+				End
+				Item
+					Name='璁惧鍚嶇О'
+				End
+				Item
+					Name='鏉″舰鐮�'
+				End
+			End
+		End
+		Items Column
+			Item
+				Name='鏍囩瀹藉害'
+				Width=9.7
+				FixedWidth=T
+			End
+		End
+		Object ColumnContent
+			Height=5.3975
+			Items ColumnContentCell
+				Item
+					Column='鏍囩瀹藉害'
+					FreeCell=T
+					Items Control
+						Item
+							Type=FreeGrid
+							Name='FreeGrid1'
+							Left=0.396875
+							Top=0.211667
+							Object Border
+								Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
+							End
+							ColumnCount=2
+							RowCount=2
+							Items FreeGridColumn
+								Item[1]
+									Width=3.99521
+									FixedWidth=T
+								End
+								Item[2]
+									Width=4.6
+									FixedWidth=T
+								End
+							End
+							Items FreeGridRow
+								Item[1]
+									Height=2.5
+								End
+								Item[2]
+									Height=2.5
+								End
+							End
+							Items FreeGridCell
+								Item[1,1]
+									Object Font
+										Name='瀹嬩綋'
+										Size=142500,0
+										Bold=T
+										Charset=134
+									End
+									TextAlign=MiddleCenter
+									Text='[#璁惧缂栫爜#]'
+								End
+								Item[1,2]
+									FreeCell=T
+									Items Control
+										Item
+											Type=Barcode
+											Name='Barcode1'
+											Left=0.211667
+											Top=0.211667
+											Width=4.18042
+											Height=4.78896
+											BarcodeType=QRCode
+											CaptionPosition=None
+											Text='[#鏉″舰鐮�#]'
+										End
+									End
+									RowSpan=2
+								End
+								Item[2,1]
+									Object Font
+										Name='瀹嬩綋'
+										Size=142500,0
+										Bold=T
+										Charset=134
+									End
+									TextAlign=MiddleCenter
+									Text='[#璁惧鍚嶇О#]'
+								End
+							End
+						End
+					End
+				End
+			End
+		End
+		Object ColumnTitle
+			Height=0
+			Items ColumnTitleCell
+				Item
+					GroupTitle=F
+					Column='鏍囩瀹藉害'
+					TextAlign=MiddleCenter
+					PaddingLeft=0
+					PaddingRight=0
+					PaddingTop=0
+					PaddingBottom=0
+				End
+			End
+		End
+	End
+	Items ReportHeader
+		Item
+			Name='ReportHeader1'
+			Height=0.211667
+			RepeatOnPage=T
+		End
+	End
+	Items ReportFooter
+		Item
+			Name='ReportFooter1'
+			Height=0
+		End
+	End
+End
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 897d57c..4905df1 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -573,6 +573,7 @@
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html">鍣ㄥ叿涓绘。缁存姢</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainRuleBillEdit.html">鍣ㄥ叿淇濆吇瑙勭▼鍗�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainRuleBillList.html">鍣ㄥ叿淇濆吇瑙勭▼鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileResume.html">鍣ㄥ叿灞ュ巻</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
@@ -667,6 +668,7 @@
                                         <dd><a lay-href="璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleList.html">璁惧鐐规瑙勭▼鍗曠淮鎶�</a></dd>
                                         <dd><a lay-href="璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipMaintainRuleEdit.html">璁惧淇濆吇瑙勭▼鍗�</a></dd>
                                         <dd><a lay-href="璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipMaintainRuleList.html">璁惧淇濆吇瑙勭▼鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileBillResume.html">璁惧灞ュ巻</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
index f7df417..2a5e446 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
@@ -181,6 +181,9 @@
             case "HPPickingBill"://鐢熶骇棰嗘枡鎷嗙爜鍒楄〃
                 CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_HPPickingBillList.aspx?linterid=" + value, true, "");
                 break;
+            case "HEquipResume"://璁惧灞ュ巻
+                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Gy_HEquipResumeBillList.aspx?linterid=" + value, true, "");
+                break;
         }
     </script>
 </body>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_HEquipResumeBillList.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_HEquipResumeBillList.aspx"
new file mode 100644
index 0000000..4e4c757
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_HEquipResumeBillList.aspx"
@@ -0,0 +1,28 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_Gy_HEquipResumeBillList.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_Gy_HEquipResumeBillList" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+    <script runat="server"> 
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        //鈽呯壒鍒彁绀衡槄锛�
+        //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+        //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+        //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+        //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
+        SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Gy_EquipFileMainList where hmainid=" + Request.Params["linterid"]);
+    }
+    </script>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div>
+        </div>
+    </form>
+</body>
+</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_HEquipResumeBillList.aspx.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_HEquipResumeBillList.aspx.cs"
new file mode 100644
index 0000000..7222475
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_HEquipResumeBillList.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+    public partial class xmlLBM_Gy_HEquipResumeBillList : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_HEquipResumeBillList.aspx.designer.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_HEquipResumeBillList.aspx.designer.cs"
new file mode 100644
index 0000000..a52abea
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_HEquipResumeBillList.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+    public partial class xmlLBM_Gy_HEquipResumeBillList
+    {
+
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+    }
+}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_HPPickingBillList.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_HPPickingBillList.aspx"
index 470815f..b3c1a03 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_HPPickingBillList.aspx"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_HPPickingBillList.aspx"
@@ -23,13 +23,14 @@
                 PrintIds += "'" + idsArray[i] + "',";
             }
             PrintIds = PrintIds.Substring(0, PrintIds.Length - 1);
-            string sql = string.Format(@"select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
-                            b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+            string sql = string.Format(@"select b.HInterID,b.HEntryID,b.HBarCode as 鏉″舰鐮�,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+                            b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,pm.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
                             from Kf_ICStockBillMain a
                             left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                             left join Gy_Material m on b.HMaterID=m.HItemID
                             left join gy_unit u on m.HUnitID=u.HItemID
-                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+                            left JOIN Sc_PPBomBillSub p ON b.HSourceEntryID = p.HInterID
+							left JOIN Sc_PPBomBillMain pm ON p.HInterID=pm.HInterID
                             where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ("+ PrintIds+")");
             LogService.Write(sql);
             SqlXMLReportData.GenOneRecordset(this, sql);
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.html"
index 9ab9833..bd9051b 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.html"
@@ -655,7 +655,7 @@
 
             }
 
-            蹇�熻繃婊�
+            //蹇�熻繃婊�
             function get_FastQuery(table, option) {
                 var HStatus = $("select[name='HStatus']").val();//鐘舵��
                 var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
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/Gy_MouldFileResume.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/Gy_MouldFileResume.html"
new file mode 100644
index 0000000..6ad46db
--- /dev/null
+++ "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/Gy_MouldFileResume.html"
@@ -0,0 +1,537 @@
+锘�<!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, 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>
+    <style type="text/css">
+        input.layui-input.layui-unselect {
+            padding-right: 0;
+        }
+    </style>
+</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-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍣ㄥ叿鍒嗙被</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HMouldType" id="HMouldType">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">寮�濮嬫椂闂�</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃堕棿</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <div class="layui-colla-content">
+                                    <div class="layui-inline">
+                                        <div class="layui-inline">
+                                            <span>鍏朵粬鏉′欢></span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+
+                        <div class="layui-tab layui-tab-card">
+                            <ul class="layui-tab-title">
+                                <li class="layui-this">鍑哄叆搴撹褰�</li>
+                                <li>鍣ㄥ叿鑰楃敤璁板綍</li>
+                                <li>鏃ュ父璁板綍</li>
+                                <li>缁翠慨璁板綍</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <table class="layui-hide" id="mainTable3" lay-filter="mainTable3"></table>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <table class="layui-hide" id="mainTable4" lay-filter="mainTable4"></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-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+
+                        <script type="text/html" id="xuhao1">
+                            {{d.LAY_TABLE_INDEX+1}}
+                        </script>
+                        <script type="text/html" id="xuhao2">
+                            {{d.LAY_TABLE_INDEX+1}}
+                        </script>
+                        <script type="text/html" id="xuhao3">
+                            {{d.LAY_TABLE_INDEX+1}}
+                        </script>
+                        <script type="text/html" id="xuhao4">
+                            {{d.LAY_TABLE_INDEX+1}}
+                        </script>
+
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <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/zgqCustom/zgqCustom.js"></script>
+
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙ｆā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , table1 = layui.table
+                , table2 = layui.table
+                , table3 = layui.table
+                , table4 = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            var option1 = [];
+            var option2 = [];
+            var option3 = [];
+            var option4 = [];
+            //#endregion
+
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#endregion
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    //娴忚
+                    case 'btn-view':
+                        get_ViewReport();
+                        break;
+
+                    //鍒锋柊
+                    case 'get_Refresh':
+                        set_Refresh();
+                        break;
+
+                    //閫�鍑�
+                    case 'get_Exit':
+                        Pub_Close(2);
+                        break;
+                };
+            });
+
+            //鐐瑰嚮涓昏〃甯﹀嚭浠庤〃鏁版嵁
+            table.on('row(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+                var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
+                var linterid = datas.hmainid;
+                $.ajax({
+                    url: GetWEBURL() + 'Gy_EquipFileMain/Gy_MouldFileBillResumeDate',
+                    type: "GET",
+                    data: { "HInterID": linterid },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option1.data = data1.list[0];
+                            table1.render(option1);
+                            option2.data = data1.list[1];
+                            table2.render(option2);
+                            option3.data = data1.list[2];
+                            table3.render(option3);
+                            option4.data = data1.list[3];
+                            table4.render(option4);
+                        } else {
+                            layer.alert("鑾峰彇澶辫触", { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                    }
+                });
+            });
+
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(table, option);
+            });
+
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�(涓昏〃)
+                set_InitGrid();
+                //鍒濆鍖栬〃鏍�(瀛愯〃1)
+                set_InitGrid1();
+                //鍒濆鍖栬〃鏍�(瀛愯〃2)
+                set_InitGrid2();
+                //鍒濆鍖栬〃鏍�(瀛愯〃3)
+                set_InitGrid3();
+                //鍒濆鍖栬〃鏍�(瀛愯〃4)
+                set_InitGrid4();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //鍒濆鍖栦富琛ㄦ牸
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: '400'
+                    , page: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+                        , { field: '妯″叿鍝佺被', title: '鍣ㄥ叿鍒嗙被' }
+                        , { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿' }
+                        , { field: '瀵瑰簲ERP鐗╂枡缂栫爜', title: '鐗╂枡缂栧彿' }
+                        , { field: '妯″叿缂栧彿', title: '鍣ㄥ叿缂栧彿' }
+                        , { field: '妯″叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О' }
+                        , { field: '妯″叿鍨嬪彿', title: '鍣ㄥ叿鍨嬪彿' }
+                        , { field: '妯″叿鐘舵��', title: '鍣ㄥ叿鐘舵��' }
+                        , { field: '瀵瑰簲ERP鐗╂枡缂栫爜', title: '鍣ㄥ叿ERP鐗╂枡' }
+                        , { field: '鐩村緞', title: '鐩村緞' }
+                        , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��' }
+                        , { field: '杈呭姪灞炴��2', title: '杈呭姪灞炴��2' }
+                        , { field: '鍥惧彿', title: '鍥惧彿' }
+                        , { field: '鐢熶骇浜у搧鍨嬪彿', title: '鐢熶骇浜у搧鍨嬪彿' }
+                        , { field: 'HUnitID', title: 'HUnitID', hide: true }
+                        , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
+                        , { field: '鍑哄巶鏃ユ湡', title: '鍑哄巶鏃ユ湡', templet: "<div>{{d.鍑哄巶鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍑哄巶鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍑哄巶缂栧彿', title: '鍑哄巶缂栧彿' }
+                        , { field: '浣跨敤閮ㄩ棬浠ｇ爜', title: '浣跨敤閮ㄩ棬浠ｇ爜' }
+                        , { field: '浣跨敤閮ㄩ棬', title: '浣跨敤閮ㄩ棬' }
+                        , { field: 'HSupID', title: 'HSupID', hide: true }
+                        , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
+                        , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
+                        , { field: 'HWhID', title: 'HWhID', hide: true }
+                        , { field: '榛樿浠撳簱', title: '榛樿浠撳簱' }
+                        , { field: 'HSPID', title: 'HSPID', hide: true }
+                        , { field: '榛樿浠撲綅', title: '榛樿浠撲綅' }
+                        , { field: '鐗堟湰', title: '鐗堟湰' }
+                        , { field: '褰撳墠浠撳簱', title: '褰撳墠浠撳簱' }
+                        , { field: '褰撳墠浠撲綅', title: '褰撳墠浠撲綅' }
+                        , { field: '铏氭嫙浠撶被鍨�', title: '铏氭嫙浠撶被鍨�' }
+                        , { field: '铏氭嫙浠�', title: '铏氭嫙浠�' }
+                        , { field: '褰撳墠妯″叿瑙勬牸', title: '褰撳墠鍣ㄥ叿瑙勬牸' }
+                        , { field: '鍒濆妯″叿瑙勬牸', title: '鍒濆鍣ㄥ叿瑙勬牸' }
+                        , { field: '褰撳墠璁捐瀵垮懡', title: '褰撳墠璁捐瀵垮懡' }
+                        , { field: '鍒濆璁捐瀵垮懡', title: '鍒濆璁捐瀵垮懡' }
+                        , { field: '浣跨敤瀵垮懡', title: '浣跨敤瀵垮懡' }
+                        , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡' }
+                        , { field: '宸茬敓浜ф暟閲�', title: '宸茬敓浜ф暟閲�' }
+                        , { field: '宸茬敓浜ч噸閲�', title: '宸茬敓浜ч噸閲�' }
+                        , { field: '澶囨敞', title: '澶囨敞' }
+                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺' }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '淇敼浜�', title: '淇敼浜�' }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: 'hbilltype', title: 'hbilltype', hide: true }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', hide: true }
+                        , { field: 'HMoudType', title: 'HMoudType', hide: true }
+                        , { field: 'hsubid', title: 'hsubid', hide: true }
+                    ]]
+                }
+            }
+            //鍒濆鍖栬〃鏍�(瀛愯〃1)
+            function set_InitGrid1() {
+                var ajaxLoad = layer.load();
+                option1 = {
+                    elem: '#mainTable1'
+                    //, toolbar: '#toolbarDemo'
+                    , height: '350'
+                    , page: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , cols: [[
+                        //{ type: 'checkbox', fixed: 'left' }
+                        , { templet: '#xuhao1', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200}
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 200 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 }
+                        , { field: '鍣ㄥ叿鍒嗙被', title: '鍣ㄥ叿鍒嗙被', width: 200 }
+                        , { field: '鍣ㄥ叿鏉＄爜', title: '鍣ㄥ叿鏉＄爜', width: 200 }
+                        , { field: '鍣ㄥ叿缂栫爜', title: '鍣ㄥ叿缂栫爜', width: 200 }
+                        , { field: '鍣ㄥ叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О', width: 200 }
+                        , { field: '鍣ㄥ叿瑙勬牸', title: '鍣ㄥ叿瑙勬牸', width: 200 }
+                        , { field: '鍣ㄥ叿鍨嬪彿', title: '鍣ㄥ叿鍨嬪彿', width: 200 }
+                        , { field: '鏁伴噺', title: '鏁伴噺', width: 200 }
+                        , { field: '浠撳簱', title: '浠撳簱', width: 200 }
+                        , { field: '浠撲綅', title: '浠撲綅', width: 200 }
+                        , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 200 }
+                        , { field: '璋冨嚭浠撲綅', title: '璋冨嚭浠撲綅', width: 200 }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+
+                    ]]
+                };
+                option1.data = [];
+                table1.render(option1);
+                layer.close(ajaxLoad);
+            }
+            //鍒濆鍖栬〃鏍�(瀛愯〃2)
+            function set_InitGrid2() {
+                var ajaxLoad = layer.load();
+                option2 = {
+                    elem: '#mainTable2'
+                    //, toolbar: '#toolbarDemo'
+                    , height: '350'
+                    , page: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , cols: [[
+                        //{ type: 'checkbox', fixed: 'left' }
+                        , { templet: '#xuhao2', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 200 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 }
+                        , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 200 }
+                        , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 200 }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 200 }
+                        , { field: '鍣ㄥ叿鍒嗙被', title: '鍣ㄥ叿鍒嗙被', width: 200 }
+                        , { field: '鍣ㄥ叿鏉＄爜', title: '鍣ㄥ叿鏉＄爜', width: 200 }
+                        , { field: '鍣ㄥ叿缂栫爜', title: '鍣ㄥ叿缂栫爜', width: 200, hide: true }
+                        , { field: '鍣ㄥ叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О', width: 200 }
+                        , { field: '鍣ㄥ叿瑙勬牸', title: '鍣ㄥ叿瑙勬牸', width: 200 }
+                        , { field: '鍣ㄥ叿鍨嬪彿', title: '鍣ㄥ叿鍨嬪彿', width: 200 }
+                        , { field: '鐢熶骇鏁伴噺', title: '鐢熶骇鏁伴噺', width: 200 }
+                        , { field: '璁捐瀵垮懡', title: '璁捐瀵垮懡', width: 200 }
+                        , { field: '鑰楃敤瀵垮懡', title: '鑰楃敤瀵垮懡', width: 200 }
+                        , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡', width: 200 }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+
+                    ]]
+                };
+                option2.data = [];
+                table2.render(option2);
+                layer.close(ajaxLoad);
+            }
+            //鍒濆鍖栬〃鏍�(瀛愯〃3)
+            function set_InitGrid3() {
+                var ajaxLoad = layer.load();
+                option3 = {
+                    elem: '#mainTable3'
+                    //, toolbar: '#toolbarDemo'
+                    , height: '350'
+                    , page: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , cols: [[
+                        //{ type: 'checkbox', fixed: 'left' }
+                        , { templet: '#xuhao3', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 200 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 }
+                        , { field: '鍣ㄥ叿鍒嗙被', title: '鍣ㄥ叿鍒嗙被', width: 200 }
+                        , { field: '鍣ㄥ叿鏉＄爜', title: '鍣ㄥ叿鏉＄爜', width: 200 }
+                        , { field: '鍣ㄥ叿缂栫爜', title: '鍣ㄥ叿缂栫爜', width: 200, hide: true }
+                        , { field: '鍣ㄥ叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О', width: 200 }
+                        , { field: '鍣ㄥ叿瑙勬牸', title: '鍣ㄥ叿瑙勬牸', width: 200 }
+                        , { field: '鍣ㄥ叿鍨嬪彿', title: '鍣ㄥ叿鍨嬪彿', width: 200 }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+
+                    ]]
+                };
+                option3.data = [];
+                table3.render(option3);
+                layer.close(ajaxLoad);
+            }
+            //鍒濆鍖栬〃鏍�(瀛愯〃4)
+            function set_InitGrid4() {
+                var ajaxLoad = layer.load();
+                option4 = {
+                    elem: '#mainTable4'
+                    //, toolbar: '#toolbarDemo'
+                    , height: '350'
+                    , page: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , cols: [[
+                        //{ type: 'checkbox', fixed: 'left' }
+                        , { templet: '#xuhao4', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 200 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 }
+                        , { field: '鍣ㄥ叿鍒嗙被', title: '鍣ㄥ叿鍒嗙被', width: 200 }
+                        , { field: '鍣ㄥ叿鏉＄爜', title: '鍣ㄥ叿鏉＄爜', width: 200 }
+                        , { field: '鍣ㄥ叿缂栫爜', title: '鍣ㄥ叿缂栫爜', width: 200, hide: true }
+                        , { field: '鍣ㄥ叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О', width: 200 }
+                        , { field: '鍣ㄥ叿瑙勬牸', title: '鍣ㄥ叿瑙勬牸', width: 200 }
+                        , { field: '鍣ㄥ叿鍨嬪彿', title: '鍣ㄥ叿鍨嬪彿', width: 200 }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+
+                    ]]
+                };
+                option4.data = [];
+                table4.render(option4);
+                layer.close(ajaxLoad);
+            }
+
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_Mould/list1',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "ModRightNameSelect": "Gy_MouldFileList", "user": sessionStorage["HUserName"]},
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(index);
+                        } else {
+                            layer.close(index);
+                            layer.alert("娌℃湁鏁版嵁璁板綍!", { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(index);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+
+
+            var index = layer.load(0);
+            //棰勮
+            function get_ViewReport() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HEquipResume&OpenTmp=璁惧灞ュ巻");
+
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+                }
+            }
+            //鍒锋柊
+            function set_Refresh() {
+                $("#btnSearch").click();
+            }
+            //蹇�熻繃婊�
+            function get_FastQuery() {
+                //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
+                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var HMouldType = $("#HMouldType").val();//鍒跺崟浜�
+                var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
+                var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                if (HMouldType) {
+                    sWhere += " and 妯″叿鍝佺被 like '%" + HMouldType + "%'";
+                }
+                if (BenginHCreateDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + BenginHCreateDate + "'";
+                }
+                if (EndHCreateDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + EndHCreateDate + "'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                //$("#HBillType").val("");//鍗曟嵁绫诲瀷
+                $("#HBillNo").val("");//鍗曟嵁鍙�
+                $("#HMouldType").val("");//璁惧绫诲瀷
+                $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
+                $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
+                sWhere = "";
+                $("#btnSearch").click();
+            }
+
+
+            //#endregion
+        });
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\273\204\350\243\205\345\215\225/Sc_PCruxBindingPDA.html" "b/WebTM/views/\347\273\204\350\243\205\345\215\225/Sc_PCruxBindingPDA.html"
index ef3335c..bfea83f 100644
--- "a/WebTM/views/\347\273\204\350\243\205\345\215\225/Sc_PCruxBindingPDA.html"
+++ "b/WebTM/views/\347\273\204\350\243\205\345\215\225/Sc_PCruxBindingPDA.html"
@@ -6,8 +6,8 @@
     <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">
+    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
     <style>
         .layui-table-cell {
             height: auto;
@@ -155,14 +155,14 @@
         </div>
     </div>
 
-    <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/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>
         layui.config({
-            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+            base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index' //涓诲叆鍙ｆā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
index 927a901..3bf26e7 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
@@ -272,16 +272,16 @@
                                 var rowdate1 = layui.table.cache["mainTable"];
                                 option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
                                 table.render(option);
-                                $("#HEquipDotCheckRuleInterID").val(BYData.data[i].HInterID);
-                                $("#HEquipDotCheckRuleInterNo").val(BYData.data[i].HBillNo)
+                                $("#HEquipDotCheckRuleInterID").val(BYData.data[0].HInterID);
+                                $("#HEquipDotCheckRuleInterNo").val(BYData.data[0].HBillNo)
                                 if (BYData.data.length != 0)  //琛ㄤ綋鏁版嵁涓虹┖鏃�
                                 {
                                     buttonArr = [];//娓呯┖鏁扮粍
                                     for (var i = 0; i < BYData.data.length; i++) {
                                         var checkrow = {
                                             "HDotCheckItemID": BYData.data[i].HDotCheckItemID, "HDotCheckCode": BYData.data[i].HDotCheckCode, "HDotCheckItem": BYData.data[i].HDotCheckItem,
-                                            "HDotCheckPart": BYData.data[i].HDotCheckPart, "HClaim": rowdate1[i].HClaim, "HManagerID": BYData.data[i].HManagerID, "HManagerCode": BYData.data[i].HManagerCode,
-                                            "HManagerName": BYData.data[i].HManagerName,  "HRemark": rowdate1[i].HRemark
+                                            "HDotCheckPart": BYData.data[i].HDotCheckPart,  "HManagerID": BYData.data[i].HManagerID, "HManagerCode": BYData.data[i].HManagerCode,
+                                            "HManagerName": BYData.data[i].HManagerName, "HClaim": rowdate1[i].HClaim, "HRemark": rowdate1[i].HRemark
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
@@ -354,8 +354,8 @@
                                     for (var i = 0; i < BYData.data.length; i++) {
                                         var checkrow = {
                                             "HDotCheckItemID": BYData.data[i].HDotCheckItemID, "HDotCheckCode": BYData.data[i].HDotCheckCode, "HDotCheckItem": BYData.data[i].HDotCheckItem,
-                                            "HDotCheckPart": BYData.data[i].HDotCheckPart, "HClaim": rowdate1[i].HClaim, "HManagerID": BYData.data[i].HManagerID, "HManagerCode": BYData.data[i].HManagerCode,
-                                            "HManagerName": BYData.data[i].HManagerName, "HRemark": rowdate1[i].HRemark
+                                            "HDotCheckPart": BYData.data[i].HDotCheckPart, "HManagerID": BYData.data[i].HManagerID, "HManagerCode": BYData.data[i].HManagerCode,
+                                            "HManagerName": BYData.data[i].HManagerName, "HClaim": rowdate1[i].HClaim, "HRemark": rowdate1[i].HRemark
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
index 4bcab75..a7e8687 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
@@ -612,7 +612,7 @@
                     { type: 'checkbox', fixed: 'left' }
                     , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
                     , { field: 'HMaintainItemID', title: '淇濆吇椤圭洰ID', edit: 'text', hide: true }
-                    , { field: 'HMaintainItemNumber', title: '淇濆吇椤圭洰浠ｇ爜', edit: 'text', event: 'HMaintainItemNumber' }
+                    , { field: 'HMaintainItemNumber', title: '淇濆吇椤圭洰浠ｇ爜', hide: true ,edit: 'text', event: 'HMaintainItemNumber' }
                     , { field: 'HMaintainItem', title: '淇濆吇椤圭洰', edit: 'text' }
                     , { field: 'HMaintainPart', title: '淇濆吇閮ㄤ綅', edit: 'text' }
                     , { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileBillResume.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileBillResume.html"
new file mode 100644
index 0000000..5c51329
--- /dev/null
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileBillResume.html"
@@ -0,0 +1,420 @@
+锘�<!DOCTYPE html>
+<html>
+<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>
+    <style type="text/css">
+        input.layui-input.layui-unselect {
+            padding-right: 0;
+        }
+    </style>
+</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-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">璁惧鍒嗙被</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HEquipType" id="HEquipType">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">寮�濮嬫椂闂�</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃堕棿</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <div class="layui-colla-content">
+                                    <div class="layui-inline">
+                                        <div class="layui-inline">
+                                            <span>鍏朵粬鏉′欢></span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        
+                        <div class="layui-tab layui-tab-card">
+                            <ul class="layui-tab-title">
+                                <li class="layui-this">鏃ュ父璁板綍</li>
+                                <li>缁翠慨璁板綍</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></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-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+
+                        <script type="text/html" id="xuhao">
+                            {{d.LAY_TABLE_INDEX+1}}
+                        </script>
+                        <script type="text/html" id="xuhao1">
+                            {{d.LAY_TABLE_INDEX+1}}
+                        </script>
+
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <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/zgqCustom/zgqCustom.js"></script>
+
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙ｆā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , table1 = layui.table
+                , table2 = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            var option1 = [];
+            var option2 = [];
+            //#endregion
+
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#endregion
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    //娴忚
+                    case 'btn-view':
+                        get_ViewReport();
+                        break;
+                    
+                    //鍒锋柊
+                    case 'get_Refresh':
+                        set_Refresh();
+                        break;
+
+                    //閫�鍑�
+                    case 'get_Exit':
+                        Pub_Close(2);
+                        break;
+                };
+            });
+
+            //鐐瑰嚮涓昏〃甯﹀嚭浠庤〃鏁版嵁
+            table.on('row(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+                var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
+                var linterid = datas.hmainid;
+                $.ajax({
+                    url: GetWEBURL() + 'Gy_EquipFileMain/Sb_EquipFileBillResumeDate',
+                    type: "GET",
+                    data: { "HInterID": linterid },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option1.data = data1.list[0];
+                            table1.render(option1);
+                            option2.data = data1.list[1];
+                            table2.render(option2);
+                        } else {
+                            layer.alert("鑾峰彇澶辫触", { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                    }
+                });
+            });
+
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(table, option);
+            });
+
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�(涓昏〃)
+                set_InitGrid();
+                //鍒濆鍖栬〃鏍�(瀛愯〃1)
+                set_InitGrid1();
+                //鍒濆鍖栬〃鏍�(瀛愯〃2)
+                set_InitGrid2();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //鍒濆鍖栦富琛ㄦ牸
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: '400'
+                    , page: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鏉″舰鐮�', title: '鏉＄爜缂栧彿' }
+                        , { field: 'HMaterID', title: 'HMaterID', hide: true }
+                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
+                        , { field: '璁惧绫诲瀷', title: '璁惧鍒嗙被' }
+                        , { field: '璁惧浠ｇ爜', title: '璁惧浠ｇ爜' }
+                        , { field: '璁惧缂栫爜', title: '璁惧缂栫爜' }
+                        , { field: '璁惧鍚嶇О', title: '璁惧鍚嶇О' }
+                        , { field: '璁惧瑙勬牸', title: '璁惧瑙勬牸' }
+                        , { field: '璁惧鍨嬪彿', title: '璁惧鍨嬪彿' }
+                        , { field: 'HUnitID', title: 'HUnitID', hide: true }
+                        , { field: '鍗曚綅', title: '鍗曚綅' }
+                        , { field: '璁惧鍑哄巶鏃ユ湡', title: '璁惧鍑哄巶鏃ユ湡', templet: "<div>{{d.璁惧鍑哄巶鏃ユ湡 ==null ?'':layui.util.toDateString(d.璁惧鍑哄巶鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '璁惧鍑哄巶缂栧彿', title: '璁惧鍑哄巶缂栧彿' }
+                        , { field: 'HDeptID', title: 'HDeptID', hide: true }
+                        , { field: '浣跨敤閮ㄩ棬', title: '浣跨敤閮ㄩ棬' }
+                        , { field: 'HUseEmpID', title: 'HUseEmpID', hide: true }
+                        , { field: '浣跨敤璐熻矗浜�', title: '浣跨敤璐熻矗浜�' }
+                        , { field: 'HRepairEmpID', title: 'HRepairEmpID', hide: true }
+                        , { field: '缁存姢璐熻矗浜�', title: '缁存姢璐熻矗浜�' }
+                        , { field: '瀹夎鍦扮偣', title: '瀹夎鍦扮偣' }
+                        , { field: '瀹夎鏃ユ湡', title: '瀹夎鏃ユ湡', templet: "<div>{{d.瀹夎鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹夎鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '杩愯寮�濮嬫棩鏈�', title: '杩愯寮�濮嬫棩鏈�', templet: "<div>{{d.杩愯寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.杩愯寮�濮嬫棩鏈�, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '褰撳墠鐘舵��', title: '褰撳墠鐘舵��' }
+                        , { field: 'HEquipFileTypeID', title: 'HEquipFileTypeID', hide: true }
+                        , { field: '宸ョ▼缂栫爜', title: '宸ョ▼缂栫爜' }
+                        , { field: '浜у搧', title: '浜у搧' }
+                        , { field: '鍝佺墝', title: '鍝佺墝' }
+                        , { field: 'HSellSupID', title: 'HSellSupID', hide: true }
+                        , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
+                        , { field: 'HMakeSupID', title: 'HMakeSupID', hide: true }
+                        , { field: '鍒堕�犲晢', title: '鍒堕�犲晢' }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '淇敼浜�', title: '淇敼浜�' }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: 'hbilltype', title: 'hbilltype', hide: true }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
+                        , { field: 'HMoudType', title: 'HMoudType', hide: true }
+                        , { field: 'hsubid', title: 'hsubid', hide: true }
+                    ]]
+                }
+            }
+            //鍒濆鍖栬〃鏍�(瀛愯〃1)
+            function set_InitGrid1() {
+                var ajaxLoad = layer.load();
+                option1 = {
+                    elem: '#mainTable1'
+                    //, toolbar: '#toolbarDemo'
+                    , height: '350'
+                    , page: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , cols: [[
+                        //{ type: 'checkbox', fixed: 'left' }
+                        , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200}
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 200 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 }
+                        , { field: '璁惧鍒嗙被', title: '璁惧鍒嗙被', width: 200 }
+                        , { field: '璁惧鏉＄爜', title: '璁惧鏉＄爜', width: 200 }
+                        , { field: '璁惧缂栫爜', title: '璁惧缂栫爜', width: 200, hide: true }
+                        , { field: '璁惧鍚嶇О', title: '璁惧鍚嶇О', width: 200 }
+                        , { field: '璁惧瑙勬牸', title: '璁惧瑙勬牸', width: 200 }
+                        , { field: '璁惧鍨嬪彿', title: '璁惧鍨嬪彿', width: 200 }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+
+                    ]]
+                };
+                option1.data = [];
+                table1.render(option1);
+                layer.close(ajaxLoad);
+            }
+            //鍒濆鍖栬〃鏍�(瀛愯〃2)
+            function set_InitGrid2() {
+                var ajaxLoad = layer.load();
+                option2 = {
+                    elem: '#mainTable2'
+                    //, toolbar: '#toolbarDemo'
+                    , height: '350'
+                    , page: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , cols: [[
+                        //{ type: 'checkbox', fixed: 'left' }
+                        , { templet: '#xuhao1', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 200 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 }
+                        , { field: '璁惧鍒嗙被', title: '璁惧鍒嗙被', width: 200 }
+                        , { field: '璁惧鏉＄爜', title: '璁惧鏉＄爜', width: 200 }
+                        , { field: '璁惧缂栫爜', title: '璁惧缂栫爜', width: 200, hide: true }
+                        , { field: '璁惧鍚嶇О', title: '璁惧鍚嶇О', width: 200 }
+                        , { field: '璁惧瑙勬牸', title: '璁惧瑙勬牸', width: 200 }
+                        , { field: '璁惧鍨嬪彿', title: '璁惧鍨嬪彿', width: 200 }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+
+                    ]]
+                };
+                option2.data = [];
+                table2.render(option2);
+                layer.close(ajaxLoad);
+            }
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_EquipFileMain/GetList',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(index);
+                        } else {
+                            layer.close(index);
+                            layer.alert("娌℃湁鏁版嵁璁板綍!", { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(index);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+
+
+            var index = layer.load(0);
+            //棰勮
+            function get_ViewReport() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HEquipResume&OpenTmp=璁惧灞ュ巻");
+
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+                }
+            }
+            //鍒锋柊
+            function set_Refresh() {
+                $("#btnSearch").click();
+            }
+            //蹇�熻繃婊�
+            function get_FastQuery() {
+                //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
+                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var HEquipType = $("#HEquipType").val();//鍒跺崟浜�
+                var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
+                var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                if (HEquipType) {
+                    sWhere += " and 璁惧绫诲瀷 like '%" + HEquipType + "%'";
+                }
+                if (BenginHCreateDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + BenginHCreateDate + "'";
+                }
+                if (EndHCreateDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + EndHCreateDate + "'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                //$("#HBillType").val("");//鍗曟嵁绫诲瀷
+                $("#HBillNo").val("");//鍗曟嵁鍙�
+                $("#HEquipType").val("");//璁惧绫诲瀷
+                $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
+                $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
+                sWhere = "";
+                $("#btnSearch").click();
+            }
+
+
+            //#endregion
+        });
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
index 047ccfd..d55efca 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
@@ -71,19 +71,19 @@
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">璁惧缂栧彿</label>
+                                                <label class="layui-form-label">璁惧缂栧彿<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" class="layui-input" name="HEquipFileNo" id="HEquipFileNo">
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">璁惧鍚嶇О</label>
+                                                <label class="layui-form-label">璁惧鍚嶇О<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" class="layui-input" name="HName" id="HName">
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">璁惧瑙勬牸</label>
+                                                <label class="layui-form-label">璁惧瑙勬牸<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" class="layui-input" name="HModel" id="HModel">
                                                 </div>
@@ -97,7 +97,7 @@
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">璁惧浠ｇ爜</label>
+                                                <label class="layui-form-label">璁惧浠ｇ爜<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" class="layui-input" name="HEquipFileNumber" id="HEquipFileNumber">
                                                 </div>
@@ -125,7 +125,7 @@
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">瀵瑰簲ERP鐗╂枡</label>
+                                                <label class="layui-form-label">瀵瑰簲ERP鐗╂枡<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="float:left;width:150px;">
                                                     <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" style="float:left;width:150px;">
@@ -135,7 +135,7 @@
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">璁惧鍒嗙被</label>
+                                                <label class="layui-form-label">璁惧鍒嗙被<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" class="layui-input" name="HEquipFileTypeName" id="HEquipFileTypeName" style="float:left;width:150px;">
                                                     <input type="hidden" class="layui-input" name="HEquipFileTypeID" id="HEquipFileTypeID" style="float:left;width:150px;">
@@ -145,7 +145,7 @@
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">鍗曚綅</label>
+                                                <label class="layui-form-label">鍗曚綅<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="float:left;width:150px;">
                                                     <input type="hidden" class="layui-input" name="HUnitID" id="HUnitID" style="float:left;width:150px;">
@@ -156,7 +156,7 @@
                                             </div>
 
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">渚涘簲鍟�</label>
+                                                <label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" class="layui-input" name="HSellSupName" id="HSellSupName" style="float:left;width:150px;">
                                                     <input type="hidden" class="layui-input" name="HSellSupID" id="HSellSupID" style="float:left;width:150px;">
@@ -168,7 +168,7 @@
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">浣跨敤閮ㄩ棬</label>
+                                                <label class="layui-form-label">浣跨敤閮ㄩ棬<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="float:left;width:150px;">
                                                     <input type="hidden" class="layui-input" name="HDeptID" id="HDeptID" style="float:left;width:150px;">
@@ -178,7 +178,7 @@
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">浣跨敤璐熻矗浜�</label>
+                                                <label class="layui-form-label">浣跨敤璐熻矗浜�<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" class="layui-input" name="HUseEmpName" id="HUseEmpName" style="float:left;width:150px;">
                                                     <input type="hidden" class="layui-input" name="HUseEmpID" id="HUseEmpID" style="float:left;width:150px;">
@@ -188,7 +188,7 @@
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">缁存姢璐熻矗浜�</label>
+                                                <label class="layui-form-label">缁存姢璐熻矗浜�<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" class="layui-input" name="HRepairEmpName" id="HRepairEmpName" style="float:left;width:150px;" y>
                                                     <input type="hidden" class="layui-input" name="HRepairEmpID" id="HRepairEmpID" style="float:left;width:150px;">
@@ -255,7 +255,7 @@
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">璁惧鐘舵��</label>
+                                                <label class="layui-form-label">璁惧鐘舵��<label style="color:red"> * </label></label>
                                                 <div class="layui-input-block"  style="margin-left: 125px;width:55%;">
                                                     <select name="HStatus" lay-filter="aihao" id="HStatus">
                                                         <option value="绌洪棽" selected="selected">绌洪棽</option>

--
Gitblit v1.9.1